diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java index 7879dcf..bcbe8c5 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java @@ -89,7 +89,7 @@ public class HuzhouContractinfoController { Boolean exitTaskNameInPlanInfo = planinfoService.isExitTaskNameInPlanInfo(projectid, taskName); return Result.ok(exitTaskNameInPlanInfo); } - // 合同信息(计划) + // 获取合同信息(计划) @GetMapping("/getContractinfoByProjectId") public Result getContractinfoByProjectId(String projectid){ List contractinfoByprojectId = contractinfoService.getContractinfoByprojectId(projectid); @@ -97,6 +97,14 @@ public class HuzhouContractinfoController { return Result.ok(contractinfoByprojectId); } + // 获取指定阶段合同信息(实际) + @GetMapping("/getContractinfoByProjectIdAndTaskName") + public Result getContractinfoByProjectIdAndTaskName(String projectid,String taskName){ + List contractinfoByprojectId = contractinfoService.getContractinfoByprojectIdAndTaskName(projectid, taskName); + + return Result.ok(contractinfoByprojectId); + } + @GetMapping("/getRealContractinfoByProjectId") public Result getRealContractinfoByProjectId(String projectid){ List contractinfoByprojectId = contractinfoService.getRealContractinfoByprojectId(projectid); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java index a1a9cf5..c4c82bb 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java @@ -31,6 +31,8 @@ public interface IHuzhouContractinfoService extends IService List getContractinfoByprojectId(String projectid); + List getContractinfoByprojectIdAndTaskName(String projectid, String taskName); + List getRealContractinfoByprojectId(String projectid); void approvalContractinfo(MultipartFile[] file, List contractList, String taskId, String flag, String projectid, String comment,boolean isEdit) throws IOException; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index 7bc9324..0d619a0 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -279,6 +279,16 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl getContractinfoByprojectIdAndTaskName(String projectid, String taskName) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid); + queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName); + queryWrapper.eq(HuzhouContractinfo::getFlag,"实际"); + List list = list(queryWrapper); + return list; + } + @Override public List getRealContractinfoByprojectId(String projectid) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();