From 67ba621fd3983406ef7e826c81fb6c9d02c41e67 Mon Sep 17 00:00:00 2001
From: Jinyuanyuan <1197651512@qq.com>
Date: Fri, 10 May 2024 17:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A11.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HuzhouProjectController.java   |   2 +-
 .../service/IHuzhouPlaninfoService.java       |   4 +-
 .../service/IHuzhouProjectinfoService.java    |  65 ++++----
 .../service/IHuzhouSubProjectinfoService.java |   6 +
 .../impl/HuzhouPlaninfoServiceImpl.java       |  21 ++-
 .../impl/HuzhouProjectinfoServiceImpl.java    | 146 ++++++++++++++----
 .../impl/HuzhouSubProjectinfoServiceImpl.java |  16 ++
 .../modules/huzhou/vo/CommonCountOV.java      |  18 +++
 .../easy/admin/modules/huzhou/vo/CountOV.java |  21 +++
 .../easy/admin/modules/huzhou/vo/FundOV.java  |  10 ++
 .../modules/huzhou/vo/ProjectStatusOV.java    |  12 ++
 .../admin/modules/huzhou/vo/StatusOV.java     |   4 -
 12 files changed, 257 insertions(+), 68 deletions(-)
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CommonCountOV.java
 delete mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/StatusOV.java

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 fbb49fb..2416d96 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
@@ -177,7 +177,7 @@ public class HuzhouProjectController {
      */
     @GetMapping("/count")
     public Result<?> CountProject(){
-        ProjectProgressOV result = projectinfoService.countProjectProgress();
+        CountOV result = projectinfoService.countByProperties();
         return Result.OK(result);
 
     }
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 a3511ee..eb69496 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,9 @@ public interface IHuzhouPlaninfoService extends IService<HuzhouPlaninfo> {
 
     List<Select> getTaskNameTypeDict(String projectid);
 
-    List<HuzhouPlaninfo> ListByProjectIds(List<String> projectIds);
+    List<HuzhouPlaninfo> listByProjectIds(List<String> projectIds);
+
+    Map<String,Integer> conutCompletionStatus(List<String> projectIds);
 
 
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
index 4575ae4..d23ee5c 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
@@ -11,7 +11,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -20,47 +22,54 @@ import java.util.List;
  * @author makejava
  * @since 2024-01-23 09:33:31
  */
-public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo>{
+public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo> {
     /**
      * 修改项目阶段信息
-     * @param id 项目id
+     *
+     * @param id    项目id
      * @param stage 阶段
      */
-    void modifyStageById(String id,String stage);
+    void modifyStageById(String id, String stage);
 
     /**
      * 分页查询项目信息列表
+     *
      * @param projectinfo 条件
-     * @param pageNo 页面
-     * @param pageSize 页数
+     * @param pageNo      页面
+     * @param pageSize    页数
      * @return 返回值
      */
-    IPage<HuzhouProjectinfo>  getProjectInfoPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize);
+    IPage<HuzhouProjectinfo> getProjectInfoPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize);
+
     /**
      * 分页查询项目信息列表带子项目信息
+     *
      * @param projectinfo 条件
-     * @param pageNo 页面
-     * @param pageSize 页数
+     * @param pageNo      页面
+     * @param pageSize    页数
      * @return 返回值
      */
-    IPage<HuzhouProjectinfoOV>  getProjectInfoAndChildPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize);
+    IPage<HuzhouProjectinfoOV> getProjectInfoAndChildPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize);
 
 
     /**
      * 管理人员批量导入项目
+     *
      * @param multipartFile 文件信息
      */
     void batchImportProjects(MultipartFile multipartFile) throws Exception;
 
     /**
      * 批量导出项目信息
-     * @param response response
+     *
+     * @param response    response
      * @param projectinfo 导出条件
      */
     void batchdownloadProject(HttpServletResponse response, HuzhouProjectinfo projectinfo);
 
     /**
      * 查询项目信息包含了子项目信息的查询
+     *
      * @param id 项目id
      * @return 返回值
      */
