From 1053529d99a19660ee21894a52865755a38281a3 Mon Sep 17 00:00:00 2001 From: zyd Date: Wed, 27 Jul 2022 23:41:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=BD=93=E6=B5=81=E7=A8=8B=E5=BD=92=E6=A1=A3=E6=88=96=E8=80=85?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=96=87=E4=BB=B6=E8=A1=A8=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=85=E7=A9=BA=E5=AF=BC=E8=87=B4=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=90=8C=E6=AD=A5=E8=80=81=E7=B3=BB=E7=BB=9F=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=85=A8=E9=83=A8=E8=A2=AB=E5=88=A0=E9=99=A4?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8B=E6=AC=A1=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E7=9B=B4=E6=8E=A5=E5=8F=88=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ISarBussionessStandService.java | 3 ++ .../impl/SarBussionessStandServiceImpl.java | 48 +++++++++++++---- .../SarStandardsInfoController.java | 2 +- .../service/ISarStandardsInfoService.java | 2 +- .../impl/SarStandardsInfoServiceImpl.java | 53 ++++++++----------- 5 files changed, 67 insertions(+), 41 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 516cca3f..1ab4392a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarBussionessStand.service; import com.adc.da.http.ResponseMessage; import com.adc.da.search.entity.SarBussionessStandEO; +import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; @@ -46,5 +47,7 @@ public interface ISarBussionessStandService extends IService boolean checkIsShow(SarBussionessStandEOPage page) throws Exception; List getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception; + + void convertDocAllQB(List list); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 1aa28ad0..d7b3b633 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -42,6 +42,7 @@ import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandFile.entity.SarStandFile; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; @@ -299,7 +300,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl fileMap) throws Exception { + public void createStandFile (String standId,Map fileMap,boolean upFlag) throws Exception { if (fileMap != null && fileMap.size() > 0) { List standFileList = new ArrayList<>(); for (Map.Entry entry : fileMap.entrySet()) { @@ -1094,7 +1095,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl fileList = attFileEOService.getMultiFileInfos(value); if (fileList != null && !fileList.isEmpty()) { - createStandFileAppend(standId,field,fileList,standFileList); + createStandFileAppend(standId,field,fileList,standFileList,upFlag); } } } @@ -1104,8 +1105,20 @@ public class SarBussionessStandServiceImpl extends ServiceImpl fileList,List standFileList) throws Exception { + public void createStandFileAppend (String standId,String field,List fileList,List standFileList,boolean upFlag) throws Exception { for (AttFileEO fileInfo : fileList) { + //TODO 20220727 此处为兼容老系统数据 将编辑去掉了先删除再添加的操作 + if(upFlag){ + QueryWrapper fileQueryWrapper = new QueryWrapper<>(); + fileQueryWrapper.eq("STAND_ID",standId); + fileQueryWrapper.eq("VALID_FLAG",0); + fileQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); + fileQueryWrapper.eq("ATT_ID",fileInfo.getId()); + int fileExist = sarBussStandFileEODao.selectCount(fileQueryWrapper); + if(fileExist>0){ + continue; + } + } SarBussStandFile sarStandFileEO = new SarBussStandFile(); sarStandFileEO.setCreationUser(LoginUserUtil.getUserId()); sarStandFileEO.setCreationTime(new Date()); @@ -1737,4 +1750,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl queryByList(SarBussionessStandEOPage sarBussionessStandEOPage){ return this.baseMapper.queryByList(sarBussionessStandEOPage); } + + @Override + public void convertDocAllQB(List list) { + try{ + for(SarBussStandFile sarStandFile : list){ + logger.error("QB++++++++++++++++:" + sarStandFile.getStandId()); + AttFileEO temp = attFileEOService.getFileInfo(sarStandFile.getAttId()); + createStandFileAppend(sarStandFile.getStandId(), sarStandFile.getStandFileClassify(), Arrays.asList(temp), new ArrayList<>(),true); + sarStandFile.setPassword("1"); + sarBussStandFileEODao.updateById(sarStandFile); + } + }catch(Exception e){ + logger.error(e.getMessage(),e); + } + } + + } 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 7c44c8c9..df295625 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 @@ -895,7 +895,7 @@ public class SarStandardsInfoController extends BaseController } List list = sarBussStandFileService.list(qw); logger.error("doc轉換共多少："+list.size()); - sarStandardsInfoEOService.convertDocAllQB(list); + iSarBussionessStandService.convertDocAllQB(list); return "1"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 55985183..f8cdc983 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -69,5 +69,5 @@ public interface ISarStandardsInfoService extends IService { void convertDocAll(List list); - void convertDocAllQB(List list); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 3dac3652..1cbb819b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -530,36 +530,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl()); + createStandFileAppend(sarStandFile.getStandId(), sarStandFile.getStandFileClassify(), Arrays.asList(temp), new ArrayList<>(),true); sarStandFile.setPassword("1"); sarStandFileService.updateById(sarStandFile); } }catch(Exception e){ - e.printStackTrace(); + logger.error(e.getMessage(),e); } } @Autowired private ISarStandFileService sarStandFileService; - @Autowired - private ISarBussStandFileService sarBussStandFileService; - - @Override - public void convertDocAllQB(List list) { - try{ - for(SarBussStandFile sarStandFile : list){ - logger.error("QB++++++++++++++++:" + sarStandFile.getStandId()); - AttFileEO attFileEO = new AttFileEO(); - attFileEO.setId(sarStandFile.getAttId()); - AttFileEO temp = attFileEODao.selectFileInfoById(attFileEO); - createStandFileAppend(sarStandFile.getStandId(), sarStandFile.getStandFileClassify(), Arrays.asList(temp), new ArrayList<>()); - sarStandFile.setPassword("1"); - sarBussStandFileService.updateById(sarStandFile); - } - }catch(Exception e){ - e.printStackTrace(); - } - } private String convertStandCodeHandle(String standCode) { if (StringUtils.isNotBlank(standCode)) { @@ -1248,7 +1229,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileMap) throws Exception { + public void createStandFile(String standId, Map fileMap,boolean upFlag) throws Exception { if (fileMap != null && fileMap.size() > 0) { List standFileList = new ArrayList<>(); List fileList = new ArrayList<>(); @@ -1427,7 +1408,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileList, List standFileList) throws Exception { + public void createStandFileAppend(String standId, String field, List fileList, List standFileList,boolean upFlag) throws Exception { for (AttFileEO fileInfo : fileList) { + //TODO 20220727 此处为兼容老系统数据 将编辑去掉了先删除再添加的操作 + if(upFlag){ + QueryWrapper fileQueryWrapper = new QueryWrapper<>(); + fileQueryWrapper.eq("STAND_ID",standId); + fileQueryWrapper.eq("VALID_FLAG","0"); + fileQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); + fileQueryWrapper.eq("ATT_ID",fileInfo.getId()); + int fileExist = sarStandFileService.count(fileQueryWrapper); + if(fileExist>0){ + continue; + } + } SarStandFile sarStandFileEO = new SarStandFile(); sarStandFileEO.setCreationUser(LoginUserUtil.getUserId()); sarStandFileEO.setCreationTime(new Date()); @@ -1909,8 +1902,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl