From e01cc068f5fabbe456677082025720ed5b2723cb Mon Sep 17 00:00:00 2001
From: Jinyuanyuan <1197651512@qq.com>
Date: Thu, 12 Sep 2024 10:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E7=BB=9F=E8=AE=A1=E9=9D=9E=E7=BB=88?=
 =?UTF-8?q?=E6=AD=A2=E7=8A=B6=E6=80=81=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml  | 6 +++---
 .../huzhou/service/impl/HuzhouProjectinfoServiceImpl.java   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
index 17dcbbd..0b5fade 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
@@ -518,7 +518,7 @@ order by create_date desc
         select u.duty_workplace as dutyWorkplace,count(*) as projectNum,
         sum(u.total_money) as totalMoney, sum(u.urt_estimated_amount) as estimateMoney,sum(central_money) as centralMoney,
         sum(m.contract_total_money) as contractMoney,sum(m.contract_central_money) as contractCentralMoney
-        from huzhou_projectinfo u left join huzhou_projectinfo_money m on u.id=m.id where u.id in
+        from huzhou_projectinfo u left join huzhou_projectinfo_money m on u.id=m.id where u.stage!='-1' and u.id in
         <foreach item="projectId" index="index" collection="projectIds" open="(" separator="," close=")">
             #{projectId}
         </foreach>
@@ -528,7 +528,7 @@ order by create_date desc
         select u.admin_division as adminDivision,count(*) as projectNum,
         sum(u.total_money) as totalMoney, sum(u.urt_estimated_amount) as estimateMoney,sum(central_money) as centralMoney,
         sum(m.contract_total_money) as contractMoney,sum(m.contract_central_money) as contractCentralMoney
-        from huzhou_projectinfo u left join huzhou_projectinfo_money m on u.id=m.id where u.id in
+        from huzhou_projectinfo u left join huzhou_projectinfo_money m on u.id=m.id where u.stage!='-1' and u.id in
         <foreach item="projectId" index="index" collection="projectIds" open="(" separator="," close=")">
             #{projectId}
         </foreach>
@@ -538,7 +538,7 @@ order by create_date desc
         select u.reform_name as reformName,u.super_leader as superLeader,count(*) as projectNum,
                sum(u.total_money) as totalMoney, sum(u.urt_estimated_amount) as estimateMoney,sum(central_money) as centralMoney,
                sum(m.contract_total_money) as contractMoney,sum(m.contract_central_money) as contractCentralMoney
-        from huzhou_projectinfo u left join huzhou_projectinfo_money m on u.id=m.id where u.id in
+        from huzhou_projectinfo u left join huzhou_projectinfo_money m on u.id=m.id where u.stage!='-1' and u.id in
             <foreach item="projectId" index="index" collection="projectIds" open="(" separator="," close=")">
                 #{projectId}
             </foreach>
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 fccaa0d..0937880 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
@@ -1269,7 +1269,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         int countryNum = 0;
         HuzhouProjectinfo projectInfo = new HuzhouProjectinfo();
         ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
-        List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
+        List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect).stream().filter(x->!x.getStage().equals("1")).collect(Collectors.toList());
         if(projectinfoOVList.size()>0){
             total=projectinfoOVList.size();
             cityNum=projectinfoOVList.stream().filter(x->x.getAdminDivision().equals("市本级")).collect(Collectors.toList()).size();
@@ -1297,7 +1297,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         //入库项目:1,配套项目：2
         projectInfo.setType(type);
         ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
-        List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
+        List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect).stream().filter(x->!x.getStage().equals("-1")).collect(Collectors.toList());
         if(projectinfoOVList.size()>0){
             total=projectinfoOVList.size();
             cityNum=projectinfoOVList.stream().filter(x->x.getAdminDivision().equals("市本级")).collect(Collectors.toList()).size();
@@ -1333,7 +1333,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         //入库项目:1,配套项目：2
         projectInfo.setType(type);
         ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
-        List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
+        List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect).stream().filter(x->!x.getStage().equals("-1")).collect(Collectors.toList());
         if (projectinfoOVList.size() > 0) {
             List<String> projectIds = projectinfoOVList.stream().map(x -> x.getId()).collect(Collectors.toList());
             Map<String, BigDecimal> totalMap = projectinfoMapper.getTotalByProjectIds(projectIds);