FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_3' into develop_3

Browse Source 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
This commit is contained in:
super_liu
2021-07-30 16:54:36 +08:00
parent 343913c799 d7a2285d75
commit de95dc63ae
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
-3
View File
@@ -3,7 +3,6 @@ package com.adc.da.slrs.sarResource.dao;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.HashMap;
import java.util.List;
/**
@@ -20,6 +19,4 @@ public interface TsResourceDao extends BaseMapper<TsResource> {
List<TsResource> selectMenuByRole(TsResource sarMenuEO);
int insertTsRoleResource(HashMap<String,Object> map);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+5
View File
@@ -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.*;