Merge remote-tracking branch 'origin/develop_master' into develop_1

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java

@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -104,7 +103,7 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
             list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类
             List<AttFileEO> attFileEOS;//新建文件信息的集合
             for (int a=0;a<list.size();a++){
-                if (null!=list.get(a).getFileIds() && list.get(a).getFileIds().contains(",")){//判断集合中是否有id，是否有逗号//如果集合里附件id不为空且附件id包含“，”（不只一个）
+                if (null!=list.get(a).getFileIds() && list.get(a).getFileIds().contains(",")){//判断集合中是否有id，是否有逗号
                     attFileEOS = attFileEOController.getMultiFileInfos(list.get(a).getFileIds()).getData();//根据id取出数据
                     FindFileNameDto fileNameDto = list1.get(a);//按顺序取出新表数据
                     if (attFileEOS.size()<=1){//判断有几个数据
@@ -118,8 +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());//向新表里填入文件名
+                    FindFileNameDto fileNameDto = list1.get(a);
+                    fileNameDto.setFileName(attFileEO.getOldFileName());
+                    list1.set(a,fileNameDto);
                 }
             }
             IPage<FindFileNameDto> publicList = new Page<>();
@@ -153,15 +153,8 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
     @PutMapping("/updateList")
     public ResponseMessage updateList(@RequestBody DetailedUpDto detailedUpDto) {
         String src = sarLawsDetailedListService.updateList(detailedUpDto);
-        if (Objects.equals(src, "国家/地区清单修改失败") || Objects.equals(src, "车型类别清单修改失败")){
-            return Result.error("200","",false);
-        }else if (Objects.equals(src, "国家/地区清单修改成功") || Objects.equals(src, "车型类别清单修改成功")){
-            return Result.success("200","",true);
-        }else {
-            return Result.success("200","",true);
-        }
-
+        return Result.success("200",src,true);
     }
 
 
-}
+}

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) {

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;
 }

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";
 
 }

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();
         }