From 715f752d299eab5b32e3c73d8e4029ee66df75c2 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 31 Oct 2024 11:53:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=9A=84=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml
index 063d4eb71..5a2047f8d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml
@@ -13,11 +13,12 @@
     <select id="countEnterpriseCbs" resultType="com.zhgd.xmgl.modules.xz.entity.vo.CountEnterpriseVo">
         select
         ei.enterprise_name,
-        pe.cbs_name,
+        si.cbs_name,
         x.change_after
         from enterprise_info ei
         join xz_task_progress_total x on x.enterprise_id = ei.id
         join project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn = x.project_sn
+        join project_enterprise_supplier_info si on si.enterprise_id=ei.id and si.project_sn = x.project_sn
         where x.project_sn = #{param.projectSn} and x.is_current=1 and x.type=2 and x.change_after != 0
         <if test="param.isCountMainEnterprise == '1'.toString() ">
             and pe.parent_project_enterprise_id = 0