Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request !63

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java

@@ -1,7 +1,11 @@
 package com.adc.da.slrs.sarLawsAttrDetailedList.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * //新增清单进行时间的添加
@@ -13,10 +17,19 @@ import lombok.Data;
 public class StandRegionalTimeDto {
     @ApiModelProperty(value = "国家")
     private String country;
+
     @ApiModelProperty(value = "实施日期")
-    private String putTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date putTime;
+
     @ApiModelProperty(value = "在产车实施日期")
-    private String zccssrq;
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date zccssrq;
+
     @ApiModelProperty(value = "新车型实施日期")
-    private String xcxssrq;
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date xcxssrq;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.util.CollectionUtils;
 
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -270,13 +271,11 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
     }
 
     private void dateTime(LinkedHashMap<String, List<String>> mapList, List<String> putTime, List<String> xcx, List<String> zcc, StandRegionalTimeDto s) {
-        putTime.add(s.getPutTime()) ;
+        putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()));
-        xcx.add(s.getXcxssrq());
+        xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()));
-        zcc.add(s.getZccssrq());
+        zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()));
         mapList.put("实施日期("+s.getCountry()+")",putTime);
         mapList.put("新车型实施日期("+s.getCountry()+")",xcx);
         mapList.put("在产车实施日期("+s.getCountry()+")",zcc);
     }
-
-
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java

@@ -5,11 +5,13 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -60,10 +62,14 @@ public class SarStandAttrInfo extends BaseEntity {
 
     @ApiModelProperty(value = "新车型实施日期（文本）")
     @TableField("XCXSSRQ")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private String xcxssrq;
 
     @ApiModelProperty(value = "在产车实施日期（文本）")
     @TableField("ZCCSSRQ")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private String zccssrq;
 
     @ApiModelProperty(value = "标签")
@@ -148,6 +154,8 @@ public class SarStandAttrInfo extends BaseEntity {
 
     @ApiModelProperty(value = "实施日期(标准文本）")
     @TableField("SSRQ")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private String ssrq;
 
     @ApiModelProperty(value = "实施日期(国际）")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -151,7 +151,9 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
                 page.setAdvanceSearchStr(null);
             }
         }
-        page.setUserId(LoginUserUtil.getUserId());
+        if(page.getUserId() == null || page.getUserId().equals("")){
+            page.setUserId(LoginUserUtil.getUserId());
+        }
         List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -202,7 +202,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     page.setMenuAllChildrenIdList(ids);
                 }
             }
-
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);

adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java

@@ -273,20 +273,16 @@ public class AttFileEOController {
             String waterFilePath = newFilePath + attFileEO.getOldFileName();
             // 添加水印
             String userMsg = "";
-            String date="";
             TsUser tsUser = userDao.selectById(userId);
             if (tsUser != null) {
                 userMsg = tsUser.getUname() + ",";
                 if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
                     userMsg += tsUser.getWorkNum() + ",";
                 }
-            }else {
-                //没有用户信息时
-                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
-                 date = df.format(new Date());
             }
-
+//            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
-            String waterContent = userMsg + date;
+//            String date = df.format(new Date());
+            String waterContent = userMsg ;
             //2020年9月5日  去掉水印处理
             //2021年7月25日要求下载生成水印
             WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);