diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java index a6c03d0..c11b4fb 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java @@ -210,4 +210,10 @@ public class HuzhouPlanController { return Result.ok(result); } + // 合同签订重新上传会删除原有的合同金额是否需要继续上传? + @DeleteMapping("/deleteContractMoney") + public Result deleteContractMoney(String projectid) { + Boolean flag = planinfoService.deleteContractMoney(projectid); + return Result.OK(flag); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java index 56473d9..5a1e08e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java @@ -118,4 +118,6 @@ public interface IHuzhouPlaninfoService extends IService { void setPlaninfoIsoffline( List planinfoid); List queryTaskLevelDetail(String projectid, String taskLevel); + + Boolean deleteContractMoney(String projectid); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index 01e881e..bd4eb37 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -374,7 +374,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl { determineIsModify(projectId, item); }); @@ -495,11 +495,13 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl { - // 判断子阶段是否需要填写实际合同金额,如果存在则支持重新上传 + String taskLevel = childItem.getTaskLevel(); + if (childItem.getTaskName().equals("合同签订")) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); qw.eq(HuzhouPlaninfo::getProjectId, projectId) - .eq(HuzhouPlaninfo::getTaskName, "合同签订").eq(HuzhouPlaninfo::getIsfinish, "2"); + .eq(HuzhouPlaninfo::getTaskName, "合同签订") + .eq(HuzhouPlaninfo::getIsfinish, "2"); if (planInfoMapper.selectCount(qw) > 0 && contractinfoService.getPlanContractinfoByprojectId(projectId).size() < 1) { childItem.setIsmodify(true); log.info("----开启补偿接口重新上传合同金额-----"); @@ -507,16 +509,31 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl thresholdLevel,返回 true;否则 false + */ + private boolean isGreaterThanThreshold(String taskLevel, String thresholdLevel) { + if (taskLevel == null || thresholdLevel == null) { + throw new IllegalArgumentException("taskLevel 和 thresholdLevel 不能为空"); + } + return taskLevel.compareTo(thresholdLevel) > 0; + } private void dealMainTaskLevelIsFinish(String projectId, List taskLevelList, List subPlanInfoList, List mainPlanInfoList) { for (String taskLevel : taskLevelList) { // 检查该 taskLevel 下的所有子项目是否都已完成 @@ -1622,4 +1639,15 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.eq(HuzhouContractinfo::getProjectId, projectid); + boolean success = contractinfoService.remove(deleteWrapper); + if(success){ + log.info("删除原有合同金额成功!"); + } + return success; + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index 8f9b1e5..becbb14 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -710,7 +710,8 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl