From aa5c2aaccf6786a4ac2b6d5393952e7063439a4d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 15:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmployeeRegisterListFormDTO.java | 3 + .../result/EmployeeRegisterListResultDTO.java | 3 + .../constant/CustomerAgencyConstant.java | 2 +- .../com/epmet/dao/IcEmployeeRegisterDao.java | 2 + .../impl/IcEmployeeRegisterServiceImpl.java | 18 ++-- .../mapper/IcEmployeeRegisterDao.xml | 87 ++++++++++++------- 6 files changed, 79 insertions(+), 36 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java index 85f2da1d18..7a2fb690e2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; /** * @Author zxc @@ -47,4 +48,6 @@ public class EmployeeRegisterListFormDTO extends PageFormDTO implements Serializ */ @NotBlank(message = "registerId不能为空",groups = RegisterDetailList.class) private String registerId; + + private List registerIds; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java index 047c5374dd..98ddd2ab8c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java @@ -21,6 +21,8 @@ public class EmployeeRegisterListResultDTO implements Serializable { private String latestNatTime; private String registerId; + private String agencyId; + public EmployeeRegisterListResultDTO() { this.placeOrgName = ""; this.name = ""; @@ -29,5 +31,6 @@ public class EmployeeRegisterListResultDTO implements Serializable { this.ymjzCount = NumConstant.ZERO; this.latestNatTime = ""; this.registerId = ""; + this.agencyId = ""; } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index c41372e2a7..aede67b81e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -90,6 +90,6 @@ public interface CustomerAgencyConstant { String AREA_CODE_SWITCH_OPEN="open"; - String JUMP_URL = "http://192.168.1.140/epmet-oper/#/staffRegister?"; + String JUMP_URL = "http://192.168.1.140/epmet-oper-gov/#/staffRegister?"; // String JUMP_URL = "https://epmet-open.elinkservice.cn/epmet-oper-gov/#/staffRegister?"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index a0752de3bd..2211398af1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterEntity; @@ -41,6 +42,7 @@ public interface IcEmployeeRegisterDao extends BaseDao * @Date 2022/10/27 09:15 */ List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + List employeeRegisterListNoCheck(EmployeeRegisterListFormDTO formDTO); /** * @Description 员工疫情管理详情列表 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 d10f34ec98..621e7e29fc 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 @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 员工登记表 @@ -144,14 +145,21 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl result = new PageData<>(); List list; + // 未核酸检测的查询，根据所有企业下登记过的员工，筛出时间段内已检测的，剩下的就是未检测 if (formDTO.getIsPage()){ - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + PageInfo pageInfo = new PageInfo<>(); + if (formDTO.getCheckStatus().equals(NumConstant.ONE_STR)){ + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + }else { + // 已检测 + 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)); + } + } result.setList(pageInfo.getList()); result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); - }else { - list = baseDao.employeeRegisterList(formDTO); - result.setList(list); - result.setTotal(list.size()); } return result; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index dbda4a3d7b..148c22758d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -36,44 +36,22 @@ ier.ID_CARD, ier.ENTERPRISE_ID, ie.PLACE_ORG_NAME, - ie.PLACE_CATEGORY + ie.PLACE_CATEGORY, + ie.AGENCY_ID FROM ic_enterprise ie INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} - - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - - ORDER BY rd.CREATED_TIME DESC )t where 1=1 - - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - - - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natStartDate} - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natEndDate} - - - - - - + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + AND PLACE_ORG_NAME LIKE CONCAT('%',#{placeOrgName},'%') @@ -102,6 +80,7 @@ rd.YMJZ_COUNT, rd.LATEST_NAT_TIME, ie.PLACE_ORG_NAME, + ie.AGENCY_ID, ier.ID AS registerId FROM ic_employee_register ier LEFT JOIN ic_enterprise ie ON ie.ID = ier.ENTERPRISE_ID AND ie.DEL_FLAG = 0 @@ -116,4 +95,52 @@ ORDER BY rd.LATEST_NAT_TIME DESC,rd.CREATED_TIME desc + + \ No newline at end of file