工作流升级

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ProcessDto.java

@@ -10,6 +10,6 @@ import lombok.Data;
 @Data
 public class ProcessDto {
     private  String businessKey;//业务id
-    private  String processDefinitionKey="hygf_bwys";//工作流key
+    private  String processDefinitionKey;//工作流key
     private  boolean completeFirstTask=true;//是否执行第一个节点  false true
 }

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

@@ -74,7 +74,12 @@ public interface WorkflowFeignClient {
     @RequestMapping(value = "/v2/task/start/batch", method = RequestMethod.POST)
     FeignClientResult<List<ProcessTaskDTO>> startProcess(@RequestBody StartProcessDto startProcessDto);
 
-
+    @RequestMapping(value = "/v2/task/start/batch", method = RequestMethod.POST)
+    FeignClientResult<List<ProcessTaskDTO>> startProcessnew(
+            @RequestHeader(name="appKey",required = true) String appKey,
+            @RequestHeader(name="product",required = true) String product,
+            @RequestHeader(name="token",required = true) String token,
+            @RequestBody StartProcessDto startProcessDto);
 
     /**
      * 执行流程

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

@@ -96,6 +96,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
        }else{
            // 调用工作流执行第一个节点
            ProcessDto processDto = new ProcessDto();
+           processDto.setProcessDefinitionKey("hygf_bwys");
            processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
            StartProcessDto startProcessDto = new StartProcessDto();
            List<ProcessDto> process=new ArrayList<>();

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

@@ -491,7 +491,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             process.add(processDto);
             startProcessDto.setProcess(process);
             BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
-            workflow.startProcess(basicGridAcceptance, startProcessDto,requestContext.getUserId());
+            workflow.startProcessnew(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),basicGridAcceptance, startProcessDto,requestContext.getUserId());
             // 插入记录表
             dealerReview.setPlanInstanceId(planId);
             dealerReview.setUnitInfoId(regUnitInfo.getSequenceNbr());

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 import java.util.List;
 
@@ -36,6 +37,18 @@ public class WorkflowImpl {
          basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json,userid);
         return basicGridAcceptance;
     }
+    public BasicGridAcceptance startProcessnew(
+            String appKey,
+            String product,
+            String token,
+            BasicGridAcceptance basicGridAcceptance,StartProcessDto startProcessDto,String userid){
+        FeignClientResult<List<ProcessTaskDTO>> json=   workflowFeignClient.startProcessnew( appKey,
+                product,
+                token,
+                startProcessDto);
+        basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json,userid);
+        return basicGridAcceptance;
+    }
 
     /**
      *