From 6316960c6eec67830d07f5c4d5d80c73c1db1da2 Mon Sep 17 00:00:00 2001
From: uu <1197651512@qq.com>
Date: Thu, 9 May 2024 23:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A11.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IHuzhouContractinfoService.java    |  2 ++
 .../huzhou/service/IHuzhouPlaninfoService.java |  2 +-
 .../impl/HuzhouContractinfoServiceImpl.java    | 11 +++++++++++
 .../impl/HuzhouPlaninfoServiceImpl.java        | 11 +++++++++--
 .../impl/HuzhouProjectinfoServiceImpl.java     | 18 +++++++++++++-----
 .../modules/huzhou/vo/ProjectProgressOV.java   |  9 +++++++++
 6 files changed, 45 insertions(+), 8 deletions(-)

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 b24ecce..ee95409 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,4 +31,6 @@ public interface IHuzhouContractinfoService extends IService<HuzhouContractinfo>
     List<HuzhouContractinfo> getContractinfoByprojectId(String projectid);
 
     void approvalContractinfo(MultipartFile[] file, List<HuzhouContractinfo> contractList, String taskId, String flag, String projectid, String comment,boolean isEdit) throws IOException;
+
+    List<HuzhouContractinfo> ListByProjectIds(List<String> projectIds);
 }
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 00c3016..a3511ee 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
@@ -96,7 +96,7 @@ public interface IHuzhouPlaninfoService extends IService<HuzhouPlaninfo> {
 
     List<Select> getTaskNameTypeDict(String projectid);
 
-    List<HuzhouPlaninfo> ListByProjectIds(String[] projectIds);
+    List<HuzhouPlaninfo> ListByProjectIds(List<String> projectIds);
 
 
 }
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 388ce0e..7883a76 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
@@ -250,5 +250,16 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
         }
     }
 
+    @Override
+    public List<HuzhouContractinfo> ListByProjectIds(List<String> projectIds) {
+        LambdaQueryWrapper<HuzhouContractinfo> query = new LambdaQueryWrapper<>(new HuzhouContractinfo())
+                .in(HuzhouContractinfo::getProjectId,projectIds)
+                .select(HuzhouContractinfo::getProjectId,HuzhouContractinfo::getId);
+        List<HuzhouContractinfo> contractInfoList=contractinfoMapper.selectList(query);
+        List<String> contractIds = contractInfoList.stream().map(x -> x.getId()).collect(Collectors.toList());
+        List<HuzhouContractinfo> result = contractinfoMapper.selectBatchIds(contractIds);
+        return result;
+    }
+
 
 }
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 45d2a70..d2aa269 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
@@ -57,6 +57,7 @@ import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * (HuzhouPlaninfo)表服务实现类
@@ -971,8 +972,14 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
     }
 
     @Override
-    public List<HuzhouPlaninfo> ListByProjectIds(String[] projectIds) {
-        return null;
+    public List<HuzhouPlaninfo> ListByProjectIds(List<String> projectIds) {
+        LambdaQueryWrapper<HuzhouPlaninfo> query = new LambdaQueryWrapper<>(new HuzhouPlaninfo())
+                .in(HuzhouPlaninfo::getProjectId,projectIds)
+                .select(HuzhouPlaninfo::getProjectId,HuzhouPlaninfo::getId);
+        List<HuzhouPlaninfo> planInfoList=planinfoMapper.selectList(query);
+        List<String> planIds = planInfoList.stream().map(x -> x.getId()).collect(Collectors.toList());
+        List<HuzhouPlaninfo> result = planinfoMapper.selectBatchIds(planIds);
+        return result;
     }
 
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index b4c44d6..3ca0124 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -86,8 +86,10 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     @Autowired
     private IHuzhouUploadfileinfoService uploadfileinfoService;
 
-    @Autowired
-    private IHuzhouPlaninfoService huzhouPlaninfoService;
+    @Autowired IHuzhouPlaninfoService planinfoService;
+
+    @Autowired IHuzhouContractinfoService contractinfoService;
+
     @Override
 
     public void submitProject(MultipartFile[] multipartFile,HuzhouProjectinfo info) throws IOException {
@@ -514,13 +516,19 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             }
         }
         zIds.addAll(cIds);
-
-
-        return null;
+        List<HuzhouPlaninfo> planInfoList = planinfoService.ListByProjectIds(zIds);
+        int fininshNum = (int) planInfoList.stream().filter(x -> (x.getIsfinish().equals("2"))).count();
+        int unfininshNum=planInfoList.size()-fininshNum;
+        ProjectProgressOV result = ProjectProgressOV.builder().fininshNum(fininshNum).unfininshNum(unfininshNum).build();
+        return result;
     }
 
     @Override
     public FundOV countFund() {
+        //1、根据项目ids查合同支付总金额
+        //2、遍历每个合同，取支付阶段汇成列表
+        //3、根据项目ids查所有计划
+        //4、
         return null;
     }
 
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectProgressOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectProgressOV.java
index 32c16d1..6a174ca 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectProgressOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectProgressOV.java
@@ -1,4 +1,13 @@
 package com.easy.admin.modules.huzhou.vo;
 
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@Builder(toBuilder = true)
 public class ProjectProgressOV {
+    private Integer fininshNum;
+    private Integer unfininshNum;
 }