@@ -68,55 +77,49 @@ public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo>{
 
     /**
      * 新增项目入库，提交单个项目
-     * @param info  项目信息
+     *
+     * @param info 项目信息
      */
-    void submitProject(MultipartFile[] multipartFile,HuzhouProjectinfo info) throws IOException;
+    void submitProject(MultipartFile[] multipartFile, HuzhouProjectinfo info) throws IOException;
 
     /**
      * 审批项目入库信息
+     *
      * @param projectApproveOV 项目入库信息
      */
     void approveProjectInfo(ProjectApproveOV projectApproveOV);
 
     /**
      * 修改项目联系人
+     *
      * @param huzhouProjectinfo 项目信息
      */
     void modifyProjectInfoContact(HuzhouProjectinfo huzhouProjectinfo);
 
+    Map<String, List<String>> findAllProjectIds();
+
+    BigDecimal totalMoneyByProjectIds(Map<String, List<String>> projectIdsMap);
+
     /**
      * 统计项目进度
+     *
      * @param
      */
     ProjectProgressOV countProjectProgress();
 
     /**
      * 统计资金拨付
+     *
      * @param
      */
     FundOV countFund();
 
     /**
-     * 统计项目状态
-     * @param
-     */
-    ProjectStatusOV countProjectStatus();
-
-    /**
-     * 统计所属改革任务项目进度
+     * 根据项目属性分组计算项目完成情况
+     *
      * @param
      */
-    ReformTasksProgressOV countReformTasksProgress();
+    CountOV countByProperties();
 
-    /**
-     * 统计所属行政区项目进度
-     * @param
-     */
-    AdministrativeAreaProgressOV countAdministrativeAreaProgress();
-
-    /**
-     * 统计所属单位项目进度
-     * @param
-     */
-    UnitAttributesProgressOV UnitAttributesProgress();
 }
+
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouSubProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouSubProjectinfoService.java
index d2bf8aa..a3bef9f 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouSubProjectinfoService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouSubProjectinfoService.java
@@ -1,12 +1,18 @@
 package com.easy.admin.modules.huzhou.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo;
 import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
 import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo;
 
+import java.util.List;
+
 public interface IHuzhouSubProjectinfoService extends IService<HuzhouSubProjectinfo> {
     void addSubProjectinfo(HuzhouSubProjectinfo subProjectinfo);
     void modifySubProjectinfo(HuzhouSubProjectinfo subprojectinfo);
 
     HuzhouSubProjectinfo getRemainingMoneyinfo(HuzhouSubProjectinfo subprojectinfo);
+
+    List<HuzhouSubProjectinfo> listByProjectIds(List<String> projectIds);
+
 }
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 d2aa269..bf2ac8a 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
@@ -38,6 +38,7 @@ import com.easy.admin.modules.huzhou.vo.HuzhouPlaninfoOV;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.FileCopyUtils;
@@ -95,6 +96,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
     @Autowired
     private SysDictService sysDictService;
     @Autowired
+
     private HuzhouPlaninfoMapper planinfoMapper;
     @Override
     public HashMap<String,Object> getPlanInfoListFromFile(MultipartFile multipartFile,String projectid) throws Exception {
@@ -972,13 +974,28 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
     }
 
     @Override
