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-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 7d47f668..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 @@ -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"); 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 c5d1cfad..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(); @@ -180,7 +178,7 @@ 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; + } } 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 queryItemsByList(SarStandItemsEOPage page, String resType){ List itemsEOList = dao.queryItemsByList(page); List actitemsEOList = new ArrayList<>(); @@ -351,4 +370,76 @@ 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/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/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 722ae9d0..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 @@ -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,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper int deleteByPrimaryKey(String id); + @Select("select ID from sar_file_split_info where ID=#{infoId}") + String selectByInfoId(String infoId); + + 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/SarFileSplitMenuEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java index 193d4cbe..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 @@ -32,4 +32,5 @@ public interface SarFileSplitMenuEOService { String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO); List getChildData(String id); + } 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/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..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,6 +459,8 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService return dealData(id,res); } + + private List dealData(String id ,List res){ List strings = SarFileSplitMenuEODao.getChildData(id); res.addAll(strings); 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} + + 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..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 @@ -630,5 +630,8 @@ ${pager.orderCondition} +