From 3765e4e757dc65e74555f4a785c109f5ab024a1d Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 29 May 2024 21:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/EnterpriseInfoMapper.xml       | 34 ++++---------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml
index b81e8068d..d2a66eb86 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper">
-    <sql id="Base_Column_List">
-        id,
-        enterprise_name,
-        description,
-        enterprise_address,
-        enterprise_legal_person,
-        legal_person_id_card,
-        enterprise_safe_allow,
-        enterprise_property,
-        legal_person_tel,
-        social_code,
-        business_number,
-        qualification_number,
-        enterprise_email,
-        registered_capital,
-        bankname,
-        bankcardnumber,
-        bankcode,
-        enterprise_qualification_url,
-        business_license_end_date,
-        register_person_name,
-        register_person_phone_tel,
-        enterprise_sn,
-        logo,
-        regist_date,
-        business_license_url
-    </sql>
     <resultMap id="BaseResultMap" type="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo" autoMapping="true">
         <result column="id" property="id"/>
         <association property="projectEnterprise" javaType="com.zhgd.xmgl.modules.project.entity.ProjectEnterprise"
@@ -103,9 +76,14 @@
         b.cbs_name as pe_cbs_name,
         b.project_build_area as pe_project_build_area,
         b.completion_date as pe_completion_date,
-        b.cbs_project_type as pe_cbs_project_type
+        b.cbs_project_type as pe_cbs_project_type,
+        t1.name as pe_cbs_project_type_name
         from enterprise_info a
         INNER JOIN project_enterprise b ON a.id = b.enterprise_id
+        left join (
+        <include refid="com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper.dicMap">
+        </include>
+        ) t1 on t1.data = b.cbs_project_type
         LEFT JOIN enterprise_type c ON b.enterprise_type_id = c.id
         WHERE b.project_sn = #{projectSn}
         and a.id = #{enterpriseId}