From 878945698a140cfd1726e0b609ff5a37ceba3da5 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 10:34:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=AF=B9=E4=BC=81=E6=A0=87=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workFlow/service/ActSarItemsBussEOService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 9b779afd..ddef214e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -407,6 +407,12 @@ public class ActSarItemsBussEOService { } } + //企标实施时间 + if (StringUtils.isBlank(sarBussionessStand.getPutTime())){ + logger.info("企标实施日期不能为空"); + throw new AdcDaBaseException("企标实施日期不能为空"); + } + List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); // if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { // sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); @@ -488,6 +494,12 @@ public class ActSarItemsBussEOService { // if (count > 0){ // throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); // } + //制定和修订类型 清除历史版本 + JSONObject atteObj = JSON.parseObject(sarBussionessStand.getSarStandAttrEOStr()); + atteObj.remove("LSBBBUSS"); + atteObj.put("LSBBBUSS",""); + String resData1 = JSON.toJSONString(atteObj); + sarBussionessStand.setSarStandAttrEOStr(resData1); ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); if(responseMessage.isOk()){ SarBussionessStand bussionessStand = responseMessage.getData(); From 740986eac7122fdfc3cacae73fa23faecffa867d Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 11:27:46 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=97=B6=E5=8F=96=E6=B6=88=E5=AF=B9=E4=BC=81=E6=A0=87=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/workFlow/service/ActSarItemsBussEOService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index ddef214e..2e3d8450 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -408,10 +408,10 @@ public class ActSarItemsBussEOService { } //企标实施时间 - if (StringUtils.isBlank(sarBussionessStand.getPutTime())){ - logger.info("企标实施日期不能为空"); - throw new AdcDaBaseException("企标实施日期不能为空"); - } +// if (StringUtils.isBlank(sarBussionessStand.getPutTime())){ +// logger.info("企标实施日期不能为空"); +// throw new AdcDaBaseException("企标实施日期不能为空"); +// } List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); // if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { From 3fe12077cb9a7afc88cf3e7aa776a956dc08f3d0 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 12:47:35 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=8A=9F=E8=BF=94=E5=9B=9E=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index c5d1cfad..7f93b5bb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -180,7 +180,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl Date: Fri, 7 Apr 2023 18:07:21 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=8B=86?= =?UTF-8?q?=E5=88=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 11 +++ .../impl/SarStandItemsServiceImpl.java | 89 +++++++++++++++++++ .../dao/SarFileSplitItemsEODao.java | 4 + .../service/SarFileSplitMenuEOService.java | 2 + .../impl/SarFileSplitMenuEOServiceImpl.java | 6 ++ 5 files changed, 112 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 6b6847e4..d6df0d61 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -8,6 +8,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; @@ -95,6 +96,16 @@ public class SarStandItemsController extends BaseController { return Result.success(pageInfo); } + @ApiOperation(value = "分解单查询") + @GetMapping("/selectSarItemAndInterpretation") + public ResponseMessage selectSarItemAndInterpretation(String standId)throws Exception{ + FindSarItemsPageReqDTO page = new FindSarItemsPageReqDTO(); + page.setStandId(standId); + Map map = ServiceImpl.selectSarItemAndInterpretation(page.getStandId()); + page.getPager().setRowCount((Integer) map.get("count")); + return Result.success(getPageInfo(page.getPager(), (List) map.get("list"))); + } + @ApiOperation(value = "分解单更新") @PutMapping("/updateSarItemAndInterpretation") public ResponseMessage updateSarItemAndInterpretation(@RequestBody SarStandItems resolveListForm){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 2204a86d..3668e110 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -12,9 +12,16 @@ import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsEODao; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsParamsEODao; +import com.adc.da.slrs.standardSplit.entity.*; +import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.service.IDicTypeEOService; +import com.adc.da.utils.treetool.Tree; +import com.adc.da.utils.treetool.TreeNode; import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -52,6 +59,18 @@ public class SarStandItemsServiceImpl extends ServiceImpl queryItemsByList(SarStandItemsEOPage page, String resType){ List itemsEOList = dao.queryItemsByList(page); List actitemsEOList = new ArrayList<>(); @@ -351,4 +370,74 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectSarItemAndInterpretation(String standId)throws Exception { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("STAND_ID",standId); + SarFileSplitInfoEO sarFileSplitInfoEO = sarFileSplitInfoEODao.selectOne(queryWrapper); + + String infoId = sarFileSplitInfoEO.getInfoId(); + + SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); + String id = sarFileSplitMenuEOService.selectByInfoId(infoId); + page.setId(id); + //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 + page.setValidFlag("0"); + //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 + if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { + //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 + List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); + //把这个sarFileSplitMenuEOList转换成树的形式 + Tree tree = new Tree<>(sarFileSplitMenuEOList); + //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId + TreeNode treeNode = tree.getTreeNode(page.getMenuId()); + + List menuIds = new ArrayList<>(); + //然后把刚刚的treeNode的nodeId放到menuIds数组里 + menuIds.add(treeNode.getNodeId()); + for (TreeNode node : treeNode.getAllChildren()) { + //把所有的treeNode的nodeId放到menuIds数组里 + menuIds.add(node.getNodeId()); + } + //把它放到MenuIdList里 + page.setMenuIdList(menuIds); + } + //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） + int count = sarFileSplitItemsEODao.queryByCount(page); + //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 + List rows = sarFileSplitItemsEODao.queryByPage(page); + //如果查询出来的结果不为空 + if (rows != null && !rows.isEmpty()) { + //遍历rows + for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { + //查询svpps + String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); + sarFileSplitItemsEO.setSvppsShow(svppsShow); + SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); + paramPage.setItemId(sarFileSplitItemsEO.getId()); + List paramList = sarFileSplitItemsParamsEODao.queryByList(paramPage); + sarFileSplitItemsEO.setParamsList(paramList); + String foName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getFo()); + sarFileSplitItemsEO.setFoShow(foName); + //TODO 2021年6月17日 补充责任部门和项目评估角色回显时如果时多个时回显为空的情况 + String dutyEngineerName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getDutyEngineer()); + sarFileSplitItemsEO.setDutyEngineerShow(dutyEngineerName); + //责任部门多个时 + String orgNames = sysInfoEOService.getOrgNamesByIds(sarFileSplitItemsEO.getResponsibleUnit()); + sarFileSplitItemsEO.setResponsibleUnitShow(orgNames); + } + + } + Map map = new HashMap<>(); + map.put("list",rows); + map.put("count",count); + return map; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index 722ae9d0..1a1f00fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -8,6 +8,8 @@ import com.adc.da.slrs.standardSplit.entity.SarStandItemsEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + import java.util.List; /** @@ -59,4 +61,6 @@ public interface SarFileSplitItemsEODao extends BaseMapper int deleteByPrimaryKey(String id); + @Select("select ID from sar_file_split_info where INFO_ID=#{infoId}") + String selectByInfoId(String infoId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java index 193d4cbe..d869ac74 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java @@ -32,4 +32,6 @@ public interface SarFileSplitMenuEOService { String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO); List getChildData(String id); + + String selectByInfoId(String infoId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java index 4000382a..23326ec0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -459,6 +459,12 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService return dealData(id,res); } + @Override + public String selectByInfoId(String infoId) { + String info = sarFileSplitItemsEODao.selectByInfoId(infoId); + return info; + } + private List dealData(String id ,List res){ List strings = SarFileSplitMenuEODao.getChildData(id); res.addAll(strings); From 960fb4c422bb77bf0ee54bd35e48c676704deddf Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 7 Apr 2023 18:46:05 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandItemsServiceImpl.java | 112 +++++++++--------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 3668e110..3aa67767 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -379,65 +379,67 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectSarItemAndInterpretation(String standId)throws Exception { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("STAND_ID",standId); - SarFileSplitInfoEO sarFileSplitInfoEO = sarFileSplitInfoEODao.selectOne(queryWrapper); + List sarFileSplitInfoEO = sarFileSplitInfoEODao.selectList(queryWrapper); - String infoId = sarFileSplitInfoEO.getInfoId(); + for (SarFileSplitInfoEO data : sarFileSplitInfoEO){ + String idInfo = data.getId(); + SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); + String id = sarFileSplitMenuEOService.selectByInfoId(idInfo); + page.setId(id); + //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 + page.setValidFlag("0"); + //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 + if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { + //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 + List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); + //把这个sarFileSplitMenuEOList转换成树的形式 + Tree tree = new Tree<>(sarFileSplitMenuEOList); + //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId + TreeNode treeNode = tree.getTreeNode(page.getMenuId()); - SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); - String id = sarFileSplitMenuEOService.selectByInfoId(infoId); - page.setId(id); - //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 - page.setValidFlag("0"); - //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 - page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); - //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 - if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { - //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 - List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); - //把这个sarFileSplitMenuEOList转换成树的形式 - Tree tree = new Tree<>(sarFileSplitMenuEOList); - //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId - TreeNode treeNode = tree.getTreeNode(page.getMenuId()); - - List menuIds = new ArrayList<>(); - //然后把刚刚的treeNode的nodeId放到menuIds数组里 - menuIds.add(treeNode.getNodeId()); - for (TreeNode node : treeNode.getAllChildren()) { - //把所有的treeNode的nodeId放到menuIds数组里 - menuIds.add(node.getNodeId()); - } - //把它放到MenuIdList里 - page.setMenuIdList(menuIds); - } - //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） - int count = sarFileSplitItemsEODao.queryByCount(page); - //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 - List rows = sarFileSplitItemsEODao.queryByPage(page); - //如果查询出来的结果不为空 - if (rows != null && !rows.isEmpty()) { - //遍历rows - for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { - //查询svpps - String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); - sarFileSplitItemsEO.setSvppsShow(svppsShow); - SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); - paramPage.setItemId(sarFileSplitItemsEO.getId()); - List paramList = sarFileSplitItemsParamsEODao.queryByList(paramPage); - sarFileSplitItemsEO.setParamsList(paramList); - String foName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getFo()); - sarFileSplitItemsEO.setFoShow(foName); - //TODO 2021年6月17日 补充责任部门和项目评估角色回显时如果时多个时回显为空的情况 - String dutyEngineerName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getDutyEngineer()); - sarFileSplitItemsEO.setDutyEngineerShow(dutyEngineerName); - //责任部门多个时 - String orgNames = sysInfoEOService.getOrgNamesByIds(sarFileSplitItemsEO.getResponsibleUnit()); - sarFileSplitItemsEO.setResponsibleUnitShow(orgNames); + List menuIds = new ArrayList<>(); + //然后把刚刚的treeNode的nodeId放到menuIds数组里 + menuIds.add(treeNode.getNodeId()); + for (TreeNode node : treeNode.getAllChildren()) { + //把所有的treeNode的nodeId放到menuIds数组里 + menuIds.add(node.getNodeId()); + } + //把它放到MenuIdList里 + page.setMenuIdList(menuIds); } + //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） + int count = sarFileSplitItemsEODao.queryByCount(page); + //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 + List rows = sarFileSplitItemsEODao.queryByPage(page); + //如果查询出来的结果不为空 + if (rows != null && !rows.isEmpty()) { + //遍历rows + for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { + //查询svpps + String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); + sarFileSplitItemsEO.setSvppsShow(svppsShow); + SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); + paramPage.setItemId(sarFileSplitItemsEO.getId()); + List paramList = sarFileSplitItemsParamsEODao.queryByList(paramPage); + sarFileSplitItemsEO.setParamsList(paramList); + String foName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getFo()); + sarFileSplitItemsEO.setFoShow(foName); + //TODO 2021年6月17日 补充责任部门和项目评估角色回显时如果时多个时回显为空的情况 + String dutyEngineerName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getDutyEngineer()); + sarFileSplitItemsEO.setDutyEngineerShow(dutyEngineerName); + //责任部门多个时 + String orgNames = sysInfoEOService.getOrgNamesByIds(sarFileSplitItemsEO.getResponsibleUnit()); + sarFileSplitItemsEO.setResponsibleUnitShow(orgNames); + } + } + Map map = new HashMap<>(); + map.put("list",rows); + map.put("count",count); + return map; } - Map map = new HashMap<>(); - map.put("list",rows); - map.put("count",count); - return map; + return null; } } From a0829f5ede21ff2b8e7a1130181d9ed0778962e4 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 19:13:31 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 6 ++---- .../da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java | 1 + .../da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java | 2 +- .../mapper/standardSplit/SarFileSplitInfoEOMapper.xml | 4 ++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 3aa67767..dc737bb1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -377,15 +377,13 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectSarItemAndInterpretation(String standId)throws Exception { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("STAND_ID",standId); - List sarFileSplitInfoEO = sarFileSplitInfoEODao.selectList(queryWrapper); + List sarFileSplitInfoEO = sarFileSplitInfoEODao.selectByStandId(standId); for (SarFileSplitInfoEO data : sarFileSplitInfoEO){ String idInfo = data.getId(); SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); String id = sarFileSplitMenuEOService.selectByInfoId(idInfo); - page.setId(id); + page.setInfoId(id); //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 page.setValidFlag("0"); //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java index 1b0855b8..e39c441e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java @@ -39,4 +39,5 @@ public interface SarFileSplitInfoEODao extends BaseMapper { List querySame (SarFileSplitInfoEO sarFileSplitInfoEO); + List selectByStandId(String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index 1a1f00fe..d364a74c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -61,6 +61,6 @@ public interface SarFileSplitItemsEODao extends BaseMapper int deleteByPrimaryKey(String id); - @Select("select ID from sar_file_split_info where INFO_ID=#{infoId}") + @Select("select ID from sar_file_split_info where ID=#{infoId}") String selectByInfoId(String infoId); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml index 4e35dfba..cf66869b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml @@ -340,4 +340,8 @@ where SAR_FILE_SPLIT_INFO.ID = #{id} + + From 7c4dc14cc473ebea68c4e62ba70b471ac52ba54d Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 20:17:04 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=A1=E6=AC=BE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/controller/SarStandItemsController.java | 2 +- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 4 ++++ .../adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java | 2 ++ .../mapper/standardSplit/SarFileSplitItemsEOMapper.xml | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index d6df0d61..80257943 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -89,7 +89,7 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "分解单查询") @GetMapping("/querySarItemAndInterpretation") public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ - List rows = ServiceImpl.querySarItemAndInterpretation(page); + List rows = ServiceImpl.selectByName(page.getItemsName()); PageInfo pageInfo = getPageInfo(page.getPager(), rows); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index dc737bb1..e52b885e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -440,4 +440,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectByName(String itemsName) { + return sarFileSplitItemsEODao.selectByName(itemsName); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index d364a74c..64be1000 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -63,4 +63,6 @@ public interface SarFileSplitItemsEODao extends BaseMapper @Select("select ID from sar_file_split_info where ID=#{infoId}") String selectByInfoId(String infoId); + + List selectByName(String itemsName); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index a24f29f9..16fbf7ba 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -630,5 +630,8 @@ ${pager.orderCondition} + From 80263690cd91bd978f20578a97fea632a3468777 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 20:40:01 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=A1=E6=AC=BE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/controller/SarStandItemsController.java | 2 +- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 3 --- .../controller/SarFileSplitItemsEOController.java | 1 + .../da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java | 2 +- .../standardSplit/service/SarFileSplitItemsEOService.java | 2 ++ .../service/impl/SarFileSplitItemsEOServiceImpl.java | 5 +++++ .../mapper/standardSplit/SarFileSplitItemsEOMapper.xml | 4 ++-- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 80257943..d6df0d61 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -89,7 +89,7 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "分解单查询") @GetMapping("/querySarItemAndInterpretation") public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ - List rows = ServiceImpl.selectByName(page.getItemsName()); + List rows = ServiceImpl.querySarItemAndInterpretation(page); PageInfo pageInfo = getPageInfo(page.getPager(), rows); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index e52b885e..52bd0a87 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -441,7 +441,4 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectByName(String itemsName) { - return sarFileSplitItemsEODao.selectByName(itemsName); - } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index 4b2805de..d605b272 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -85,6 +85,7 @@ public class SarFileSplitItemsEOController extends BaseController> page(SarFileSplitItemsEOPage page) throws Exception { //6-18 端哥已做修改 + sarFileSplitItemsEOService.selectByName(page.getItemsName()); Map map = sarFileSplitItemsEOService.getByPage(page); page.getPager().setRowCount((Integer) map.get("count")); return Result.success(getPageInfo(page.getPager(), (List) map.get("list"))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index 64be1000..5fd4821a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -64,5 +64,5 @@ public interface SarFileSplitItemsEODao extends BaseMapper @Select("select ID from sar_file_split_info where ID=#{infoId}") String selectByInfoId(String infoId); - List selectByName(String itemsName); + void selectByName(String itemsName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java index be30efc7..aa3a9f2d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java @@ -48,4 +48,6 @@ public interface SarFileSplitItemsEOService { void combineItems(String ids); List queryByList2(SarFileSplitItemsEOPage page); + + void selectByName(String itemsName); } 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 927607e5..a135ef0f 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 @@ -867,6 +867,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic return sarFileSplitItemsEODao.queryByList2(page); } + @Override + public void selectByName(String itemsName) { + sarFileSplitItemsEODao.selectByName(itemsName); + } + public void changeInfos (StringBuilder resultContent,String reaultItemId,List delMenuIds,List delIds,List resultValList) { //1.更新最终合并的条款内容 if (resultContent != null) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index 16fbf7ba..576a602e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -630,8 +630,8 @@ ${pager.orderCondition} - + select ITEMS_NAME from sar_file_split_items where ITEMS_NAME like "%" #{itemsName} "%"; From 6a3b7bb0a135d0de62560507d0ab9ad46a139b97 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 20:44:37 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=A1=E6=AC=BE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index 576a602e..7f9afaf6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -631,7 +631,7 @@ From c58b5f1dea92c5f56ecd0104fe368feaadeae0df Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 22:24:57 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 12 +--- .../impl/SarStandItemsServiceImpl.java | 71 ------------------- .../dao/SarFileSplitItemsEODao.java | 3 +- .../service/SarFileSplitMenuEOService.java | 1 - .../impl/SarFileSplitMenuEOServiceImpl.java | 6 +- 5 files changed, 3 insertions(+), 90 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index d6df0d61..309ccd0d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -95,17 +95,7 @@ public class SarStandItemsController extends BaseController { return Result.success(pageInfo); } - - @ApiOperation(value = "分解单查询") - @GetMapping("/selectSarItemAndInterpretation") - public ResponseMessage selectSarItemAndInterpretation(String standId)throws Exception{ - FindSarItemsPageReqDTO page = new FindSarItemsPageReqDTO(); - page.setStandId(standId); - Map map = ServiceImpl.selectSarItemAndInterpretation(page.getStandId()); - page.getPager().setRowCount((Integer) map.get("count")); - return Result.success(getPageInfo(page.getPager(), (List) map.get("list"))); - } - + @ApiOperation(value = "分解单更新") @PutMapping("/updateSarItemAndInterpretation") public ResponseMessage updateSarItemAndInterpretation(@RequestBody SarStandItems resolveListForm){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 3aa67767..340bc69b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -371,75 +371,4 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectSarItemAndInterpretation(String standId)throws Exception { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("STAND_ID",standId); - List sarFileSplitInfoEO = sarFileSplitInfoEODao.selectList(queryWrapper); - - for (SarFileSplitInfoEO data : sarFileSplitInfoEO){ - String idInfo = data.getId(); - SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); - String id = sarFileSplitMenuEOService.selectByInfoId(idInfo); - page.setId(id); - //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 - page.setValidFlag("0"); - //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 - page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); - //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 - if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { - //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 - List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); - //把这个sarFileSplitMenuEOList转换成树的形式 - Tree tree = new Tree<>(sarFileSplitMenuEOList); - //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId - TreeNode treeNode = tree.getTreeNode(page.getMenuId()); - - List menuIds = new ArrayList<>(); - //然后把刚刚的treeNode的nodeId放到menuIds数组里 - menuIds.add(treeNode.getNodeId()); - for (TreeNode node : treeNode.getAllChildren()) { - //把所有的treeNode的nodeId放到menuIds数组里 - menuIds.add(node.getNodeId()); - } - //把它放到MenuIdList里 - page.setMenuIdList(menuIds); - } - //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） - int count = sarFileSplitItemsEODao.queryByCount(page); - //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 - List rows = sarFileSplitItemsEODao.queryByPage(page); - //如果查询出来的结果不为空 - if (rows != null && !rows.isEmpty()) { - //遍历rows - for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { - //查询svpps - String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); - sarFileSplitItemsEO.setSvppsShow(svppsShow); - SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); - paramPage.setItemId(sarFileSplitItemsEO.getId()); - List paramList = sarFileSplitItemsParamsEODao.queryByList(paramPage); - sarFileSplitItemsEO.setParamsList(paramList); - String foName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getFo()); - sarFileSplitItemsEO.setFoShow(foName); - //TODO 2021年6月17日 补充责任部门和项目评估角色回显时如果时多个时回显为空的情况 - String dutyEngineerName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getDutyEngineer()); - sarFileSplitItemsEO.setDutyEngineerShow(dutyEngineerName); - //责任部门多个时 - String orgNames = sysInfoEOService.getOrgNamesByIds(sarFileSplitItemsEO.getResponsibleUnit()); - sarFileSplitItemsEO.setResponsibleUnitShow(orgNames); - } - - } - Map map = new HashMap<>(); - map.put("list",rows); - map.put("count",count); - return map; - } - return null; - } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index 1a1f00fe..909b5bc2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -61,6 +61,5 @@ public interface SarFileSplitItemsEODao extends BaseMapper int deleteByPrimaryKey(String id); - @Select("select ID from sar_file_split_info where INFO_ID=#{infoId}") - String selectByInfoId(String infoId); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java index d869ac74..f2cea0e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java @@ -33,5 +33,4 @@ public interface SarFileSplitMenuEOService { List getChildData(String id); - String selectByInfoId(String infoId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java index 23326ec0..454e58d9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -459,11 +459,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService return dealData(id,res); } - @Override - public String selectByInfoId(String infoId) { - String info = sarFileSplitItemsEODao.selectByInfoId(infoId); - return info; - } + private List dealData(String id ,List res){ List strings = SarFileSplitMenuEODao.getChildData(id); From 88601c0ac2346068a947470971d667ccd0490444 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 23:25:18 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB=E5=92=8C?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7=E4=B8=AD=E9=97=B4=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- .../slrs/sarStandItems/controller/SarStandItemsController.java | 2 +- 2 files changed, 2 insertions(+), 2 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 73de1017..2b413869 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 @@ -2826,7 +2826,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl { return Result.success(pageInfo); } - + @ApiOperation(value = "分解单更新") @PutMapping("/updateSarItemAndInterpretation") public ResponseMessage updateSarItemAndInterpretation(@RequestBody SarStandItems resolveListForm){ From 463052ab89aefe674175ccbadd30e67b9b2ff23a Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 9 Apr 2023 17:58:36 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=B5=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 93 +++++++++++++++++++ .../service/IEsRevisePlanService.java | 3 + .../service/impl/EsRevisePlanServiceImpl.java | 18 +++- 3 files changed, 112 insertions(+), 2 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index b87d2f0a..3effd7b0 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -28,6 +28,7 @@ import com.adc.da.workFlow.dao.ExportExcelMapper; import com.adc.da.workFlow.entity.*; import com.adc.da.workFlow.service.WorkFlowService; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import oracle.ucp.proxy.annotation.Post; @@ -39,6 +40,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import springfox.documentation.spring.web.json.Json; import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; @@ -48,6 +50,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -1002,4 +1005,94 @@ public class WorkFlowController { return workFlowFeignClient.selectWenDan(taskId); } + @ApiOperation(value = "批量发送待办任务（正常走流程）") + @GetMapping("/batchToDoTasks") + public ResponseMessage batchToDoTasks(String json){ + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + //获取所有数据 + JSONObject jsonObject = JSONObject.parseObject(json); + List esRevisePlans = iEsRevisePlanService.batchToDoTasks(json); + String userId = ""; + String userName = ""; + Object userIdObject = jsonObject.get("prcCreateUser"); + if(userIdObject!=null){ + userId = userIdObject.toString(); + userName = userService.userIdByName(userId); + } + + //循环数据 + for (EsRevisePlan data : esRevisePlans){ + //数据拼接 + ProcessRollBackEO processRollBackEO = new ProcessRollBackEO(); + processRollBackEO.setUserId(userId); + processRollBackEO.setType("25"); + //拼接json + HashMap qbfsForm = new HashMap<>(); + HashMap qbfsFormInfo = new HashMap<>(); + qbfsForm.put("bussSort",data.getBussSort()); + qbfsForm.put("esMatingRelations",data.getEsMatingRelations()); + qbfsForm.put("technologic",data.getTechnologic()); + qbfsForm.put("useLevel",data.getUseLevel()); + qbfsForm.put("isRelate",data.getIsRelate()); + qbfsForm.put("esStandRelations",data.getEsStandRelations()); + //数组格式 + String[] split = data.getArea().split(","); + qbfsForm.put("area",split); + qbfsForm.put("tsJson",data.getTsJson()); + qbfsForm.put("tsJsonName",data.getTsJsonName()); + qbfsForm.put("rqbJson",data.getRqbJson()); + qbfsForm.put("rqbName",data.getRqbName()); + qbfsForm.put("unit",data.getUnit()); + qbfsForm.put("unitName",data.getUnitName()); + qbfsForm.put("esName",data.getEsName()); + qbfsForm.put("planStatus",data.getPlanStatus()); + qbfsForm.put("reviseStatus",data.getReviseStatus()); + qbfsForm.put("resPerson",data.getResPerson()); + qbfsForm.put("resPersonName",data.getResPersonName()); + + String wgLeaderStr = data.getWgLeader(); + if(wgLeaderStr!=null){ + if(wgLeaderStr.endsWith(",")){ + wgLeaderStr = wgLeaderStr.substring(0,wgLeaderStr.length()-1); + } + } + qbfsForm.put("wgLeader",wgLeaderStr); + qbfsForm.put("wgLeaderName",data.getWgLeaderName()); + qbfsForm.put("draftTime",simpleDateFormat.format(data.getDraftTime())); + qbfsForm.put("releaseTime",simpleDateFormat.format(data.getReleaseTime())); + qbfsForm.put("drafter",data.getDrafter()); + qbfsForm.put("drafterName",data.getDrafterName()); + qbfsForm.put("LXD",data.getLxd()); + qbfsForm.put("LXDName",""); + //争议 + qbfsForm.put("lxd",""); + //争议 + qbfsForm.put("lxdName","立项单"); + qbfsForm.put("addFlag","1"); + if(jsonObject.get("prcCreateUser")!=null){ + qbfsForm.put("prcCreateUser",jsonObject.get("prcCreateUser").toString()); + qbfsForm.put("prcCreateUserName",userName); + } + qbfsForm.put("nowEsId","操作成功"); + qbfsForm.put("type","5"); + String jsonMap = JSONObject.toJSONString(qbfsForm); + qbfsFormInfo.put("qbfsForm",qbfsForm); + processRollBackEO.setJson(JSONObject.toJSONString(qbfsFormInfo)); + ResponseMessage responseMessage = startProcessRollBack(processRollBackEO); + if(responseMessage!=null){ + String taskId = responseMessage.getData().toString(); + BusMes busMes = new BusMes(); + busMes.setPrcType("25"); + busMes.setTaskIds(taskId); + busMes.setCreateUserName(userName); + if(jsonObject.get("prcCreateUser")!=null){ + busMes.setUserId(jsonObject.get("prcCreateUser").toString()); + } + busMes.setJson(jsonMap); + Wrapper stringWrapper = completeTaskByUserId(busMes); + } + } + return Result.success(); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 21febadf..671ff8c2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.esRevisePlan.service; import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Date; @@ -34,4 +35,6 @@ public interface IEsRevisePlanService extends IService { List getAllPlansByWkInfo(); + List batchToDoTasks(String json); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 7f93b5bb..def59e5e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -53,11 +53,9 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlans(EsRevisePlan esRevisePlan) { Integer count = esRevisePlanDao.getTotal(); @@ -248,4 +246,20 @@ public class EsRevisePlanServiceImpl extends ServiceImpl batchToDoTasks(String json) { + JSONObject jsonObject = JSONObject.parseObject(json); + Object ids = jsonObject.get("ids"); + List esRevisePlans = new ArrayList(); + if(ids!=null){ + String[] split = ids.toString().split(","); + List idsList = Arrays.asList(split); + for (String id : idsList){ + EsRevisePlan esRevisePlan = this.baseMapper.selectById(id); + esRevisePlans.add(esRevisePlan); + } + } + return esRevisePlans; + } }