From ca5445257b1fdeceddf3fcc2dea18c442023aeb7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期五, 08 十二月 2023 09:30:36 +0800
Subject: [PATCH] 新街口

---
 assess-system/src/main/resources/mapper/system/SysAgencyMapper.xml |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/assess-system/src/main/resources/mapper/system/SysAgencyMapper.xml b/assess-system/src/main/resources/mapper/system/SysAgencyMapper.xml
index 0cc159e..cab000a 100644
--- a/assess-system/src/main/resources/mapper/system/SysAgencyMapper.xml
+++ b/assess-system/src/main/resources/mapper/system/SysAgencyMapper.xml
@@ -1,17 +1,59 @@
 <?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.gkhy.assess.system.mapper.SysAgencyMapper">
+    <resultMap type="com.gkhy.assess.system.domain.SysAgency" id="SysAgencyResult">
+        <id     property="id"        column="id"         />
+        <result property="name"     column="name"      />
+        <result property="creditCode"     column="credit_code"      />
+        <result property="attribute"     column="attribute"      />
+        <result property="province"     column="province"      />
+        <result property="city"     column="city"      />
+        <result property="district"     column="district"      />
+        <result property="address"     column="address"      />
+        <result property="web"     column="web"      />
+        <result property="legalPerson"     column="legal_person"      />
+        <result property="legalPhone"     column="legal_phone"      />
+        <result property="manager"     column="manager"      />
+        <result property="managerPhone"     column="manager_phone"      />
+        <result property="certNumber"     column="cert_number"      />
+        <result property="issueDate"     column="issue_date"      />
+        <result property="validDate"     column="valid_date"      />
+        <result property="assetValue"     column="asset_value"      />
+        <result property="workArea"     column="work_area"      />
+        <result property="archiveArea"     column="archive_area"      />
+        <result property="regAddress"     column="reg_address"      />
+        <result property="business"     column="business"      />
+        <result property="reportPath"     column="report_path"      />
+        <result property="delFlag"     column="del_flag"      />
+        <result property="publication"     column="publication"      />
+        <result property="createTime"     column="create_time"      />
+        <result property="remark"     column="remark"      />
+        <association property="user" javaType="com.gkhy.assess.system.domain.SysUser" resultMap="userResult" />
+        <collection property="businessNames" ofType="java.lang.String" select="getBusinessById" column="{business=business}"/>
+    </resultMap>
+
+    <resultMap id="userResult" type="com.gkhy.assess.system.domain.SysUser">
+        <id     property="id"       column="user_id"        />
+        <result property="username"     column="username"      />
+        <result property="phone"      column="phone"       />
+    </resultMap>
+
+
     <sql id="selectAgencyVo">
-        select a.id,a.name,a.credit_code,a.attribute,a.city,a.district,a.address,a.web,a.legal_person,a.legal_phone,a.manager,a.manager_phone,a.cert_number,a.issue_date,a.valid_date,a.asset_value,a.work_area,a.archive_area,a.reg_address,a.business,a.report_path,a.del_flag,a.create_time,a.remark
+        select a.id,a.name,a.credit_code,a.attribute,a.province,a.city,a.district,a.address,a.web,a.legal_person,
+               a.legal_phone,a.manager,a.manager_phone,a.cert_number,a.issue_date,a.valid_date,a.asset_value,a.work_area,a.archive_area,
+               a.reg_address,a.business,a.report_path,a.del_flag,a.publication,a.create_time,a.remark,
+               b.id as user_id,b.username,b.phone
         from sys_agency a
+        left join sys_user b on b.agency_id=a.id and b.identity=1 and b.del_flag=0
     </sql>
 
     <select id="checkAgencyNameUnique" resultType="com.gkhy.assess.system.domain.SysAgency">
         select id,name from sys_agency where name=#{name} and del_flag=0 limit 1
     </select>
 
-    <select id="agencyList" resultType="com.gkhy.assess.system.domain.SysAgency">
-        select a.id,a.name,a.create_time,a.business,a.city from sys_agency a
+    <select id="agencyList" resultMap="SysAgencyResult">
+        select a.id,a.name,a.credit_code,a.attribute,a.cert_number,a.issue_date,a.valid_date,a.create_time,a.business,a.province,a.city,a.district,a.publication from sys_agency a
         <where>
             and a.del_flag = 0
             <if test="name != null and name != ''">
@@ -21,13 +63,13 @@
                 AND a.city=#{city}
             </if>
             <if test="business != null and business != ''">
-                AND a.business=#{business}
+                AND a.business like concat("%",#{business},"%")
             </if>
         </where>
         order by a.create_time desc
     </select>
 
-    <select id="getAgencyById" resultType="com.gkhy.assess.system.domain.SysAgency">
+    <select id="getAgencyById" resultMap="SysAgencyResult">
         <include refid="selectAgencyVo"/>
         where a.del_flag = 0 and a.id=#{agencyId}
     </select>
@@ -35,4 +77,12 @@
     <delete id="deleteAgencyById" parameterType="java.lang.Long">
         update sys_agency set del_flag=1 where id=#{agencyId}
     </delete>
+
+
+    <select id="getBusinessById" resultType="java.lang.String">
+        select label from sys_dict_data where id in
+        <foreach item="item" index="index" collection="business.split(',')"  open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

--
Gitblit v1.9.2