改下参数

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java

@@ -106,5 +106,12 @@ public class IcNatCompareRecordDTO implements Serializable {
     @ExcelProperty("检测结果")
     private String natResultDesc;
 
+    @ExcelIgnore
+    private String importDate;
+
 
+    @ColumnWidth(30)
+    @ExcelProperty("导入时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date importTime;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java

@@ -17,7 +17,7 @@ public class IcNatCompareRecordPageFormDTO extends PageFormDTO {
     /**
      * 导入时间 yyyyMMdd
      */
-    private String importTime;
+    private String importDate;
 
     /**
      * 姓名

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java

@@ -43,7 +43,7 @@ public class IcNatCompareRecordController {
     private IcNatCompareRecordService icNatCompareRecordService;
 
     /**
-     * 分页查询
+     * 未做核酸比对-分页查询
      * @param tokenDto
      * @param formDTO
      * @return
@@ -58,7 +58,7 @@ public class IcNatCompareRecordController {
     }
 
     /**
-     * pc:行程上报-导出
+     * pc:未做核酸比对-导出
      * @param tokenDto
      * @param formDTO
      * @param response
@@ -97,5 +97,4 @@ public class IcNatCompareRecordController {
         }
     }
 
-
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java

@@ -35,6 +35,11 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
     }
 
 
+    /**
+     * 列表分页查询
+     * @param formDTO
+     * @return
+     */
     @Override
     public PageData<IcNatCompareRecordDTO> page(IcNatCompareRecordPageFormDTO formDTO) {
         //1.获取工作人员缓存信息

epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml

@@ -25,7 +25,9 @@
             r.IMPORT_TIME,
             r.IMPORT_DATE,
             c.IC_RESI_USER_ID,
-            r.CUSTOMER_ID
+            r.CUSTOMER_ID,
+            r.IMPORT_DATE,
+            r.IMPORT_TIME as importTime
         FROM ic_nat_compare_rec_relation r
          left join ic_nat_compare_record c  on (r.COMPARE_REC_ID=c.ID)
         WHERE
@@ -44,8 +46,8 @@
         <if test='null != name and "" != name'>
             AND c.`NAME` LIKE CONCAT('%',#{name},'%')
         </if>
-        <if test='null != importTime and "" != importTime'>
-            AND DATE_FORMAT( r.IMPORT_DATE, '%Y%m%d' ) = #{importTime}
+        <if test='null != importDate and "" != importDate'>
+            AND  r.IMPORT_DATE = #{importDate}
         </if>
         <if test='null != agencyId and "" != agencyId'>
             AND r.AGENCY_ID = #{agencyId} or r.pids like concat('%',#{agencyId},'%')