-    public List<HuzhouPlaninfo> ListByProjectIds(List<String> projectIds) {
+    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);
+        List<HuzhouPlaninfo> result= new ArrayList<>();
+        if(planIds.size()!=0){
+            result = planinfoMapper.selectBatchIds(planIds);
+        }
+
+        return result;
+    }
+
+    @Override
+    public Map<String, Integer> conutCompletionStatus(List<String> projectIds) {
+        List<HuzhouPlaninfo> planInfoList = this.listByProjectIds(projectIds);
+        Integer fininshNum = (int) planInfoList.stream().filter(x -> x.getIsfinish().equals("2")).count();
+        Integer unfininshNum = planInfoList.size()-fininshNum;
+        Map<String, Integer> result=new HashMap<>();
+        result.put("fininshNum",fininshNum);
+        result.put("unfininshNum",unfininshNum);
         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 3ca0124..ea88479 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
@@ -46,9 +46,11 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.server.session.CookieWebSessionIdResolver;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -60,6 +62,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Transactional
+
 public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoMapper, HuzhouProjectinfo>
         implements IHuzhouProjectinfoService  {
     @Autowired
@@ -86,9 +89,17 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     @Autowired
     private IHuzhouUploadfileinfoService uploadfileinfoService;
 
-    @Autowired IHuzhouPlaninfoService planinfoService;
+    @Autowired
+    @Lazy
+    IHuzhouSubProjectinfoService subProjectinfoService;
 
-    @Autowired IHuzhouContractinfoService contractinfoService;
+    @Autowired
+    @Lazy
+    IHuzhouPlaninfoService planinfoService;
+
+    @Autowired
+    @Lazy
+    IHuzhouContractinfoService contractinfoService;
 
     @Override
 
@@ -499,12 +510,10 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
 //    }
 
     @Override
-    public ProjectProgressOV countProjectProgress() {
-        //1、查询所有项目
-        //2、查询所有项目对应的计划阶段
-        HuzhouProjectinfo projectinfo =new HuzhouProjectinfo();
-        projectinfo.setStage("0");
-        ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo);
+    public Map<String,List<String>> findAllProjectIds() {
+        HuzhouProjectinfo projectInfo =new HuzhouProjectinfo();
+        projectInfo.setStage("0");
+        ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
         List<HuzhouProjectinfoOV> projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
         List<String> zIds = projectAndChildInfoPageList.stream().map(x -> x.getId()).collect(Collectors.toList());
         List<String> cIds = new ArrayList<>();
@@ -515,40 +524,119 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
                 }
             }
         }
-        zIds.addAll(cIds);
-        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();
+        Map<String, List<String>> result = new HashMap<>();
+        result.put("zxm",zIds);
+        result.put("cxm",cIds);
         return result;
     }
 
     @Override
