并网工作流执行

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceRectificationOrderController.java

@@ -61,7 +61,7 @@ public class AcceptanceRectificationOrderController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新验收整改单", notes = "根据sequenceNbr更新验收整改单")
 	public ResponseModel<AcceptanceRectificationOrderDto> updateBySequenceNbrAcceptanceRectificationOrder(@PathVariable(value = "sequenceNbr") Long sequenceNbr, @RequestBody AcceptanceRectificationOrderDto model) {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.updateAndDriveWorkflow(model));
+	    return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.updateAndDriveWorkflow(model,getUserId()));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java

@@ -81,7 +81,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@PostMapping(value = "/save/commit")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel saveAndCommit(@RequestBody  HygfOnGrid dto) {
-		return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto));
+		return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto,getUserId()));
 	}
 
 	/**
@@ -196,7 +196,7 @@ public class BasicGridAcceptanceController extends BaseController {
     @PostMapping(value = "/execute")
     @ApiOperation(httpMethod = "POST", value = "执行工作流", notes = "执行工作流")
     public ResponseModel execute(@RequestBody AcceptanceCheckItem dto) {
-        basicGridAcceptanceServiceImpl.execute(dto);
+        basicGridAcceptanceServiceImpl.execute(dto,getUserId());
         return ResponseHelper.buildResponse(null);
     }
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkflowFeignClient.java

@@ -92,7 +92,7 @@ public interface WorkflowFeignClient {
      *
      * */
     @RequestMapping(value = "/v2/task/complete/standard/{taskId}", method = RequestMethod.POST)
-    FeignClientResult<List<ProcessTaskDTO>> standard( @PathVariable(value = "taskId") String taskId  ,@RequestBody StandardDto standardDto);
+    FeignClientResult<ProcessTaskDTO> standard( @PathVariable(value = "taskId") String taskId  ,@RequestBody StandardDto standardDto);
 
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java

@@ -76,7 +76,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
     /**
      * 提交整改并触发工作流
      */
-    public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model) {
+    public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model,String userId) {
         // 提交整改信息
         AcceptanceRectificationOrder entity = new AcceptanceRectificationOrder();
         BeanUtils.copyProperties(model, entity);
@@ -90,7 +90,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
         basicGridAcceptance.setAcceptanceStatus(String.valueOf(Integer.parseInt(basicGridAcceptance.getAcceptanceStatus()) - 1));
         StandardDto standardDto = new StandardDto();
         // TODO: standardDto setter
-        BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto);
+        BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto,userId);
         BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
 
         basicGridAcceptanceMapper.updateById(basicGridAcceptance);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -80,7 +80,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         return grid;
     }
     @Transactional
