wanghongzhi 1 éve
szülő
commit
294c82252f

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

@@ -272,6 +272,7 @@ public class PurchasePlanController {
 
     @WebLog
     @RequestMapping(value = "/updateFile")
+    @Deprecated
     public Object updateFile(@RequestBody PurchasePlan model) throws Exception {
         if (!ChengfaEnum.PURCHASE_PALN_STATUS_APPROVE.getValue().equals(model.getStatus())) {
             throw new BizException("此采购计划不在审批中,请勿变更");
@@ -302,7 +303,6 @@ public class PurchasePlanController {
             connection = dataSource.getConnection();
 
             model = jdbcClient.getJdbcModelById(model, connection);
-            ZeroSpringFolderComponent.build(dataSource).fetch(model);
             result.put("plan", model);
             return new ResponseEntity<>(result, HttpStatus.OK);
         } catch (Exception e) {

+ 2 - 4
easydo-chengfa/src/main/java/easydo/technology/model/Purchase.java

@@ -16,10 +16,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ZSFContainers({
-        @ZSFContainer(directory = "purchase/apply", maxLimit = 10),
-        @ZSFContainer(directory = "purchase/first", maxLimit = 10),
-        @ZSFContainer(directory = "purchase/print", maxLimit = 10),
-        @ZSFContainer(directory = "purchase/final", maxLimit = 10)
+        @ZSFContainer(directory = "purchase/apply", maxLimit = 10)
 })
 public class Purchase extends ZeroSpringFolder<Purchase> {
     @ZSFLinkField
@@ -52,6 +49,7 @@ public class Purchase extends ZeroSpringFolder<Purchase> {
     private String specialFeeType;
     private Boolean isLawyer;
     private String budgetAmountDx;
+    private String isCostApprovalRequired;
 
 
     private String processState;

+ 0 - 1
easydo-chengfa/src/main/java/easydo/technology/model/PurchaseAnswerSign.java

@@ -15,7 +15,6 @@ import lombok.EqualsAndHashCode;
 @ZSFContainers({
         @ZSFContainer(directory = "purchase/answersign", maxLimit = 10),
         @ZSFContainer(directory = "answersign/first", maxLimit = 10),
-        @ZSFContainer(directory = "answersign/print", maxLimit = 10),
         @ZSFContainer(directory = "answersign/final", maxLimit = 10)
 })
 public class PurchaseAnswerSign extends ZeroSpringFolder<PurchaseAnswerSign> {

+ 1 - 0
easydo-chengfa/src/main/java/easydo/technology/model/PurchaseBidSign.java

@@ -31,6 +31,7 @@ public class PurchaseBidSign extends ZeroSpringFolder<PurchaseBidSign> {
     private String status;
     private String endTime;
     private String businessNo;
+    private String isCostApprovalRequired;
 
     private String processState;
     private String processTaskId;

+ 1 - 8
easydo-chengfa/src/main/java/easydo/technology/model/PurchasePlan.java

@@ -13,14 +13,7 @@ import lombok.EqualsAndHashCode;
 import java.math.BigDecimal;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
-@ZSFContainers({
-        @ZSFContainer(directory = "plan/first", maxLimit = 10),
-        @ZSFContainer(directory = "plan/print", maxLimit = 10),
-        @ZSFContainer(directory = "plan/final", maxLimit = 10)
-})
-public class PurchasePlan extends ZeroSpringFolder<PurchasePlan> {
-    @ZSFLinkField
+public class PurchasePlan {
     private String id;
     private String planName;
     private String type;