From bf479207d7fa619d3d7009d2609d6f0211fda95f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 13:49:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmployeeRegisterListFormDTO.java | 9 +++++++ .../IcEmployeeRegisterController.java | 2 +- .../com/epmet/dao/IcEmployeeRegisterDao.java | 8 ++++++ .../impl/IcEmployeeRegisterServiceImpl.java | 13 +++++++++- .../mapper/IcEmployeeRegisterDao.xml | 26 ++++++++++++++++++- 5 files changed, 55 insertions(+), 3 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 d1bac85f97..85f2da1d18 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 @@ -3,6 +3,7 @@ package com.epmet.dto.form; import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -38,4 +39,12 @@ public class EmployeeRegisterListFormDTO extends PageFormDTO implements Serializ private String name; private String mobile; private String idCard; + + public interface RegisterDetailList{} + + /** + * 人员详情列表使用 + */ + @NotBlank(message = "registerId不能为空",groups = RegisterDetailList.class) + private String registerId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index b31e4f7b7a..4df78f16b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -109,7 +109,7 @@ public class IcEmployeeRegisterController { @PostMapping("detailList") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result> employeeRegisterDetailList(@RequestBody EmployeeRegisterListFormDTO formDTO, @LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class, EmployeeRegisterListFormDTO.RegisterDetailList.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icEmployeeRegisterService.employeeRegisterDetailList(formDTO)); 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 e5756c7a2b..56843e67c7 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 @@ -42,4 +42,12 @@ public interface IcEmployeeRegisterDao extends BaseDao */ List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 13:24 + */ + List employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO); + } \ No newline at end of file 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 aecf01c5ca..5748cde435 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 @@ -157,7 +157,18 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO) { - return null; + PageData result = new PageData<>(); + List list; + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterDetailList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + list = baseDao.employeeRegisterDetailList(formDTO); + result.setTotal(list.size()); + result.setList(list); + } + return result; } } \ No newline at end of file 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 cc07dec0d6..177aae0e96 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 @@ -37,7 +37,7 @@ ie.PLACE_ORG_NAME, ie.PLACE_CATEGORY FROM ic_enterprise ie - left join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 + 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(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') @@ -75,4 +75,28 @@ GROUP BY t.registerId ORDER BY LATEST_NAT_TIME desc + + + \ No newline at end of file