From 93948c6ceae6c6addb9140b1bfb35784f84c6efb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 27 Oct 2022 14:38:54 +0800
Subject: [PATCH] employeeRegisterList

---
 .../resources/mapper/IcEmployeeRegisterDao.xml   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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 fcb029f4e1..4d0404334d 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
@@ -41,7 +41,13 @@
             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},'%')
+              AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
+            <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 rd.CREATED_TIME DESC
         )t
         where 1=1
@@ -54,6 +60,14 @@
                     AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') <![CDATA[<=]]> #{natEndDate}
                 </if>
             </when>
+            <when test='checkStatus == "0" '>
+                <if test='null != natStartDate and natStartDate != ""'>
+                    AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') <![CDATA[<=]]> #{natStartDate}
+                </if>
+                <if test='null != natEndDate and natEndDate != ""'>
+                    AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d')  >= #{natEndDate}
+                </if>
+            </when>
             <otherwise>
 
             </otherwise>