From ec0c40f7cafa6b347c66df2aa72cd783f8d2fa94 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Mon, 13 Nov 2023 15:04:10 +0800
Subject: [PATCH] =?UTF-8?q?bug:=2078317=E6=94=BF=E7=AD=96=E8=AF=BE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarLawsTopic/entity/SarLawsTopic.java     |  2 +-
 .../service/impl/SarLawsTopicServiceImpl.java | 26 +++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
index 9ceb0cff..de104c22 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
@@ -58,7 +58,7 @@ public class SarLawsTopic implements Serializable {
     /**
      * 开始时间
      */
-    @ApiModelProperty(value = "开始时间")
+    @ApiModelProperty(value = "启动时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @TableField(value = "START_TIME")
     private Date startTime;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
index eda4d874..c8fad2fb 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
@@ -414,14 +414,16 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
             if (!ignoreFieldList.contains(field.getName())) {
                 try {
                     field.setAccessible(true);
-                    String oldValue = String.valueOf(field.get(oldLawsTopic));
-                    String newValue = String.valueOf(field.get(newLawsTopic));
+                    Object oldValue = field.get(oldLawsTopic);
+                    Object newValue = field.get(newLawsTopic);
                     if (!Objects.equals(oldValue, newValue)) {
                         // 对比文件字段
                         if (fileAttIdFieldList.contains(field.getName())) {
+                            String oldValueStr = String.valueOf(oldValue);
+                            String newValueStr = String.valueOf(newValue);
                             List<String> fileNameList = new ArrayList<>();
-                            if (StringUtils.isNotBlank(newValue)) {
-                                String[] split = newValue.split(",");
+                            if (StringUtils.isNotBlank(newValueStr)) {
+                                String[] split = newValueStr.split(",");
                                 for (String attId : split) {
                                     AttFileEO fileInfo = attFileEOService.getFileInfo(attId);
                                     fileNameList.add(fileInfo.getOldFileName());
@@ -447,7 +449,21 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
                                 || "insideContactInformationList".equals(field.getName())) {
                             ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0];
                             changes.add(annotationsByType.value() + "被变更");
-                        } else {
+                        } else if ("startTime".equals(field.getName()) || "closeTime".equals(field.getName())) {
+                            ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0];
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                            String oldDateStr = null;
+                            String newDateStr = null;
+                            if (newValue != null) {
+                                Date oldDate = (Date) newValue;
+                                oldDateStr = sdf.format(oldDate);
+                            }
+                            if (oldValue!= null) {
+                                Date newDate = (Date) oldValue;
+                                newDateStr = sdf.format(newDate);
+                            }
+                            changes.add(annotationsByType.value() + "由\"" + oldDateStr + "\"改为\"" + newDateStr + "\"");
+                        }else {
                             // 对比其他字段
                             ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0];
                             changes.add(annotationsByType.value() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");