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(); }