diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java index f870abe..8dc224d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java @@ -157,7 +157,13 @@ public class HuzhouProjectController { @GetMapping("/queryContractSignIsFinish") public Result queryContractSignIsFinish(String projectid){ Boolean flag = projectinfoService.queryContractSignIsFinish(projectid); - return Result.OK(flag); + String msg = ""; + if (flag){ + msg = "合同签订阶段已完成"; + }else { + msg = "合同签订阶段未完成"; + } + return Result.OK(msg,flag); } /** diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java index f3537bf..e7ce3a5 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java @@ -223,6 +223,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl 未完成! "); return false; }