Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!292

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -5,6 +5,7 @@ import com.adc.da.common.Category;
 import com.adc.da.common.Page;
 import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
 import com.adc.da.workFlow.entity.BusProcessModelHis;
+import com.adc.da.workFlow.entity.ProcessRollBackEO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,6 +35,9 @@ public interface workFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)
     Wrapper<String> activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId);
 
+    @RequestMapping(value = "/bat-wkflow/activiti_define_start_user_rollBack",method = RequestMethod.POST)
+    Wrapper<String> activiti_define_start_rollBack(@RequestBody ProcessRollBackEO processRollBackEO);
+
     /**
      * 企标复审流程专用
      * @param id

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -10,6 +10,7 @@ import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.IUserEOService;
 import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
 import com.adc.da.workFlow.entity.BusProcessModelHis;
+import com.adc.da.workFlow.entity.ProcessRollBackEO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -51,6 +52,16 @@ public class workFlowFeignClientImpl {
         Wrapper<String> stringWrapper = workFlowFeignClient.activiti_define_start(Id,userId,bpnId);
         return Result.success(stringWrapper.getResult());
     }
+
+    public ResponseMessage activiti_define_start_rollBack(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId,@RequestParam("json")String json){
+        ProcessRollBackEO rollBackEO=new ProcessRollBackEO();
+        rollBackEO.setId(Id);
+        rollBackEO.setBpnId(bpnId);
+        rollBackEO.setJson(json);
+        rollBackEO.setUserId(userId);
+        Wrapper<String> stringWrapper = workFlowFeignClient.activiti_define_start_rollBack(rollBackEO);
+        return Result.success(stringWrapper.getResult());
+    }
     public Map<String,String> activiti_define_start1(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){
         Map<String,String> map = workFlowFeignClient.activiti_define_start1(Id,userId,standName);
         return map;

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -116,6 +116,13 @@ public class WorkFlowController {
     public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId",required = false) String bpnId){
         return  workFlowFeignClient.activiti_define_start(id,userId,bpnId);
     }
+
+    @ApiOperation(value = "启动流程-以流程定义id")
+    @GetMapping("/activiti_define_start_rollBack")
+    public ResponseMessage activiti_define_start_rollBack(@RequestParam("id") String id, @RequestParam("userId") String userId,
+                                                          @RequestParam(value = "bpnId",required = false) String bpnId,@RequestParam(value = "json",required = false)String json){
+        return  workFlowFeignClient.activiti_define_start_rollBack(id,userId,bpnId,json);
+    }
     @ApiOperation(value = "启动流程-以流程定义id")
     @GetMapping("/activiti_define_start1")
     public Map<String,String> activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){
@@ -132,6 +139,16 @@ public class WorkFlowController {
         }
     }
 
+    @ApiOperation(value = "启动流程-以流程定义id-加上草稿内容（为了实现撤回）")
+    @PostMapping("/startProcessRollBack")
+    public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO){
+        if(StringUtils.isNotBlank(processRollBackEO.getType())){
+            return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(),processRollBackEO.getId(),processRollBackEO.getJson());
+        }else {
+            return null;
+        }
+    }
+
     @ApiOperation(value = "定时任务启动流程-以流程定义id")
     @GetMapping("/startProcessNew")
     public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value="userId",required = false) String userId, @RequestParam(value="id",required = false) String id){

adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessRollBackEO.java

@@ -0,0 +1,17 @@
+package com.adc.da.workFlow.entity;
+
+import lombok.Data;
+
+@Data
+public class ProcessRollBackEO {
+
+    private String json;
+
+    private String type;
+
+    private String id;
+
+    private String userId;
+
+    private String bpnId;
+}