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 1f1e8fa7..541f7184 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 @@ -456,4 +456,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.POST) String delCG(@RequestParam("id") String id); + + @RequestMapping(value = "/bat-wkflow/esTechRelation/setRelation",method = RequestMethod.POST) + void setRelation(@RequestParam("esPlanId")String esPlanId,@RequestParam("prcId") String prcId, @RequestParam("finish") String finish); + @RequestMapping(value = "/bat-wkflow/esTechRelation/getEsByWk",method = RequestMethod.GET) + String getEsByWk(@RequestParam("prcId")String prcId); } 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 23e9ba94..add2e314 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 @@ -400,4 +400,12 @@ public class workFlowFeignClientImpl { public String delCG(@RequestParam("id") String id){ return workFlowFeignClient.delCG(id); } + + public void setRelation(@RequestParam("esPlanId")String esPlanId,@RequestParam("prcId") String prcId, @RequestParam("finish") String finish){ + workFlowFeignClient.setRelation(esPlanId,prcId,finish); + } + + public String getEsByWk(@RequestParam("prcId")String prcId) { + return workFlowFeignClient.getEsByWk(prcId); + } } 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 889b9a87..ddef31c6 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 @@ -916,4 +916,10 @@ public class WorkFlowController { } + @ApiOperation(value = "通过企标计划和技术标准起草关联表查询对应的计划id") + @GetMapping("/getEsByWk") + public String getEsByWk(@RequestParam("prcId")String prcId){ + return workFlowFeignClient.getEsByWk(prcId); + } + } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/enums/FlowFinishEnum.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/enums/FlowFinishEnum.java new file mode 100644 index 00000000..4bc40c77 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/enums/FlowFinishEnum.java @@ -0,0 +1,31 @@ +package com.adc.da.workFlow.enums; + +public enum FlowFinishEnum { + FSLC_JSBZQC_START("正处于技术标准起草节点","0"), + FSLC_JSBZQC_FINISH("技术标准起草节点已结束","1"), + JSBZLC_FINISH("技术标准流程已结束","2"); + + FlowFinishEnum(String label, String value) { + this.label = label; + this.value = value; + } + + String label; + String value; + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} 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 4d70ce34..c1a52764 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 @@ -43,6 +43,7 @@ import com.adc.da.utils.util.InitStandAttrUtil; import com.adc.da.utils.util.Utils; import com.adc.da.workFlow.dao.ActSarItemsEODao; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.enums.FlowFinishEnum; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -235,23 +236,31 @@ public class ActSarItemsBussEOService { qw.setEsName(standName); qw.setBussSort(standSort); List list = esRevisePlanDao.selectPageByName(qw); + + String esPlanId = ""; if(!list.isEmpty()){ esRevisePlanDTO.setId(list.get(0).getId()); iEsRevisePlanService.updateById(esRevisePlanDTO); //日志 - String esName = list.get(0).getEsName(); - String id = list.get(0).getId(); - Date date = new Date(); - String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " " + if ("1".equals(reviewResults)) { + String esName = list.get(0).getEsName(); + String id = list.get(0).getId(); + Date date = new Date(); + String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " " +"通过复审流程创建了《"+ esName +"》,其复审结果为修订。"; - esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date)); + esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date)); + } + esPlanId = list.get(0).getId(); }else{ if("1".equals(reviewResults)) { // 修订时才生成企标计划 - iEsRevisePlanService.addPlan(esRevisePlanDTO); + ResponseMessage objectResponseMessage = iEsRevisePlanService.addPlan(esRevisePlanDTO); + esPlanId = objectResponseMessage.getMessage(); } } + if ("1".equals(reviewResults)) { + workFlowFeignClient.setRelation(esPlanId, String.valueOf(standMap.get("prcId")) , FlowFinishEnum.FSLC_JSBZQC_START.getValue()); + } } - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java index 879bf942..b5eca3ec 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -89,5 +90,12 @@ public class ZlTreeController extends BaseController { } + @GetMapping("/queryTree") + @ApiOperation("根据树id判断树层级并查询对应的节点") + public ResponseMessage queryTree(@Param("treeId") String treeId){ + ZlTree zlTree = iZlTreeService.queryTree(treeId); + return Result.success(zlTree); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java index 86898e09..1ed663b7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java @@ -45,5 +45,10 @@ public interface IZlTreeService extends IService { */ int topping(String id); - + /** + * 根据树id判断树层级并查询对应的节点 + * @param treeId + * @return + */ + ZlTree queryTree(String treeId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index 4394b86b..98caaac2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -130,4 +131,27 @@ public class ZlTreeServiceImpl extends ServiceImpl implements public int topping(String id) { return zlTreeDao.topping(id); } + + /** + * 根据树id判断树层级并查询对应的节点 + * @param treeId + * @return + */ + @Override + public ZlTree queryTree(String treeId) { + ZlTree zlTree = zlTreeDao.selectById(treeId); + if (ObjectUtils.isNotEmpty(zlTree)) { + if (ObjectUtils.isNotEmpty(zlTree.getParentId())) { + ZlTree zlTreeParents = zlTreeDao.selectById(zlTree.getParentId()); + if (ObjectUtils.isEmpty(zlTreeParents.getParentId())) { + return zlTree; + } else { + return zlTreeParents; + } + } else { + return zlTree; + } + } + return null; + } }