From 113fe964f492b9653a1fb6772add42b0f76961fc Mon Sep 17 00:00:00 2001
From: Jinyuanyuan <1197651512@qq.com>
Date: Wed, 4 Sep 2024 15:03:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/dao/HuzhouPlaninfoMapper.java        |  2 ++
 .../huzhou/dao/mapping/HuzhouPlaninfoMapper.xml |  3 +++
 .../dao/mapping/HuzhouProjectinfoMapper.xml     |  2 +-
 .../impl/HuzhouProjectinfoServiceImpl.java      | 17 ++++++++---------
 .../modules/huzhou/vo/ProjectDetailOV.java      |  6 +++---
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java
index 3558030..3e03df1 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java
@@ -14,4 +14,6 @@ public interface HuzhouPlaninfoMapper extends BaseMapper<HuzhouPlaninfo> {
 //    List<String> getNumByPlan(@Param("projectIds") List<String> projectIds,@Param("taskName") String taskName);
 
     Integer getStartedProjectNum(@Param("projectIds") List<String> projectIds);
+
+    String getTaskName(@Param("projectId") String projectId,@Param("taskLevel") String taskLevel);
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPlaninfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPlaninfoMapper.xml
index 05989c4..e1398b2 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPlaninfoMapper.xml
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPlaninfoMapper.xml
@@ -11,4 +11,7 @@
             #{projectId}
         </foreach>
     </select>
+    <select id="getTaskName"  resultType="java.lang.String">
+        select task_name from huzhou_planinfo where project_id=#{projectId} and task_level=#{taskLevel}
+    </select>
 </mapper>
\ No newline at end of file
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 2675a0a..3ef0cb7 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
@@ -510,7 +510,7 @@ order by create_date desc
         </foreach>
     </select>
     <select id="getMoneyById" resultType="Map" >
-        select u.total_money as totalMoney,u.central_money as centralMoney,u.urt_estimated_amount as estimateMoney, m.contract_total_money as contractMoney,m.contract_central_money as contractCentralMoney
+        select contract_total_money as contractMoney,contract_central_money as contractCentralMoney
         from huzhou_projectinfo_money where id=#{projectId}
     </select>
     <select id="getProjectSummaryPageList" resultMap="ProjectSummaryPageMap" parameterType="com.easy.admin.modules.huzhou.vo.ProjectSummaryOV">
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 79bdd67..f58d55e 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
@@ -12,10 +12,7 @@ import com.easy.admin.common.core.exception.EasyException;
 import com.easy.admin.common.util.CommonUtils;
 import com.easy.admin.modules.huzhou.common.HuzhouCommonUtils;
 import com.easy.admin.modules.huzhou.common.TemplateExcelUtils;
-import com.easy.admin.modules.huzhou.dao.HuzhouContractinfoMapper;
-import com.easy.admin.modules.huzhou.dao.HuzhouProjectinfoHistoryMapper;
-import com.easy.admin.modules.huzhou.dao.HuzhouProjectinfoMapper;
-import com.easy.admin.modules.huzhou.dao.HuzhouSubProjectinfoMapper;
+import com.easy.admin.modules.huzhou.dao.*;
 import com.easy.admin.modules.huzhou.entity.*;
 import com.easy.admin.modules.huzhou.service.*;
 import com.easy.admin.modules.huzhou.vo.*;
@@ -95,6 +92,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     @Autowired
     HuzhouContractinfoMapper contractinfoMapper;
 
+    @Autowired
+    HuzhouPlaninfoMapper planinfoMapper;
+
     @Override
 
     public void submitProject(MultipartFile[] multipartFile, HuzhouProjectinfo info) throws IOException {
@@ -1421,14 +1421,13 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             LambdaQueryWrapper<HuzhouPlaninfo> query=new LambdaQueryWrapper<>();
             query.eq(HuzhouPlaninfo::getProjectId,p.getId());
             query.eq(HuzhouPlaninfo::getIsfinish,"2");
-            Map<String, HuzhouPlaninfo> planMap = planinfoService.list(query).stream().collect(Collectors.toMap(x -> x.getTaskLevel(), o -> o));
+            List<String[]> levelList = planinfoService.list(query).stream().map(x -> x.getTaskLevel().split("\\.")).collect(Collectors.toList());
             String taskName;
-            if(moneyMap != null && !moneyMap.isEmpty()){
-                List<String[]> splitList = planMap.keySet().stream().map(x -> x.split("\\.")).collect(Collectors.toList());
-                List<String[]> keyList = splitList.stream().filter(x -> x.length == 1).collect(Collectors.toList());
+            if(!levelList.isEmpty()){
+                List<String[]> keyList = levelList.stream().filter(x -> x.length == 2).collect(Collectors.toList());
                 int max = keyList.stream().mapToInt(x -> Integer.parseInt(x[0])).summaryStatistics().getMax();
                 String key=String.valueOf(max);
-                taskName=planMap.get(key).getTaskName();
+                taskName=planinfoMapper.getTaskName(p.getId(),key);
             }else {
                 taskName="项目立项阶段";
             }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectDetailOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectDetailOV.java
index 83cafa8..183faf0 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectDetailOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectDetailOV.java
@@ -22,11 +22,11 @@ public class ProjectDetailOV {
 
     private String superLeader;
 
-    private BigDecimal totalMoney;
+    private Double totalMoney;
 
-    private BigDecimal centralMoney;
+    private Double centralMoney;
 
-    private BigDecimal estimateMoney;
+    private Double estimateMoney;
 
     private BigDecimal  contractMoney;