From 701539ca54bf08267bbf669188797669b9335811 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 07 Nov 2023 16:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev

---
 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index bf4a59d..2d858cf 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -794,9 +794,12 @@
         //������������������
         ApproveTable approveTable = new ApproveTable();
         approveTable.setRelationId(allocation.getAllocationId());
+        approveTable.setState(NEW_BUILT);
+        approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+        approveTable.setStateName("������");
+        approveTableService.saveResult(approveTable);
         approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
         approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
-        approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
         approveTableService.saveResult(approveTable);
         fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
     }

--
Gitblit v1.8.0