1029需要变更

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseAnswerSignController.java

@@ -85,6 +85,7 @@ public class PurchaseAnswerSignController {
             GLDApproveVo vo = new GLDApproveVo();
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_ANSWER_SIGN.getValue());
             vo.setTemplateId(model.getTemplateId());
+            vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseApplyController.java

@@ -147,6 +147,7 @@ public class PurchaseApplyController {
             GLDApproveVo vo = new GLDApproveVo();
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE.getValue());
             vo.setTemplateId(model.getTemplateId());
+            vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseBidNoticeController.java

@@ -95,6 +95,7 @@ public class PurchaseBidNoticeController {
             GLDApproveVo vo = new GLDApproveVo();
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_BID_NOTICE.getValue());
             vo.setTemplateId(model.getTemplateId());
+            vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseBidSignController.java

@@ -84,6 +84,7 @@ public class PurchaseBidSignController {
             GLDApproveVo vo = new GLDApproveVo();
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_BID_SIGN.getValue());
             vo.setTemplateId(model.getTemplateId());
+            vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseMatterController.java

@@ -90,6 +90,7 @@ public class PurchaseMatterController {
             GLDApproveVo vo = new GLDApproveVo();
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_MATTER.getValue());
             vo.setTemplateId(model.getTemplateId());
+            vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchasePlanController.java

@@ -182,6 +182,7 @@ public class PurchasePlanController {
             GLDApproveVo vo = new GLDApproveVo();
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_PLAN.getValue());
             vo.setTemplateId(model.getTemplateId());
+            vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/model/Purchase.java

@@ -1,5 +1,6 @@
 package easydo.technology.model;
 
+import com.alibaba.fastjson.JSONArray;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -75,4 +76,6 @@ public class Purchase extends ZeroSpringFolder<Purchase> {
     private Integer oaStatus;
     @NotTableField
     private PurchaseLaw purchaseLaw;
+    @NotTableField
+    private JSONArray userTaskAssigneePropsList;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseAnswerSign.java

@@ -1,5 +1,6 @@
 package easydo.technology.model;
 
+import com.alibaba.fastjson.JSONArray;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -37,4 +38,6 @@ public class PurchaseAnswerSign extends ZeroSpringFolder<PurchaseAnswerSign> {
 
     @NotTableField
     private String templateId;
+    @NotTableField
+    private JSONArray userTaskAssigneePropsList;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseBidNotice.java

@@ -2,6 +2,7 @@ package easydo.technology.model;
 
 import java.math.BigDecimal;
 
+import com.alibaba.fastjson.JSONArray;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -52,4 +53,6 @@ public class PurchaseBidNotice extends ZeroSpringFolder<PurchaseBidNotice> {
     private String contractPlanCode;
     @NotTableField
     private String contractPlanName;
+    @NotTableField
+    private JSONArray userTaskAssigneePropsList;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseBidSign.java

@@ -1,5 +1,6 @@
 package easydo.technology.model;
 
+import com.alibaba.fastjson.JSONArray;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -37,4 +38,6 @@ public class PurchaseBidSign extends ZeroSpringFolder<PurchaseBidSign> {
 
     @NotTableField
     private String templateId;
+    @NotTableField
+    private JSONArray userTaskAssigneePropsList;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseMatter.java

@@ -1,5 +1,6 @@
 package easydo.technology.model;
 
+import com.alibaba.fastjson.JSONArray;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -34,4 +35,6 @@ public class PurchaseMatter extends ZeroSpringFolder<PurchaseMatter> {
 
     @NotTableField
     private String templateId;
+    @NotTableField
+    private JSONArray userTaskAssigneePropsList;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchasePlan.java

@@ -1,5 +1,6 @@
 package easydo.technology.model;
 
+import com.alibaba.fastjson.JSONArray;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -52,4 +53,6 @@ public class PurchasePlan extends ZeroSpringFolder<PurchasePlan> {
 
     @NotTableField
     private String templateId;
+    @NotTableField
+    private JSONArray userTaskAssigneePropsList;
 }

easydo-chengfa/src/main/java/easydo/technology/model/vo/GLDApproveVo.java

@@ -1,5 +1,6 @@
 package easydo.technology.model.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
@@ -13,6 +14,7 @@ public class GLDApproveVo {
     private String targetType;
     private Boolean hiddenResubmit;
     private JSONObject extData;
+    private JSONArray userTaskAssigneePropsList;
     private String taskId;
     private String instanceId;
     private String state;

easydo-chengfa/src/main/java/easydo/technology/service/GLDApproveService.java

@@ -81,6 +81,7 @@ public class GLDApproveService {
         object.put("targetType", vo.getTargetType());
 //        object.put("targetId", vo.getTargetId());
         object.put("taskType", "APPROVAL");
+        object.put("userTaskAssigneePropsList", vo.getUserTaskAssigneePropsList());
         object.put("hiddenResubmit", true);
         object.put("startorId", member.getUserId());
         String uuid = UUID.randomUUID().toString();