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

---
 .../controller/HuzhouProjectController.java   | 13 +++++
 .../huzhou/dao/HuzhouProjectinfoMapper.java   |  3 +-
 .../service/IHuzhouPlaninfoService.java       |  4 ++
 .../service/IHuzhouProjectinfoService.java    | 39 ++++++++++++-
 .../impl/HuzhouPlaninfoServiceImpl.java       |  5 ++
 .../impl/HuzhouProjectinfoServiceImpl.java    | 58 ++++++++++++++++++-
 .../vo/AdministrativeAreaProgressOV.java      |  4 ++
 .../easy/admin/modules/huzhou/vo/CountOV.java |  7 +++
 .../easy/admin/modules/huzhou/vo/FundOV.java  |  4 ++
 .../modules/huzhou/vo/ProjectProgressOV.java  |  4 ++
 .../modules/huzhou/vo/ProjectStatusOV.java    |  4 ++
 .../huzhou/vo/ReformTasksProgressOV.java      |  4 ++
 .../admin/modules/huzhou/vo/StatusOV.java     |  4 ++
 .../huzhou/vo/UnitAttributesProgressOV.java   |  4 ++
 14 files changed, 151 insertions(+), 6 deletions(-)
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/AdministrativeAreaProgressOV.java
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CountOV.java
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundOV.java
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectProgressOV.java
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectStatusOV.java
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ReformTasksProgressOV.java
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/StatusOV.java
 create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/UnitAttributesProgressOV.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 47b9cdf..fbb49fb 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
@@ -4,6 +4,7 @@ package com.easy.admin.modules.huzhou.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.easy.admin.common.core.annotation.ResponseResult;
+import com.easy.admin.modules.huzhou.vo.CountOV;
 import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV;
 
 import com.easy.admin.common.api.vo.Result;
@@ -12,6 +13,7 @@ import com.easy.admin.modules.huzhou.entity.*;
 import com.easy.admin.modules.huzhou.service.*;
 
 import com.easy.admin.modules.huzhou.vo.ProjectApproveOV;
