diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 5e5a1324..c35efe84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/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.*; @@ -77,12 +82,6 @@ public class SarStandardsInfoController extends BaseController @Autowired ISarLawsInfoService sarLawsInfoEOService; - @ApiOperation(value="SarStandardsInfoEO|反向标准操作") - @GetMapping(value = "/reverseQueryStand") - public void reverseQueryStand(@RequestParam(name="ids",required=true) String ids, String standName, String type) { - this.sarStandardsInfoEOService.reverseQueryStand(Arrays.asList(ids.split(",")),standName,type); - } - @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") @GetMapping("/getSarStandardsInfoPage") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") @@ -152,9 +151,7 @@ public class SarStandardsInfoController extends BaseController page.setAdvanceSearchStr(null); } } - if(page.getUserId() == null || page.getUserId().equals("")){ - page.setUserId(LoginUserUtil.getUserId()); - } + page.setUserId(LoginUserUtil.getUserId()); List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 5ffdf75d..600d4d9b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -93,7 +93,7 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) // @RequiresPermissions("person:personCollect:update") public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { tsPersonCollect.setModifyTime(new Date());