修改固定流程新页面

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/FixedFlowLink.java

@@ -71,10 +71,15 @@ public class FixedFlowLink extends BaseEntity {
     private Long contractId;
 
     /**
-     * 流程类型 1=垂直、2=平行
+     * 流程审批类型 1=垂直、2=平行
      */
     private Integer fixedFlowLinkType;
 
+    /**
+     * 流程类型 1=普通流程、2=审计流程
+     */
+    private Integer flowTaskType;
+
     /**
      * 计量任务预设分支排序
      */

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/TaskClient.java

@@ -2,6 +2,7 @@ package org.springblade.business.feign;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.models.auth.In;
 import org.springblade.business.entity.Task;
 import org.springblade.business.entity.TaskParallel;
 import org.springblade.business.vo.TaskApprovalVO;
@@ -9,10 +10,7 @@ import org.springblade.business.vo.TaskVO;
 import org.springblade.common.constant.BusinessConstant;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.FileNotFoundException;
 import java.util.List;
@@ -165,7 +163,7 @@ public interface TaskClient {
     void saveFixedFlowLink(@RequestParam Long fixedFlowId, @RequestParam String name, @RequestParam Integer type,
                            @RequestParam String userIds, @RequestParam Long projectId,
                            @RequestParam Long contractId, @RequestParam Integer linkSort,
-                           @RequestParam Integer userSort);
+                           @RequestParam Integer userSort,@RequestParam Integer flowTaskType);
 
     @PostMapping(value = "/updateFixedFlow")
     boolean updateFixedFlow(@RequestParam Long fixedFlowId, @RequestParam String fixedName);
@@ -174,7 +172,8 @@ public interface TaskClient {
     void updateFixedFlowLink(@RequestParam Long fixedFlowId, @RequestParam String name,
                              @RequestParam Integer type,@RequestParam String userIds,
                              @RequestParam Long projectId, @RequestParam Long contractId,
-                             @RequestParam Integer linkSort,@RequestParam Integer userSort);
+                             @RequestParam Integer linkSort,@RequestParam Integer userSort,
+                             @RequestParam Integer flowTaskType);
     @PostMapping(value = "/getFixedFlowPage")
     List<Map<String, Object>> getFixedFlowPage(@RequestBody org.springblade.meter.dto.PageFixedFlowDTO dto);
 

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/dto/SaveFixedFlowDTO.java

@@ -29,6 +29,8 @@ public class SaveFixedFlowDTO implements Serializable {
         private Integer type;
         @ApiModelProperty(value = "审批人，按照顺序英文逗号拼接为字符串")
         private String userIds;
+        @ApiModelProperty(value = "流程类型 1=普通流程、2=审计流程")
+        private Integer flowTaskType;
     }
 
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/dto/UpdateFixedFlowDTO.java

@@ -32,6 +32,8 @@ public class UpdateFixedFlowDTO implements Serializable {
         private Integer type;
         @ApiModelProperty(value = "审批人，按照顺序英文逗号拼接为字符串")
         private String userIds;
+        @ApiModelProperty(value = "流程类型 1=普通流程、2=审计流程")
+        private Integer flowTaskType;
     }
 
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/FixedFlowVO.java

@@ -22,6 +22,8 @@ public class FixedFlowVO implements Serializable {
         private String name;
         @ApiModelProperty(value = "审批类型，1=垂直、2=平行")
         private Integer type;
+        @ApiModelProperty(value = "流程类型 1=普通流程、2=审计流程")
+        private Integer flowTaskType;
         @ApiModelProperty(value = "任务人数组")
         private List<User> userList;
 

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/TaskClientImpl.java

@@ -27,6 +27,7 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.FileNotFoundException;
@@ -219,7 +220,7 @@ public class TaskClientImpl implements TaskClient {
     }
 
     @Override
-    public void saveFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer linkSort,Integer userSort) {
+    public void saveFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer linkSort,Integer userSort,Integer flowTaskType) {
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         for (String userId : userIds.split(",")) {
             FixedFlowLink fixedFlowLink = new FixedFlowLink();
@@ -232,6 +233,7 @@ public class TaskClientImpl implements TaskClient {
             fixedFlowLink.setProjectId(projectId);
             fixedFlowLink.setContractId(contractId);
             fixedFlowLink.setFixedFlowBranchSort(userSort+=1);
+            fixedFlowLink.setFlowTaskType(flowTaskType);
             fixedFlowLinkServiceImpl.save(fixedFlowLink);
         }
     }
@@ -242,8 +244,8 @@ public class TaskClientImpl implements TaskClient {
     }
 
     @Override
-    public void updateFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer linkSort,Integer userSort) {
-        this.saveFixedFlowLink(fixedFlowId, name, type, userIds, projectId, contractId, linkSort,userSort);
+    public void updateFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer linkSort,Integer userSort,Integer flowTaskType) {
+        this.saveFixedFlowLink(fixedFlowId, name, type, userIds, projectId, contractId, linkSort,userSort,flowTaskType);
     }
 
     @Override