+import com.easy.admin.modules.huzhou.vo.ProjectProgressOV;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -168,4 +170,15 @@ public class HuzhouProjectController {
     public void batchdownloadProject(HttpServletResponse response,HuzhouProjectinfo projectinfo){
                 projectinfoService.batchdownloadProject(response,projectinfo);
     }
+    /**
+     * 项目统计
+     * @param
+     * @param
+     */
+    @GetMapping("/count")
+    public Result<?> CountProject(){
+        ProjectProgressOV result = projectinfoService.countProjectProgress();
+        return Result.OK(result);
+
+    }
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java
index 236e54a..474097d 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV;
 import org.apache.ibatis.annotations.Mapper;
 import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -37,6 +38,6 @@ public interface HuzhouProjectinfoMapper extends BaseMapper<HuzhouProjectinfo> {
      * @param info 查询条件
      * @return List<HuzhouProjectinfoOV>
      */
-    List<HuzhouProjectinfoOV> getProjectAndChildInfoPageList( HuzhouProjectinfo info);
+    List<HuzhouProjectinfoOV> getProjectAndChildInfoPageList(@Param("info") HuzhouProjectinfo info);
 
 }
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 75f150d..00c3016 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
@@ -95,4 +95,8 @@ public interface IHuzhouPlaninfoService extends IService<HuzhouPlaninfo> {
     void downloadPlanInfo(HttpServletResponse response, String projectid);
 
     List<Select> getTaskNameTypeDict(String projectid);
+
+    List<HuzhouPlaninfo> ListByProjectIds(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 c682536..4575ae4 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
@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.easy.admin.common.api.vo.Result;
 import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV;
-import com.easy.admin.modules.huzhou.vo.ProjectApproveOV;
+import com.easy.admin.modules.huzhou.vo.*;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
@@ -84,4 +83,40 @@ public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo>{
      * @param huzhouProjectinfo 项目信息
      */
     void modifyProjectInfoContact(HuzhouProjectinfo huzhouProjectinfo);
+
+    /**
+     * 统计项目进度
+     * @param
+     */
+    ProjectProgressOV countProjectProgress();
+
+    /**
+     * 统计资金拨付
+     * @param
+     */
+    FundOV countFund();
+
+    /**
+     * 统计项目状态
+     * @param
+     */
+    ProjectStatusOV countProjectStatus();
+
+    /**
+     * 统计所属改革任务项目进度
+     * @param
+     */
+    ReformTasksProgressOV countReformTasksProgress();
+
+    /**
+     * 统计所属行政区项目进度
+     * @param
+     */
+    AdministrativeAreaProgressOV countAdministrativeAreaProgress();
+
+    /**
+     * 统计所属单位项目进度
+     * @param
+     */
+    UnitAttributesProgressOV UnitAttributesProgress();
 }
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 08fd4f0..45d2a70 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
@@ -970,4 +970,9 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
         return map;
     }
 
+    @Override
+    public List<HuzhouPlaninfo> ListByProjectIds(String[] projectIds) {
+        return null;
+    }
+
 }
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 d108611..b4c44d6 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
@@ -26,13 +26,12 @@ import com.easy.admin.modules.huzhou.dao.HuzhouProjectinfoMapper;
 import com.easy.admin.modules.huzhou.dao.HuzhouSubProjectinfoMapper;
 import com.easy.admin.modules.huzhou.entity.*;
 import com.easy.admin.modules.huzhou.service.*;
-import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV;
-import com.easy.admin.modules.huzhou.vo.ProjectApproveOV;
-import com.easy.admin.modules.huzhou.vo.ProjectInfoAuthSelect;
+import com.easy.admin.modules.huzhou.vo.*;
 import com.easy.admin.sys.model.SysDict;
 import com.easy.admin.sys.service.SysDictService;
 import com.easy.admin.util.PasswordUtil;
 import com.easy.admin.util.ShiroUtil;
+import javassist.expr.NewArray;
 import org.activiti.engine.IdentityService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -86,6 +85,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     private HuzhouProjectinfoHistoryMapper historyMapper;
     @Autowired
     private IHuzhouUploadfileinfoService uploadfileinfoService;
+
+    @Autowired
+    private IHuzhouPlaninfoService huzhouPlaninfoService;
     @Override
 
     public void submitProject(MultipartFile[] multipartFile,HuzhouProjectinfo info) throws IOException {
@@ -334,6 +336,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         userprojectService.saveFromProject(huzhouProjectinfo,"0");
     }
 
+
+
+
     @Override
     public void modifyStageById(String id, String stage) {
         HuzhouProjectinfo byId = getById(id);
@@ -491,4 +496,51 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
 //        return "0";
 //    }
 
+    @Override
+    public ProjectProgressOV countProjectProgress() {
+        //1、查询所有项目
+        //2、查询所有项目对应的计划阶段
+        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<>();
+        for(HuzhouProjectinfoOV info:projectAndChildInfoPageList){
+            if(info.getChildren()!=null){
+                for(HuzhouSubProjectinfo child:info.getChildren()){
+                    cIds.add(child.getProjectId());
+                }
+            }
+        }
+        zIds.addAll(cIds);
+
+
+        return null;
+    }
+
+    @Override
+    public FundOV countFund() {
+        return null;
+    }
+
+    @Override
+    public ProjectStatusOV countProjectStatus() {
+        return null;
+    }
+
+    @Override
+    public ReformTasksProgressOV countReformTasksProgress() {
+        return null;
+    }
+
+    @Override
+    public AdministrativeAreaProgressOV countAdministrativeAreaProgress() {
+        return null;
+    }
+
+    @Override
+    public UnitAttributesProgressOV UnitAttributesProgress() {
+        return null;
+    }
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/AdministrativeAreaProgressOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/AdministrativeAreaProgressOV.java
new file mode 100644
index 0000000..51232a5
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/AdministrativeAreaProgressOV.java
@@ -0,0 +1,4 @@
+package com.easy.admin.modules.huzhou.vo;
+
+public class AdministrativeAreaProgressOV {
+}
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
new file mode 100644
index 0000000..1404ad4
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/CountOV.java
@@ -0,0 +1,7 @@
+package com.easy.admin.modules.huzhou.vo;
+
+import lombok.Data;
+
+@Data
+public class CountOV {
+}
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
new file mode 100644
index 0000000..5045e01
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundOV.java
@@ -0,0 +1,4 @@
+package com.easy.admin.modules.huzhou.vo;
+
+public class FundOV {
+}
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
new file mode 100644
index 0000000..32c16d1
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectProgressOV.java
@@ -0,0 +1,4 @@
+package com.easy.admin.modules.huzhou.vo;
+
+public class ProjectProgressOV {
+}
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
new file mode 100644
index 0000000..16aa57a
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectStatusOV.java
@@ -0,0 +1,4 @@
+package com.easy.admin.modules.huzhou.vo;
+
+public class ProjectStatusOV {
+}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ReformTasksProgressOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ReformTasksProgressOV.java
new file mode 100644
index 0000000..2d05dd0
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ReformTasksProgressOV.java
@@ -0,0 +1,4 @@
+package com.easy.admin.modules.huzhou.vo;
+
+public class ReformTasksProgressOV {
+}
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
new file mode 100644
index 0000000..4ac71d9
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/StatusOV.java
@@ -0,0 +1,4 @@
+package com.easy.admin.modules.huzhou.vo;
+
+public class StatusOV {
+}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/UnitAttributesProgressOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/UnitAttributesProgressOV.java
new file mode 100644
index 0000000..75929a6
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/UnitAttributesProgressOV.java
@@ -0,0 +1,4 @@
+package com.easy.admin.modules.huzhou.vo;
+
+public class UnitAttributesProgressOV {
+}