-    public FundOV countFund() {
-        //1、根据项目ids查合同支付总金额
-        //2、遍历每个合同，取支付阶段汇成列表
-        //3、根据项目ids查所有计划
-        //4、
-        return null;
+    public BigDecimal totalMoneyByProjectIds(Map<String,List<String>> projectIds) {
+
+        LambdaQueryWrapper<HuzhouProjectinfo> query = new LambdaQueryWrapper<>(new HuzhouProjectinfo())
+                .in(HuzhouProjectinfo::getId,projectIds.get("zxm"))
+                .select(HuzhouProjectinfo::getId,HuzhouProjectinfo::getTotalMoney);
+        List<HuzhouProjectinfo> projectInfoList=projectinfoMapper.selectList(query);
+        BigDecimal zxmTotal = new BigDecimal(Double.toString(projectInfoList.stream().mapToDouble(x -> x.getTotalMoney()).sum()));
+
+        LambdaQueryWrapper<HuzhouSubProjectinfo> cquery = new LambdaQueryWrapper<>(new HuzhouSubProjectinfo())
+                .in(HuzhouSubProjectinfo::getId,projectIds.get("cxm"))
+                .select(HuzhouSubProjectinfo::getId,HuzhouSubProjectinfo::getTotalMoney);
+        List<HuzhouSubProjectinfo> subProjectInfoList=subProjectinfoMapper.selectList(cquery);
+        BigDecimal cxmTotal = new BigDecimal(Double.toString(subProjectInfoList.stream().mapToDouble(x -> x.getTotalMoney()).sum()));
+        BigDecimal result = zxmTotal.add(cxmTotal);
+        return result;
     }
 
     @Override
-    public ProjectStatusOV countProjectStatus() {
-        return null;
+    public ProjectProgressOV countProjectProgress() {
+        //1、查询所有项目
+        //2、查询所有项目对应的计划阶段
+        Map<String, List<String>> projectIdsMap = this.findAllProjectIds();
+        List<String> projectIdsList = projectIdsMap.get("zxm");
+        projectIdsList.addAll(projectIdsMap.get("cxm"));
+        List<HuzhouPlaninfo> planInfoList = planinfoService.listByProjectIds(projectIdsList);
+        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 ReformTasksProgressOV countReformTasksProgress() {
-        return null;
+    public FundOV countFund() {
+        Map<String, List<String>> projectIdsMap = this.findAllProjectIds();
+        List<String> projectIdsList = projectIdsMap.get("zxm");
+        projectIdsList.addAll(projectIdsMap.get("cxm"));
+        List<HuzhouContractinfo> contractInfoList = contractinfoService.ListByProjectIds(projectIdsList);
+        List<HuzhouPlaninfo> planInfoList = planinfoService.listByProjectIds(projectIdsList);
+        BigDecimal payAmount = new BigDecimal("0.00");
+        Map<String, Double> contractMoneyMap;
+        List<String> finishPlanTaskList;
+        for(String projectId:projectIdsList){
+            contractMoneyMap = contractInfoList.stream().filter(x -> x.getProjectId().equals(projectId))
+                    .collect(Collectors.toMap(HuzhouContractinfo::getTaskName, HuzhouContractinfo::getTotalMoney));
+            finishPlanTaskList = planInfoList.stream().filter(x->x.getProjectId().equals(projectId))
+                    .filter(x->x.getIsfinish().equals("2")).map(x->x.getTaskName()).collect(Collectors.toList());
+            for(String key:contractMoneyMap.keySet()){
+                if(finishPlanTaskList.contains(key)){
+                    payAmount=payAmount.add(new BigDecimal(Double.toString(contractMoneyMap.get(key))));
+                }
+            }
+        }
+        //根据projectIds累加总金额
+        BigDecimal totalAmount = this.totalMoneyByProjectIds(projectIdsMap);
+        BigDecimal unPayAmount = totalAmount.subtract(payAmount);
+        FundOV result = FundOV.builder().fininshNum(payAmount.toString()).unfininshNum(unPayAmount.toString()).build();
+        return result;
     }
 
     @Override
-    public AdministrativeAreaProgressOV countAdministrativeAreaProgress() {
-        return null;
-    }
+    public CountOV countByProperties() {
+        Map<String, List<String>> projectIdsMap = this.findAllProjectIds();
+        List<String> zxmIds = projectIdsMap.get("zxm");
+        List<String> cxmIds = projectIdsMap.get("cxm");
+        List<HuzhouProjectinfo> projectInfoList = projectinfoMapper.selectBatchIds(zxmIds);
+        List<HuzhouSubProjectinfo> cProjectinfoList = subProjectinfoService.listByProjectIds(cxmIds);
+        projectInfoList.addAll(cProjectinfoList);
+        //根据项目状态统计
+        List<ProjectStatusOV> projectStatusList= new ArrayList<>();
+        Map<String, List<HuzhouProjectinfo>> statusCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getStage()));
+        for(String key:statusCountMap.keySet()){
+           projectStatusList.add(ProjectStatusOV.builder().name(key).value(statusCountMap.get(key).size()).build());
+        }
+        //根据所属改革任务统计(阶段完成情况)
+        List<CommonCountOV> projectByReformList= new ArrayList<>();
+        Map<String, List<HuzhouProjectinfo>> reformCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getReformName().trim()));
+        for (String key:reformCountMap.keySet()){
+            List<String> keyProjectIdsList = reformCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
+            Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
+            projectByReformList.add(CommonCountOV.builder().name(key).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
 
-    @Override
-    public UnitAttributesProgressOV UnitAttributesProgress() {
-        return null;
+        }
+        //根据行政区统计
+        List<CommonCountOV> projectByRegionList= new ArrayList<>();
+        Map<String, List<HuzhouProjectinfo>> regionCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getAdminDivision().trim()));
+        for (String key:regionCountMap.keySet()){
+            List<String> keyProjectIdsList = regionCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
+            Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
+            projectByRegionList.add(CommonCountOV.builder().name(key).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
+
+        }
+        //根据单位统计
+        List<CommonCountOV> projectByWorkplaceList= new ArrayList<>();
+        Map<String, List<HuzhouProjectinfo>> workplaceCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getWorkplaceProperties().trim()));
+        for (String key:workplaceCountMap.keySet()){
+            List<String> keyProjectIdsList = workplaceCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
+            Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
+            projectByWorkplaceList.add(CommonCountOV.builder().name(key).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
+
+        }
+        ProjectProgressOV projectProgress = countProjectProgress();
+        FundOV fund = countFund();
+        CountOV result = CountOV.builder().xiangmZJD(projectProgress).xiangmuZJ(fund)
+                .xiangmuZT(projectStatusList).XXQY(projectByRegionList).SSGGRW(projectByReformList).DWSX(projectByWorkplaceList).build();
+        return result;
     }
