From 763752c586f8fcc0967764214659a7cd16ba9c59 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 14 Nov 2022 15:08:45 +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=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9EinternalR?=
 =?UTF-8?q?emark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java | 5 +++++
 .../handler/IcNatCompareRecordExcelImportListener.java     | 7 ++++++-
 .../src/main/resources/mapper/IcNatCompareRecordDao.xml    | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
index be20e5fa68..4a8c8f2be6 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
@@ -129,4 +129,9 @@ public class IcNatCompareRecordDTO implements Serializable {
     @ColumnWidth(30)
     @ExcelProperty("导入组织")
     private String agencyName;
+
+    /**
+     *
+     */
+    private String internalRemark;
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
index 531e977ea7..3ebe113874 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java
@@ -228,9 +228,14 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener<IcNat
                                     compareRecordEntity.setNatResult(NumConstant.ZERO_STR);
                                 }
                                 compareRecordEntity.setContactAddress(StringUtils.isNotBlank(address) ? address : StrConstant.EPMETY_STR);
+                                compareRecordEntity.setInternalRemark(String.format("匹配成功,采样时间一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
+                                        DateUtils.format(compareRecordEntity.getLatestCyTime(),DateUtils.DATE_TIME_PATTERN),
+                                        DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
                             } else {
                                 // 采样时间不一致，说明未出结果
-                                compareRecordEntity.setInternalRemark(String.format("采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s", compareRecordEntity.getLatestCyTime(), DateUtils.format(sample_time)));
+                                compareRecordEntity.setInternalRemark(String.format("采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s",
+                                        DateUtils.format(compareRecordEntity.getLatestCyTime(),DateUtils.DATE_TIME_PATTERN),
+                                        DateUtils.format(sample_time,DateUtils.DATE_TIME_PATTERN)));
                             }
                         } else {
                             compareRecordEntity.setInternalRemark("最近一次检测结果为空");
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 897493f745..420e585117 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
@@ -32,7 +32,8 @@
             c.IC_RESI_USER_ID,
             r.CUSTOMER_ID,
             r.IMPORT_DATE,
-            r.IMPORT_TIME as importTime
+            r.IMPORT_TIME as importTime,
+            c.INTERNAL_REMARK as internalRemark
         FROM ic_nat_compare_rec_relation r
          left join ic_nat_compare_record c  on (r.COMPARE_REC_ID=c.ID  AND c.del_flag='0')
         WHERE