emm

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java

@@ -17,4 +17,5 @@ public class GroupPeopleRegisterListResultDTO implements Serializable {
     private String szTotal;
     private String hsjcTotal;
     private String id;
+    private String agencyId;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java

@@ -148,15 +148,15 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeReg
         // 未核酸检测的查询，根据所有企业下登记过的员工，筛出时间段内已检测的，剩下的就是未检测
         if (formDTO.getIsPage()){
             PageInfo<EmployeeRegisterListResultDTO> pageInfo = new PageInfo<>();
-            if (formDTO.getCheckStatus().equals(NumConstant.ONE_STR)){
+            if (formDTO.getCheckStatus().equals(NumConstant.ZERO_STR)){
-                pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO));
-            }else {
                 // 已检测
                 List<EmployeeRegisterListResultDTO> checked = baseDao.employeeRegisterList(formDTO);
                 if (CollectionUtils.isNotEmpty(checked)){
                     formDTO.setRegisterIds(checked.stream().map(m -> m.getRegisterId()).collect(Collectors.toList()));
                     pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterListNoCheck(formDTO));
                 }
+            }else {
+                pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO));
             }
             result.setList(pageInfo.getList());
             result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml

@@ -9,7 +9,8 @@
             pr.ID,
             pr.NAT_TIME,
             pr.SZ_TOTAL,
-            pr.HSJC_TOTAL
+            pr.HSJC_TOTAL,
+            ie.AGENCY_ID
         FROM ic_enterprise ie
         INNER JOIN ic_group_people_register pr ON pr.ENTERPRISE_ID = ie.ID AND pr.DEL_FLAG = 0
         WHERE ie.DEL_FLAG = 0