Merge remote-tracking branch 'origin/dev_dengjima' into dev_dengjima

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;
 }

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<PageData<EmployeeRegisterListResultDTO>> 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<PageData<EmployeeRegisterListResultDTO>>().ok(icEmployeeRegisterService.employeeRegisterDetailList(formDTO));

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java

@@ -42,4 +42,12 @@ public interface IcEmployeeRegisterDao extends BaseDao<IcEmployeeRegisterEntity>
      */
     List<EmployeeRegisterListResultDTO> employeeRegisterList(EmployeeRegisterListFormDTO formDTO);
 
+    /**
+     * @Description 员工疫情管理详情列表
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/10/27 13:24
+     */
+    List<EmployeeRegisterListResultDTO> employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO);
+
 }

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

@@ -164,7 +164,18 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeReg
      */
     @Override
     public PageData<EmployeeRegisterListResultDTO> employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO) {
-        return null;
+        PageData<EmployeeRegisterListResultDTO> result = new PageData<>();
+        List<EmployeeRegisterListResultDTO> list;
+        if (formDTO.getIsPage()){
+            PageInfo<EmployeeRegisterListResultDTO> 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;
     }
 
 }

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

@@ -38,7 +38,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},'%')
@@ -76,4 +76,28 @@
         GROUP BY t.registerId
         ORDER BY LATEST_NAT_TIME desc
     </select>
+
+    <!-- 员工疫情管理详情列表 -->
+    <select id="employeeRegisterDetailList" resultType="com.epmet.dto.result.EmployeeRegisterListResultDTO">
+        SELECT
+            ier.`NAME`,
+            ier.MOBILE,
+            ier.ID_CARD,
+            rd.YMJZ_COUNT,
+            rd.LATEST_NAT_TIME,
+            ie.PLACE_ORG_NAME,
+            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
+        LEFT JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0
+        WHERE ier.DEL_FLAG = 0
+          AND ier.ID = #{registerId}
+          <if test='null != natStartDate and natStartDate != "" '>
+              AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate}
+          </if>
+          <if test='null != natEndDate and natEndDate != "" '>
+              AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') <![CDATA[<=]]> #{natEndDate}
+          </if>
+        ORDER BY LATEST_NAT_TIME DESC
+    </select>
 </mapper>