diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java index 172d875f03..3fcb98125a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java +++ b/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; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 621e7e29fc..1d3f5b0de7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/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 pageInfo = new PageInfo<>(); - if (formDTO.getCheckStatus().equals(NumConstant.ONE_STR)){ - pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); - }else { + if (formDTO.getCheckStatus().equals(NumConstant.ZERO_STR)){ // 已检测 List 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()))); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml index ea2a031caa..88e9d73f79 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml +++ b/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