From 63441779293b94e79f8611c4f25ef34c5ce4e23f Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 30 Nov 2023 14:28:31 +0800
Subject: [PATCH] =?UTF-8?q?bug:=2078302=E5=86=85=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=EF=BC=8C=E6=94=BF=E7=AD=96=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E5=A4=84?=
 =?UTF-8?q?=E7=90=86null=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InsideOutsideMeetingServiceImpl.java | 16 ++++--
 .../impl/SarLawsInformationServiceImpl.java   | 52 +++++++++----------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
index 5b163a30..63b64bb0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
@@ -561,7 +561,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
                             Method method = InsideOutsideMeeting.class.getMethod("get" + fieldName + "Name");
                             Object oldTypeName = method.invoke(oldMeeting);
                             CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
-                            changes.add(annotationsByType.fieldName() + "由\"" + oldTypeName + "\"改为\"" + typeName + "\"");
+                            changes.add(annotationsByType.fieldName() + "由\"" + Optional.ofNullable(oldTypeName).orElse("空") + "\"改为\"" + Optional.ofNullable(typeName).orElse("空") + "\"");
                         } else if ("meetingMinutes".equals(field.getName())) {
                             String oldValueStr = String.valueOf(oldValue);
                             String newValueStr = String.valueOf(newValue);
@@ -584,9 +584,19 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
                                     oldFileNameList.add(oldFile1.getOldFileName());
                                 }
                             }
+                            if (StringUtils.isBlank(String.join(",",oldFileNameList))) {
+                                oldValue = "空";
+                            }else {
+                                oldValue = String.join(",",oldFileNameList);
+                            }
+                            if (StringUtils.isBlank(String.join(",",fileNameList))) {
+                                newValue = "空";
+                            }else {
+                                newValue = String.join(",",fileNameList);
+                            }
                             // 获取字段名称
                             CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
-                            changes.add(annotationsByType.fieldName() + "由\"" + String.join(",",oldFileNameList) + "\"改为\"" + String.join(",",fileNameList) + "\"");
+                            changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");
                         } else if ("meetingTopicList".equals(field.getName())) {
                             String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
                             Method method = InsideOutsideMeeting.class.getMethod("get" + fieldName);
@@ -600,7 +610,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
                             }
                         } else {
                             CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
-                            changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");
+                            changes.add(annotationsByType.fieldName() + "由\"" + Optional.ofNullable(oldValue).orElse("空") + "\"改为\"" + Optional.ofNullable(newValue).orElse("空") + "\"");
                         }
                     }
                 } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
index 9fbfa59f..697b3cb0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
@@ -631,34 +631,24 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
             if (annotationPresent) {
                 try {
                     field.setAccessible(true);
-                    String oldValue = String.valueOf(field.get(oldInfo));
-                    String newValue = String.valueOf(field.get(newInfo));
+//                    String oldValue = String.valueOf(field.get(oldInfo));
+//                    String newValue = String.valueOf(field.get(newInfo));
+                    Object oldValue = field.get(oldInfo);
+                    Object newValue = field.get(newInfo);
+                    if (oldValue instanceof Date){
+                        oldValue = sdf.format((Date)oldValue);
+                    }
+                    if( newValue instanceof Date) {
+                        newValue = sdf.format((Date)newValue);
+                    }
                     if (!Objects.equals(oldValue, newValue)) {
                         switch (field.getName()) {
-//                            case "firstType":
-//                            case "secondType":
-//                            case "thirdType":
-//                            case "fourthType": {
-//                                List<String> typeNameList = new ArrayList<>();
-//                                if (StringUtils.isNotBlank(newValue)) {
-//                                    for (String type : newValue.split(",")) {
-//                                        if (StringUtils.isNotBlank(type)) {
-//                                            typeNameList.add(dicTypeService.getDicTypeNameByDicCode(type));
-//                                        }
-//                                    }
-//                                }
-//                                // 获取资料类型名称
-//                                String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
-//                                Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name");
-//                                Object oldTypeName = method.invoke(oldInfo);
-//                                ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0];
-//                                changes.add(annotationsByType.value() + "由\"" + oldTypeName + "\"改为\"" + String.join(",", typeNameList) + "\"");
-//                                break;
-//                            }
                             case "informationFile": {
                                 List<String> fileNameList = new ArrayList<>();
-                                if (StringUtils.isNotBlank(newValue)) {
-                                    String[] split = newValue.split(",");
+                                String oldValueStr = String.valueOf(field.get(oldInfo));
+                                String newValueStr = String.valueOf(field.get(newInfo));
+                                if (StringUtils.isNotBlank(newValueStr)) {
+                                    String[] split = newValueStr.split(",");
                                     for (String attId : split) {
                                         AttFileEO fileInfo = attFileEOService.getFileInfo(attId);
                                         fileNameList.add(fileInfo.getOldFileName());
@@ -675,14 +665,24 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
                                         oldFileNameList.add(oldFile1.getOldFileName());
                                     }
                                 }
+                                if (StringUtils.isBlank(String.join(",",oldFileNameList))) {
+                                    oldValue = "空";
+                                }else {
+                                    oldValue = String.join(",",oldFileNameList);
+                                }
+                                if (StringUtils.isBlank(String.join(",",fileNameList))) {
+                                    newValue = "空";
+                                }else {
+                                    newValue = String.join(",",fileNameList);
+                                }
                                 // 获取字段名称
                                 CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
-                                changes.add(annotationsByType.fieldName() + "由\"" + String.join(",", oldFileNameList) + "\"改为\"" + String.join(",", fileNameList) + "\"");
+                                changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");
                                 break;
                             }
                             default: {
                                 CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
-                                changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");
+                                changes.add(annotationsByType.fieldName() + "由\"" + Optional.ofNullable(oldValue).orElse("空") + "\"改为\"" + Optional.ofNullable(newValue).orElse("空") + "\"");
                                 break;
                             }
                         }