新增查询指定阶段实际支付的合同信息

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);

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;

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<>();