From 96b989d7b3d0d0daf873f9cb398fe901a8c58db3 Mon Sep 17 00:00:00 2001 From: renzexin Date: Thu, 15 Aug 2024 12:08:20 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/WrkProjectService.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java index e5c401f..218e028 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -142,19 +142,19 @@ public class WrkProjectService extends ServiceImpl BeanUtil.copyProperties(project, wrkProject); this.updateById(wrkProject); // 项目合同 -// WrkProjectContract contract = WrkProjectContract.builder().build(); -// BeanUtil.copyProperties(project.getContract(), contract); -// LocalDateTime now = LocalDateTime.now(); -// // 在 之前 && 在 之后 无效 -// if (now.isBefore(contract.getContractStartTime()) && now.isAfter(contract.getContractEndTime())) { -// contract.setProjectEffect(0); -// }else { -// contract.setProjectEffect(1); -// } -// // 未回款完成 -// contract.setPaymentState(0); - // 项目合同 修改时不需要 项目id -// contractService.updateById(contract); + WrkProjectContract contract = WrkProjectContract.builder().build(); + BeanUtil.copyProperties(project.getContract(), contract); + LocalDateTime now = LocalDateTime.now(); + // 在 之前 && 在 之后 无效 + if (now.isBefore(contract.getContractStartTime()) && now.isAfter(contract.getContractEndTime())) { + contract.setProjectEffect(0); + }else { + contract.setProjectEffect(1); + } + // 未回款完成 + contract.setPaymentState(0); + //项目合同 修改时不需要 项目id + contractService.updateById(contract); return wrkProject.getProjectId(); }