diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ff88272a..1f1e8fa7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -53,6 +53,12 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/oaTaskExec/execTask",method = RequestMethod.GET) Map execTask(@RequestParam("todoId") String todoId); + @RequestMapping(value = "/bat-wkflow/esPrcRelation/acceptTask",method = RequestMethod.GET) + Integer acceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId); + + @RequestMapping(value = "/bat-wkflow/esPrcRelation/judgeAcceptTask",method = RequestMethod.GET) + Boolean judgeAcceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk); + @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET) Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 5f0c3a90..23e9ba94 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -80,6 +80,16 @@ public class workFlowFeignClientImpl { return stringWrapper; } + public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId){ + Integer integerWrapper = workFlowFeignClient.acceptTask(nowEsId,oaFlag,taskId); + return integerWrapper; + } + + public Boolean judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk){ + Boolean booleanWrapper = workFlowFeignClient.judgeAcceptTask(nowEsId,oaFlag,prcIdGk); + return booleanWrapper; + } + public Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ Map stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId); return stringWrapper; 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 a7b91966..889b9a87 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 @@ -243,6 +243,18 @@ public class WorkFlowController { return workFlowFeignClient.execTask(todoId); } + @ApiOperation(value = "管控流程接收任务") + @GetMapping("/acceptTack") + public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) { + return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId); + } + + @ApiOperation(value = "管控流程判断接收任务") + @GetMapping("/judgeAcceptTack") + public ResponseMessage judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk) { + return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId,oaFlag,prcIdGk)); + } + @ApiOperation(value = "流程实例明细验证是否完成") @GetMapping("/get_verify_by_instance") public Map activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 22da1a26..1fb38073 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -59,6 +59,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel"); // 提供自动发起复审流程 复审数据 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList"); + // 提供企标计划数据 + addInterceptor.excludePathPatterns("/api/esRevisePlan/es-revise-plan/getAllPlansByWk"); //pcms项目数据下发开放接口 addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save"); addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 3900718c..a8058830 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -46,6 +46,13 @@ public class EsRevisePlanController extends BaseController { return Result.success(pageInfo); } + @ApiOperation(value = "获取所有企标计划给流程") + @GetMapping("getAllPlansByWk") + public List getAllPlansByWk(String esName){ + List esRevisePlans = iEsRevisePlanService.getAllPlansByWk(esName); + return esRevisePlans; + } + @ApiOperation(value = "多条件查询企标计划") @PostMapping("queryAllPlans") public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ @@ -148,7 +155,7 @@ public class EsRevisePlanController extends BaseController { @ApiOperation(value = "添加企标计划") @PostMapping("addPlan") public ResponseMessage addPlan(EsRevisePlan esRevisePlan){ - return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); + return iEsRevisePlanService.addPlan(esRevisePlan); } @ApiOperation(value = "添加企标计划") @@ -174,4 +181,5 @@ public class EsRevisePlanController extends BaseController { public ResponseMessage delPlans(String ids){ return Result.success(iEsRevisePlanService.delPlans(ids)); } + } 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 7b1e5eb7..6d727bd3 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 @@ -1,5 +1,6 @@ package com.adc.da.slrs.esRevisePlan.service; +import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import com.baomidou.mybatisplus.extension.service.IService; @@ -21,8 +22,10 @@ public interface IEsRevisePlanService extends IService { String modPlan(EsRevisePlan esRevisePlan);//编辑 String modPlanByState(EsRevisePlan esRevisePlan);//编辑 String modPlanByProcess(EsRevisePlan esRevisePlan);//编辑 - String addPlan(EsRevisePlan esRevisePlan);//插入 + ResponseMessage addPlan(EsRevisePlan esRevisePlan);//插入 int delPlan(String id);//删除 int delPlans(String ids);//批量删除 List getDataByName(EsRevisePlan esRevisePlan); + + List getAllPlansByWk(String esName); } 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 519067be..a7b22344 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 @@ -1,5 +1,7 @@ package com.adc.da.slrs.esRevisePlan.service.impl; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; import com.adc.da.slrs.esMatingRelation.service.IEsMatingRelationService; @@ -150,11 +152,11 @@ public class EsRevisePlanServiceImpl extends ServiceImpl addPlan(EsRevisePlan esRevisePlan) { esRevisePlan.setId(UUIDUtils.randomUUID(32)); List esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); if (esRevisePlans.size()>0){ - return "企标名称不能重复,请更换新的企标名称"; + return Result.success("企标名称不能重复,请更换新的企标名称"); }else { esRevisePlanDao.insertOne(esRevisePlan); //加日志 @@ -170,7 +172,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getDataByName(EsRevisePlan esRevisePlan) { return esRevisePlanDao.selectPageByName(esRevisePlan); } + + @Override + public List getAllPlansByWk(String esName) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + if (StringUtils.isNotBlank(esName)) { + queryWrapper.lambda().eq(EsRevisePlan::getEsName, esName); + } else { + List planStatus = new ArrayList<>(); + planStatus.add("1"); + planStatus.add("2"); + queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus); + } + + return esRevisePlanDao.selectList(queryWrapper); + } } 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 c54094ce..6b67f662 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 @@ -62,6 +62,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.json.JSONTokener; import org.slf4j.Logger; @@ -1333,6 +1334,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + List menuOldIds = new ArrayList<>(); for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) { String standId = standardsInfoEO.getIdlist()[i]; sarStandMenuEO.setBussStandId(standId); @@ -1375,20 +1378,36 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldList = sarBussStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO); + } + } } else { sarStandMenuEO.setOldMenuId(secondLevelId); - List menuOldIds = new ArrayList<>(); if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { menuOldIds = iSarMenuStandardService.getChildMenuList(secondLevelId); sarStandMenuEO.setMenuIds(menuOldIds); sarStandMenuEO.setId(getInfo.get(0).getId()); op = sarBussStandMenuEODao.updateById(sarStandMenuEO); }else { - menuOldIds= iTsResourceService.getChildMenuList(secondLevelId); - sarStandMenuEO.setMenuIds(menuOldIds); - op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); +// menuOldIds= iTsResourceService.getChildMenuList(secondLevelId); +// sarStandMenuEO.setMenuIds(menuOldIds); +// op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); + + queryWrapper.lambda().eq(SarBussStandMenu::getBussStandId, standId); + List oldList = sarBussStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO); + } + } } } if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 00375a93..841c3917 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -329,11 +329,16 @@ public class SarStandProjectLibraryController extends BaseController queryWrapper = new QueryWrapper<>(); + List menuOldIds = new ArrayList<>(); for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) { sarStandMenuEO.setStandId(standardsInfoEO.getIdlist()[i]); sarStandMenuEO.setId(null); @@ -3125,21 +3128,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl0){ -// return true; -// } - } else { - sarStandMenuEO.setOldMenuId(secondLevelId); - List menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId); - sarStandMenuEO.setMenuIds(menuOldIds); - int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); -// if (size>0) { -// return true; -// } + queryWrapper.lambda().eq(SarStandMenu::getStandId, standardsInfoEO.getIdlist()[i]); + List oldList = sarStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + int size = sarStandMenuEODao.insert(sarStandMenuEO); + } } +// if (getInfo == null || getInfo.isEmpty()) { +// sarStandMenuEO.setId(UUIDUtils.randomUUID20()); +// int size = sarStandMenuEODao.insert(sarStandMenuEO); +//// if (size>0){ +//// return true; +//// } +// } else { +// sarStandMenuEO.setOldMenuId(secondLevelId); +// List menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId); +// sarStandMenuEO.setMenuIds(menuOldIds); +// int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); +//// if (size>0) { +//// return true; +//// } +// } } return true; }