From 1f263fd275eae5e903282ae3da998bb29c004ae3 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 21 Jun 2024 10:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=89=A9=E4=BD=99=E5=A4=A9?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java | 2 ++
 .../zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java   | 1 +
 .../xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java   | 3 +++
 .../xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml     | 6 ++++++
 .../modules/xz/service/impl/XzTaskProgressServiceImpl.java  | 5 +++++
 5 files changed, 17 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java
index 144fa50cc..6240287e4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java
@@ -9,6 +9,8 @@ public class CountTaskProgressVo {
     private Double projectTotalProgress;
     @ApiModelProperty("承包商总进度%")
     private Double enterpriseTotalProgress;
+    @ApiModelProperty("承包商剩余天数")
+    private Integer enterpriseSurplusDayNum;
     @ApiModelProperty("项目总天数")
     private Integer projectTotalDayNum;
     @ApiModelProperty("项目剩余天数")
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java
index 9bc19cbb8..aaeec8fa9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java
@@ -42,4 +42,5 @@ public interface XzTaskProgressMapper extends BaseMapper<XzTaskProgress> {
     CountTaskProgressVo getMaxMinProgress(HashMap<String, Object> paramMap);
 
     List<XzTaskProgress> statsByEnterprise(Map<String, Object> paramMap);
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java
index 9b106316f..1ee04d66d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java
@@ -1,11 +1,13 @@
 package com.zhgd.xmgl.modules.xz.mapper;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zhgd.xmgl.modules.xz.entity.vo.CountEnterpriseVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressTotal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -21,4 +23,5 @@ public interface XzTaskProgressTotalMapper extends BaseMapper<XzTaskProgressTota
     void updateNotCurrent(XzTaskProgressTotal xzTaskProgressTotal);
 
     List<CountEnterpriseVo> countEnterprise(@Param("param") Map<String, Object> param);
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
index 28c899d9c..c4aa5217c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
@@ -180,6 +180,12 @@
             AND (p.enterprise_id = #{supplierEnterpriseId} OR p.enterprise_id IN ( SELECT t.id FROM project_enterprise t
             WHERE find_in_set(#{supplierEnterpriseId}, ancestors) ))
         </if>
+        <if test="enterpriseId != null and enterpriseId != ''">
+            AND (p.enterprise_id = #{enterpriseId} OR p.enterprise_id IN ( SELECT t.enterprise_id FROM
+            project_enterprise t
+            WHERE find_in_set((select id from project_enterprise where project_sn=#{projectSn} and enterprise_id =
+            #{enterpriseId}), ancestors) ))
+        </if>
     </select>
 
     <select id="statsByEnterprise" resultType="com.zhgd.xmgl.modules.xz.entity.XzTaskProgress">
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
index 48450bb70..6445fc1cf 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
@@ -92,6 +92,8 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
     @Autowired
     XzMilestoneMapper xzMilestoneMapper;
     @Autowired
+    XzTaskProgressMapper xzTaskProgressMapper;
+    @Autowired
     private QualityRegionMapper qualityRegionMapper;
     @Autowired
     private XzSupplierQualificationApplyServiceImpl xzSupplierQualificationApplyService;
@@ -570,6 +572,9 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
         } else {
             vo.setEnterpriseTotalProgress(0D);
         }
+        CountTaskProgressVo surplusDayNum = xzTaskProgressMapper.getMaxMinProgress(paramMap);
+        vo.setEnterpriseSurplusDayNum(surplusDayNum.getProjectSurplusDayNum());
+        paramMap.put("enterpriseId", null);
         CountTaskProgressVo vo1 = baseMapper.getMaxMinProgress(paramMap);
         vo.setProjectTotalDayNum(vo1.getProjectTotalDayNum());
         vo.setProjectSurplusDayNum(vo1.getProjectSurplusDayNum());