From 4a24531bad9a73ddffc2e4073346bacb51820fb1 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Sat, 8 Feb 2025 15:57:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E9=98=B6=E6=AE=B5=E5=AE=9E=E9=99=85=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=9A=84=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HuzhouContractinfoController.java       | 10 +++++++++-
 .../huzhou/service/IHuzhouContractinfoService.java     |  2 ++
 .../service/impl/HuzhouContractinfoServiceImpl.java    | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

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<HuzhouContractinfo> 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<HuzhouContractinfo> contractinfoByprojectId = contractinfoService.getContractinfoByprojectIdAndTaskName(projectid, taskName);
+
+        return Result.ok(contractinfoByprojectId);
+    }
+
     @GetMapping("/getRealContractinfoByProjectId")
     public Result<?> getRealContractinfoByProjectId(String projectid){
         List<HuzhouContractinfo> 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<HuzhouContractinfo>
 
     List<HuzhouContractinfo> getContractinfoByprojectId(String projectid);
 
+    List<HuzhouContractinfo> getContractinfoByprojectIdAndTaskName(String projectid, String taskName);
+
     List<HuzhouContractinfo> getRealContractinfoByprojectId(String projectid);
 
     void approvalContractinfo(MultipartFile[] file, List<HuzhouContractinfo> 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<HuzhouContractinf
         return list;
     }
 
+    @Override
+    public List<HuzhouContractinfo> getContractinfoByprojectIdAndTaskName(String projectid, String taskName) {
+        LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid);
+        queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
+        queryWrapper.eq(HuzhouContractinfo::getFlag,"实际");
+        List<HuzhouContractinfo> list = list(queryWrapper);
+        return list;
+    }
+
     @Override
     public List<HuzhouContractinfo> getRealContractinfoByprojectId(String projectid) {
         LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();