diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java index 8e07370..bc56ae9 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java @@ -81,7 +81,7 @@ public class EmployeeHostsController { } @GetMapping("/page") - @Operation(summary = "获得员工分配主播分页") + @Operation(summary = "管理获得员工分配主播分页") @PreAuthorize("@ss.hasPermission('server:employee-hosts:query')") public CommonResult> getEmployeeHostsPage(@Valid EmployeeHostsPageReqVO pageReqVO) { PageResult pageResult = employeeHostsService.getEmployeeHostsPage(pageReqVO); diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java index 64edc7e..a1e8867 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java @@ -64,5 +64,7 @@ public interface EmployeeHostsMapper extends BaseMapperX { int batchInsertIgnore(List list); + IPage selectPageWithXMLWithSelf(IPage page, @Param("req") EmployeeHostsPageReqVO reqVO); + IPage selectPageWithXML(IPage page, @Param("req") EmployeeHostsPageReqVO reqVO); } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java index 6b4bce0..9ec43db 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java @@ -130,7 +130,7 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { if (loginUser != null) { pageReqVO.setUserId(loginUser.getId()); IPage iPage = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); - IPage newHostsDOIPage = employeeHostsMapper.selectPageWithXML(iPage, pageReqVO); + IPage newHostsDOIPage = employeeHostsMapper.selectPageWithXMLWithSelf(iPage, pageReqVO); return new PageResult<>(newHostsDOIPage.getRecords(),newHostsDOIPage.getTotal()); } return null; diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml index a1ada78..32760aa 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml @@ -60,7 +60,7 @@ - select ns.id,hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum, yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,operation_status from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name WHERE tenant_id =#{req.tenantId,jdbcType=BIGINT} @@ -73,6 +73,9 @@ and DATE(ns.create_time) =#{req.createTime} + + and operation_status =#{req.operationStatus,jdbcType=INTEGER} + and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%') @@ -174,4 +177,124 @@ + + \ No newline at end of file