From 66edfd1afccaf63daad9410671d2b5f9abb79144 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 19 Aug 2021 16:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarLawsDetailedListController.java        | 3 +++
 .../service/impl/SarLawsDetailedListServiceImpl.java     | 5 ++++-
 .../adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java  | 2 +-
 .../da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java    | 9 +++++++++
 .../service/Impl/SarPublicIdeaAllServiceImpl.java        | 6 +++---
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
index c0ad920e..146af0f1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
@@ -117,6 +117,9 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
                     list1.set(a,fileNameDto);
                 }else if (null!=list.get(a).getFileIds()){
                     AttFileEO attFileEO = attFileEOController.getAttFileInfo(list.get(a).getFileIds()).getData();
+                    FindFileNameDto fileNameDto = list1.get(a);
+                    fileNameDto.setFileName(attFileEO.getOldFileName());
+                    list1.set(a,fileNameDto);
                 }
             }
             IPage<FindFileNameDto> publicList = new Page<>();
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
index ae70e74f..23fe19ab 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
@@ -320,7 +320,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                             }
                         }
                     }
-                    String completedString = builder.delete(builder.length() - 1, builder.length()).toString();
+                    String completedString = "";
+                    if (builder.length()>0) {
+                        completedString = builder.delete(builder.length() - 1, builder.length()).toString();
+                    }
                     list1.setCountryArea(completedString);
                 } else {
                     for (Map<String, String> map1 : arr) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java
index a1e195cf..e0da9d35 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java
@@ -8,6 +8,6 @@ public class DetAllStandDto {
     Integer size;
     String cid;
     String userId;
-    String startTime;
+    String endTime;
     String Account;
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
index d2bc72eb..54e7ba1c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
@@ -49,6 +49,15 @@ public class SarPublicIdeaAll extends BaseEntity {
     @TableField("dept_name")
     private String deptName;
 
+    @TableField("reason")
+    private String reason;
+
+    @TableField("old_text")
+    private String oldText;
+
+    @TableField("new_text")
+    private String newText;
+
     public static final String CID = "cid";
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
index 6d17d6f7..7f34cc6c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
@@ -40,11 +40,11 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
 
     @Override
     public IPage<SarPublicIdeaAllSUD> selectAll(DetAllStandDto detAllStandDto) {
-        if (detAllStandDto.getStartTime() != null) {
+        if (detAllStandDto.getEndTime() != null) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             Date Time = null;
             try {
-                Time = sdf.parse(detAllStandDto.getStartTime());
+                Time = sdf.parse(detAllStandDto.getEndTime());
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -110,7 +110,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date Time = null;
         try {
-            Time = sdf.parse(detAllStandDto.getStartTime());
+            Time = sdf.parse(detAllStandDto.getEndTime());
         } catch (ParseException e) {
             e.printStackTrace();
         }