未做核酸比对查询调整

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

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

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>