From 943c5905b7f4ff48c7ae87c41b41aeae854f8a20 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 08 Nov 2023 11:02:09 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb --- 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 47558bc..da34292 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