Merge branch 'develop_1' into 'develop_master'

Develop 1

See merge request !85

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

@@ -1,7 +1,10 @@
 package com.adc.da.slrs.sarStandardsInfo.controller;
 
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.util.ZipUtil;
+import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.common.FileUnZip;
 import com.adc.da.common.ReadExcel;
 import com.adc.da.exception.AdcDaBaseException;
@@ -17,6 +20,7 @@ import com.adc.da.util.LoginUserUtil;
 import com.adc.da.util.UUIDUtils;
 import com.adc.da.utils.util.*;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -38,6 +42,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -152,9 +157,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
                 page.setAdvanceSearchStr(null);
             }
         }
-        if(page.getUserId() == null || page.getUserId().equals("")){
+        page.setUserId(LoginUserUtil.getUserId());
-            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/standardSplit/entity/SarFileSplitInfoEO.java

@@ -13,6 +13,8 @@ import java.util.Date;
  */
 public class SarFileSplitInfoEO extends BaseEntity {
 
+
+    private String standType;
     private String sarType;
     private String fileName;
     private String id;
@@ -321,4 +323,12 @@ public class SarFileSplitInfoEO extends BaseEntity {
     public void setInfoId(String infoId) {
         this.infoId = infoId;
     }
+
+    public String getStandType() {
+        return standType;
+    }
+
+    public void setStandType(String standType) {
+        this.standType = standType;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java

@@ -10,6 +10,7 @@ import com.adc.da.base.page.BasePage;
  */
 public class SarFileSplitInfoEOPage extends BasePage {
 
+    private String standType;
     private String sarType;
     private String sarTypeOperator = "=";
     private String fileName;
@@ -49,6 +50,17 @@ public class SarFileSplitInfoEOPage extends BasePage {
 
     private String shunxu;
 
+    public SarFileSplitInfoEOPage() {
+    }
+
+    public String getStandType() {
+        return standType;
+    }
+
+    public void setStandType(String standType) {
+        this.standType = standType;
+    }
+
     public String getResult() {
         return result;
     }

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml

@@ -238,6 +238,7 @@
         select * from
         (select tmp_tb.* from
         (SELECT
+        SAR_STANDARDS_INFO.STAND_TYPE AS standType,
         SAR_FILE_SPLIT_INFO.*,
         if(
         SAR_STANDARDS_INFO.STAND_YEAR='',
@@ -266,6 +267,9 @@
         <if test="sarType != null and sarType != ''">
             and SAR_TYPE = #{sarType}
         </if>
+        <if test="standType != null and standType != ''">
+            and SAR_STANDARDS_INFO.STAND_TYPE = #{standType}
+        </if>
         <if test="id != null and id != ''">
             and SAR_FILE_SPLIT_INFO.id = #{id}
         </if>

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

@@ -276,14 +276,13 @@ public class AttFileEOController {
             TsUser tsUser = userDao.selectById(userId);
             if (tsUser != null) {
                 userMsg = tsUser.getUname() + ",";
-                //2021/7/28水印内容取消工号
+                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
-//                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
+                    userMsg += tsUser.getWorkNum() + ",";
-//                    userMsg += tsUser.getWorkNum() + ",";
+                }
-//                }
             }
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
             String date = df.format(new Date());
-            String waterContent = userMsg+date ;
+            String waterContent = userMsg + date;
             //2020年9月5日  去掉水印处理
             //2021年7月25日要求下载生成水印
             WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);