+
+
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java
index b6c1b26..5034d28 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java
@@ -3,6 +3,7 @@ package com.easy.admin.modules.huzhou.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.easy.admin.modules.huzhou.dao.HuzhouSubProjectinfoMapper;
+import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo;
 import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
 import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo;
 import com.easy.admin.modules.huzhou.service.IHuzhouProjectinfoService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl<HuzhouSubProjectinfoMapper, HuzhouSubProjectinfo> implements IHuzhouSubProjectinfoService {
@@ -24,6 +26,9 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl<HuzhouSubProjec
 
     @Autowired
     private HuzhouProjectinfoServiceImpl projectinfoService;
+
+    @Autowired
+    private HuzhouSubProjectinfoMapper subProjectinfoMapper;
     @Override
     public void addSubProjectinfo(HuzhouSubProjectinfo subprojectinfo) {
         String projectinfoId = subprojectinfo.getId();
@@ -87,4 +92,15 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl<HuzhouSubProjec
 
         return subprojectinfo;
     }
+
+    @Override
+    public List<HuzhouSubProjectinfo> listByProjectIds(List<String> projectIds) {
+        LambdaQueryWrapper<HuzhouSubProjectinfo> query = new LambdaQueryWrapper<>(new HuzhouSubProjectinfo())
+                .in(HuzhouSubProjectinfo::getProjectId,projectIds)
+                .select(HuzhouSubProjectinfo::getProjectId,HuzhouSubProjectinfo::getId);
+        List<HuzhouSubProjectinfo> subProjectInfoList=subProjectinfoMapper.selectList(query);
+        List<String> subProjectsIds = subProjectInfoList.stream().map(x -> x.getId()).collect(Collectors.toList());
+        List<HuzhouSubProjectinfo> result = subProjectinfoMapper.selectBatchIds(subProjectsIds);
+        return result;
+    }
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CommonCountOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CommonCountOV.java
new file mode 100644
index 0000000..48ef044
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CommonCountOV.java
@@ -0,0 +1,18 @@
+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 CommonCountOV {
+
+    private String name;
+
+    private Integer fininshNum;
+    private Integer unfininshNum;
+}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CountOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CountOV.java
index 1404ad4..5a8cf55 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CountOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CountOV.java
@@ -1,7 +1,28 @@
 package com.easy.admin.modules.huzhou.vo;
 
+import lombok.Builder;
 import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
 
 @Data
+@Accessors(chain = true)
+@Builder(toBuilder = true)
 public class CountOV {
+
+    private ProjectProgressOV xiangmZJD;
+
+    private FundOV xiangmuZJ;
+
+    private List<ProjectStatusOV> xiangmuZT;
+
+    private List<CommonCountOV> SSGGRW;
+
+    private List<CommonCountOV>XXQY;
+
+    private List<CommonCountOV> DWSX;
+
+
+
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundOV.java
index 5045e01..7ac933d 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundOV.java
@@ -1,4 +1,14 @@
 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 FundOV {
+    private String fininshNum;
+    private String unfininshNum;
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectStatusOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectStatusOV.java
index 16aa57a..1b5ba49 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectStatusOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectStatusOV.java
@@ -1,4 +1,16 @@
 package com.easy.admin.modules.huzhou.vo;
 
+
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@Builder(toBuilder = true)
 public class ProjectStatusOV {
+
+    private String name;
+    private Integer value;
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/StatusOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/StatusOV.java
deleted file mode 100644
index 4ac71d9..0000000
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/StatusOV.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.easy.admin.modules.huzhou.vo;
-
-public class StatusOV {
-}