From de9902f5c71ec322e6eea92a628a29633cef729b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 Oct 2022 16:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=A0=B8=E9=85=B8=E6=AF=94?=
 =?UTF-8?q?=E5=AF=B9=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/yqfk/IcNatCompareRecordPageFormDTO.java  | 11 +++++++++++
 .../controller/IcNatCompareRecordController.java      |  5 +++++
 .../main/resources/mapper/IcNatCompareRecordDao.xml   |  9 +++++++++
 3 files changed, 25 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java
index c5f6ddd53e..96ca61e0c7 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java
@@ -38,5 +38,16 @@ public class IcNatCompareRecordPageFormDTO extends PageFormDTO {
     private String customerId;
     private String userId;
     private String agencyId;
+
+    /**
+     * 检测时间
+     */
+    private String natDate;
+    /**
+     * 1:已检测
+     * 0：未检测
+     */
+    private String natStatus;
+
 }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java
index aa611e8252..8c1c245fde 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java
@@ -27,6 +27,7 @@ import com.epmet.service.IcNatCompareRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;
@@ -61,6 +62,7 @@ public class IcNatCompareRecordController implements ResultDataResolver {
 
     /**
      * 未做核酸比对-分页查询
+     * http://yapi.elinkservice.cn/project/245/interface/api/8129
      * @param tokenDto
      * @param formDTO
      * @return
@@ -68,6 +70,9 @@ public class IcNatCompareRecordController implements ResultDataResolver {
     @RequestMapping("page")
     @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     public Result<PageData<IcNatCompareRecordDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody IcNatCompareRecordPageFormDTO formDTO){
+        if (StringUtils.isNotBlank(formDTO.getNatDate()) && StringUtils.isBlank(formDTO.getNatStatus())) {
+            formDTO.setNatStatus(NumConstant.ONE_STR);
+        }
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         PageData<IcNatCompareRecordDTO> page = icNatCompareRecordService.page(formDTO);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml
index 0e3fcaa606..5015b8612a 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml
@@ -55,6 +55,15 @@
         <if test='null != agencyId and "" != agencyId'>
             AND (r.AGENCY_ID = #{agencyId} or r.pids like concat('%',#{agencyId},'%') )
         </if>
+
+        <if test='null != natDate and "" != natDate'>
+            <if test='null != natStatus and "1" == natStatus'>
+                AND DATE_FORMAT( r.LATEST_NAT_TIME, '%Y%m%d' ) = #{natDate}
+            </if>
+            <if test='null != natStatus and "0" == natStatus'>
+                AND DATE_FORMAT( r.LATEST_NAT_TIME, '%Y%m%d' ) != #{natDate}
+            </if>
+        </if>
         ORDER BY
             r.IMPORT_TIME DESC,r.AGENCY_ID desc
     </select>