diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java index 867de294..22e08474 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java @@ -71,7 +71,7 @@ public class SarBussStandFileController extends BaseController @ApiOperation(value = "|SarBussStandFileEO|批量修改加密文件不能打开问题") @GetMapping("/batchUpdateSarBussFile") /*@RequiresPermissions("lawss:sarLawsFile:list")*/ - public ResponseMessage batchUpdateSarBussFile() throws Exception { + public ResponseMessage> batchUpdateSarBussFile() throws Exception { return sarBussStandFileEOService.batchUpdateSarBussFile(); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java index 6d05a20f..1e14182b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java @@ -18,5 +18,5 @@ public interface ISarBussStandFileService extends IService { List selectFileByAttId(String attId) throws Exception; - ResponseMessage batchUpdateSarBussFile(); + ResponseMessage> batchUpdateSarBussFile(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java index 70b1ec3d..dba442bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java @@ -49,30 +49,25 @@ public class SarBussStandFileServiceImpl extends ServiceImpl batchUpdateSarBussFile() { + public ResponseMessage> batchUpdateSarBussFile() { List objects = new ArrayList<>(); - QueryWrapper objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); -// objectQueryWrapper.eq("FILE_SUFFIX","docx"); objectQueryWrapper.ne("FILE_SUFFIX","pdf"); objectQueryWrapper.ne("FILE_SUFFIX","PDF"); + objectQueryWrapper.ne("FILE_SUFFIX","xls"); + objectQueryWrapper.ne("FILE_SUFFIX","XLS"); List sarBussStandFiles = sarStandFileEODao.selectList(objectQueryWrapper); if(!sarBussStandFiles.isEmpty()){ for (SarBussStandFile data: sarBussStandFiles){ - QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); - objectQueryWrapperSarBussStandFile.eq("USE_MODEL","SOURCE_FILE"); objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID",data.getOriAttId()); -// objectQueryWrapper.eq("FILE_SUFFIX","docx"); - objectQueryWrapperSarBussStandFile.ne("FILE_SUFFIX","pdf"); - objectQueryWrapperSarBussStandFile.ne("FILE_SUFFIX","PDF"); - List sarBussStandFilesList = sarStandFileEODao.selectList(objectQueryWrapper); - if(!sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==1){ + objectQueryWrapperSarBussStandFile.eq("USE_MODEL","WEB_FILE"); + List sarBussStandFilesList = sarStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); + if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){ AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(data.getOriAttId()); if(attFileVo!=null){ SarBussStandFile sarBussStandFile = new SarBussStandFile(); - //sarBussStandFile.setId(); String uuId = com.adc.da.util.utils.UUID.randomUUID(20); sarBussStandFile.setId(uuId); sarBussStandFile.setStandId(data.getStandId()); @@ -88,14 +83,14 @@ public class SarBussStandFileServiceImpl extends ServiceImpl