-    public HygfOnGrid saveAndCommit(HygfOnGrid grid) {
+    public HygfOnGrid saveAndCommit(HygfOnGrid grid,String userId) {
 
 
         BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
@@ -92,7 +92,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         List<ProcessDto> process=new ArrayList<>();
         process.add(processDto);
         startProcessDto.setProcess(process);
-        BasicGridAcceptance workBasicGridAcceptance = workflow.startProcess(basicGridAcceptance, startProcessDto);
+        BasicGridAcceptance workBasicGridAcceptance = workflow.startProcess(basicGridAcceptance, startProcessDto,userId);
         BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
         if(grid.getSequenceNbr()!=null){
             onGridMapper.updateById(grid);
@@ -130,7 +130,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 
 
     @Transactional
-    public void execute(AcceptanceCheckItem dto){
+    public void execute(AcceptanceCheckItem dto,String userId){
         //查询并网审批信息
         BasicGridAcceptance basicGridAcceptanc=  basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
         if(OK.equals(dto.getApprovalStatus())){
@@ -173,7 +173,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         variable.setOperationTime(dto.getOperationTime());
         variable.setOperator(dto.getOperator());
         standardDto.setVariable(variable);
-        BasicGridAcceptance workBasicGridAcceptance =  workflow.standard(basicGridAcceptanc,standardDto);
+        BasicGridAcceptance workBasicGridAcceptance =  workflow.standard(basicGridAcceptanc,standardDto,userId);
         basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
 
     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkflowImpl.java

@@ -41,9 +41,9 @@ public class WorkflowImpl {
     * **/
 
 
-     public BasicGridAcceptance startProcess(BasicGridAcceptance basicGridAcceptance,StartProcessDto startProcessDto){
+     public BasicGridAcceptance startProcess(BasicGridAcceptance basicGridAcceptance,StartProcessDto startProcessDto,String userid){
         FeignClientResult<List<ProcessTaskDTO>> json=   workflowFeignClient.startProcess(startProcessDto);
-         basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json);
+         basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json,userid);
         return basicGridAcceptance;
     }
 
@@ -52,28 +52,89 @@ public class WorkflowImpl {
      * 执行工作流
      *
      * */
-    public BasicGridAcceptance standard(BasicGridAcceptance basicGridAcceptance,StandardDto standardDto){
+    public BasicGridAcceptance standard(BasicGridAcceptance basicGridAcceptance,StandardDto standardDto,String userid){
 
-        FeignClientResult<List<ProcessTaskDTO>> json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
+        FeignClientResult<ProcessTaskDTO> json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
 
-        basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json);
+        basicGridAcceptance= this.getBasicGridAcceptanceone(basicGridAcceptance,json,userid);
         return basicGridAcceptance;
     }
 
-    public BasicGridAcceptance getBasicGridAcceptance(BasicGridAcceptance basicGridAcceptance,FeignClientResult<List<ProcessTaskDTO>> json){
+    public BasicGridAcceptance getBasicGridAcceptance(BasicGridAcceptance basicGridAcceptance,FeignClientResult<List<ProcessTaskDTO>> json,String userid){
 
         if (!ObjectUtils.isEmpty(json)) {
             if (json.getStatus() == 200) {
                 List<ProcessTaskDTO>  lis = json.getResult();
                 ProcessTaskDTO listco= lis.get(0);
                 if(listco!=null){
+
+                    //	当前节点执行任务id
+                    basicGridAcceptance.setPromoter(userid);
+
+                    //	流程下一节点id
+                    if(listco.getNextTask()!=null&&!listco.getNextTask().isEmpty()){
+                        basicGridAcceptance.setNextTaskId(listco.getNextTask().get(0).getId());
+                        //下个节点名称
+                        basicGridAcceptance.setNextNodeName(listco.getNextTask().get(0).getName());
+                        //下个节点key
+                        basicGridAcceptance.setNextNodeKey(listco.getNextTask().get(0).getKey());
+                    }
+                    ///	下一个节点角色权限
+                    if(listco.getNextCandidateGroups()!=null){
+                        List<String> ld= listco.getNextCandidateGroups().get(basicGridAcceptance.getNextTaskId());
+                        StringBuffer sbf = new StringBuffer();
+                        for(int i=0;i<=ld.size()-1;i++){
+                            if(i<ld.size()-1){
+                                sbf.append(ld.get(i) + ",");
+                            }else {
+                                sbf.append(ld.get(i));
+                            }
+                        }
+
+                        basicGridAcceptance.setNextExecutorIds(sbf.toString());
+                    }
+
+                    //下一节点可执行人逗号分割	0	0
+                    if(listco.getNextTaskExecutor()!=null){
+
+                        List<AgencyUserModel> li=  listco.getNextTaskExecutor().get(basicGridAcceptance.getNextTaskId());
+                        if(li!=null&&!li.isEmpty()){
+
+                                StringBuffer sbf = new StringBuffer();
+                                 for(int i=0;i<=li.size()-1;i++){
+                                     if(i<li.size()-1){
+                                         sbf.append(li.get(i).getUserId() + ",");
+                                     }else {
+                                         sbf.append(li.get(i).getUserId());
+                                     }
+                                 }
+                            basicGridAcceptance.setNextExecuteUserIds(sbf.toString());
+                        }
+                    }
+                    //工作流发起人id
+                    basicGridAcceptance.setCreateUserId(listco.getStartUser().getUserId());
+
+                }
+            } else {
+                throw new RuntimeException(json.getMessage());
+            }
+        }
+    return basicGridAcceptance;
+    }
+
+    public BasicGridAcceptance getBasicGridAcceptanceone(BasicGridAcceptance basicGridAcceptance,FeignClientResult<ProcessTaskDTO> json,String userid){
+
+        if (!ObjectUtils.isEmpty(json)) {
+            if (json.getStatus() == 200) {
+                ProcessTaskDTO listco = json.getResult();
+                if(listco!=null){
                     /**
                      * 工作流实例ID
                      */
                     basicGridAcceptance.setInstanceId(listco.getProcessInstance().getId());
 
                     //	当前节点执行任务id
-                    basicGridAcceptance.setPromoter(listco.getExecutor().getUserId());
+                    basicGridAcceptance.setPromoter(userid);
 
                     //	流程下一节点id
                     if(listco.getNextTask()!=null&&!listco.getNextTask().isEmpty()){
@@ -128,5 +189,4 @@ public class WorkflowImpl {
 
 
 
-
 }