From 2b209fc4c8548b63002d22bf60d92b5d38412b86 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 10 Apr 2023 15:29:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E6=8B=86=E5=88=86=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 ff260176..ba5386a1 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 @@ -4434,10 +4434,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList = Arrays.asList(split); + List sarBussStandAttrInfoList = new ArrayList<>(); + for(String idInfo :asList){ + SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(idInfo); + AttFileEO byId = iAttFileEOService.getFileInfo(sarBussStandAttrInfo.getFbgbuss()); + sarBussStandAttrInfo.setFbgbussNmae(byId.getOldFileName()); + sarBussStandAttrInfoList.add(sarBussStandAttrInfo); + } + return Result.success(sarBussStandAttrInfoList); } public String updateInfo(List asList,String standId,String attfId) { From bdbe9d12a419a2cd5028a1ccc7d8094e8fbedd6f Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 10 Apr 2023 21:45:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=86=E5=88=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitItemsEOServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 0a39ea43..c8c2799c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -24,6 +24,7 @@ import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.utils.treetool.Tree; import com.adc.da.utils.treetool.TreeNode; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1054,7 +1055,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic sarFileSplitInfoEO.setResult("1"); sarFileSplitInfoEO.setModifyUser(LoginUserUtil.getUserId()); sarFileSplitInfoEO.setStandId(sarFileSplitInfoEO.getStandId()); - sarFileSplitInfoEOService.insertSelective(sarFileSplitInfoEO); + // sarFileSplitInfoEOService.insertSelective(sarFileSplitInfoEO); } Map menuPidMap = new HashMap<>(); @@ -1073,10 +1074,14 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic } itemsEO.setItermsConditions(tupian); } - String menuIdT = createItemsInfo(itemsEO,infoId,countSuccess,menuPidMap); - menuPidMap.put(itemsEO.getItemsNum(),menuIdT); + // String menuIdT = createItemsInfo(itemsEO,infoId,countSuccess,menuPidMap); + //menuPidMap.put(itemsEO.getItemsNum(),menuIdT); countSuccess++; } + //加入的里面 删除旧的 + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("STAND_ID",sarFileSplitInfoEO.getStandId()); + sarStandItemsDao.delete(objectQueryWrapper); //加入的里面 for (SarFileSplitItemsEO itemsEO : addItemsEOList){ if(itemsEO.getItemsNum().equals("总目录")) {