chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 项目管理-新增修改功能

This commit is contained in:
renzexin 2024-08-15 12:08:20 +08:00
parent 2a33f118fc
commit 96b989d7b3
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
View File

@ -142,19 +142,19 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
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);
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);
contractService.updateById(contract);
return wrkProject.getProjectId();
}