From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml |   96 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
index 0877d71..46eced3 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyMapper.xml
@@ -3,21 +3,33 @@
 <mapper namespace="org.springblade.modules.property.mapper.PropertyCompanyMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="propertyCompanyResultMap" type="org.springblade.modules.property.vo.PropertyCapitalApplyVO">
+    <resultMap id="propertyCompanyResultMap" type="org.springblade.modules.property.vo.PropertyCompanyVO">
         <result property="id"    column="id"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="name"    column="name"    />
         <result property="address"    column="address"    />
         <result property="socialCreditCode"    column="social_credit_code"    />
-        <result property="provinceCode"    column="province_code"    />
-        <result property="cityCode"    column="city_code"    />
-        <result property="countyCode"    column="county_code"    />
+        <result property="province"    column="province"    />
+        <result property="city"    column="city"    />
+        <result property="area"    column="area"    />
         <result property="remark"    column="remark"    />
         <result property="createUser"    column="create_user"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateUser"    column="update_user"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isDeleted"    column="is_deleted"    />
+        <result property="baseInfoScore"    column="base_info_score"    />
+        <result property="operateinfoScore"    column="operateInfo_score"    />
+        <result property="taxInfoScore"    column="tax_info_score"    />
+        <result property="partyBuildingInfoScore"    column="party_building_info_score"    />
+        <result property="goodCorporateScore"    column="good_corporate_score"    />
+        <result property="goodProjectScore"    column="good_project_score"    />
+        <result property="lllegalAndIrregularScore"    column="lllegal_and_irregular_score"    />
+        <result property="evaluateScore"    column="evaluate_score"    />
+        <result property="streetScore"    column="street_score"    />
+        <result property="allScore"    column="all_score"    />
     </resultMap>
+
 
 
     <sql id="selectPropertyCompany">
@@ -41,10 +53,47 @@
 
 
     <!--自定义分页查询-->
-    <select id="selectPropertyCompanyPage" resultType="org.springblade.modules.property.vo.PropertyCompanyVO">
-        select * from jczz_property_company where is_deleted = 0
+    <select id="selectPropertyCompanyPage" resultMap="propertyCompanyResultMap">
+        SELECT
+        jpc.id,
+        jpc.dept_id,
+        jpc.NAME,
+        jpc.address,
+        jpc.social_credit_code,
+        jpc.province,
+        jpc.city,
+        jpc.area,
+        jpc.remark,
+        jpc.create_user,
+        jpc.create_time,
+        jpc.update_user,
+        jpc.update_time,
+        jpc.is_deleted,
+        jpc.base_info_score,
+        jpc.operateInfo_score,
+        jpc.tax_info_score,
+        jpc.party_building_info_score,
+        jpc.good_corporate_score,
+        jpc.good_project_score,
+        jpc.lllegal_and_irregular_score,
+        jpc.evaluate_score,
+        jpc.street_score,
+        jpc.all_score,
+        (
+        SELECT
+        GROUP_CONCAT( jd.`name` )
+        FROM
+        jczz_property_company_district jpcd
+        LEFT JOIN jczz_district jd ON jpcd.district_id = jd.id
+        WHERE
+        jpcd.property_company_id = jpc.id
+        ) districtNames
+        FROM
+        jczz_property_company jpc
+        WHERE
+        jpc.is_deleted = 0
         <if test="propertyCompany.name!=null and propertyCompany.name!=''">
-            and name like concat('%',#{propertyCompany.name},'%')
+            and jpc.name like concat('%',#{propertyCompany.name},'%')
         </if>
     </select>
 
@@ -138,33 +187,26 @@
 
     <!--自定义详情查询-->
     <select id="getDetail" resultMap="propertyCompanyDetailMap">
-        SELECT
-            jpc.*,
-            jpcd.principal,
-            jpcd.principal_phone AS principalPhone,
-            jpdu.id AS cid,
-            bu.real_name,
-            bu.phone AS companyPersonPhone
-        FROM
-            jczz_property_company jpc
-            LEFT JOIN jczz_property_company_district jpcd ON jpcd.property_company_id = jpc.id and jpcd.is_deleted = 0
-            LEFT JOIN jczz_property_district_user jpdu ON jpcd.id = jpdu.property_company_district_id
-            LEFT JOIN blade_user bu ON locate(jpdu.user_id,bu.id)>0 and bu.is_deleted = 0
+        SELECT DISTINCT jpc.*,
+                        jpcd.principal,
+                        jpcd.principal_phone AS principalPhone,
+                        bu.real_name,
+                        bu.phone             AS companyPersonPhone
+        FROM jczz_property_company jpc
+                 LEFT JOIN jczz_property_company_district jpcd
+                           ON jpcd.property_company_id = jpc.id and jpcd.is_deleted = 0
+                 LEFT JOIN jczz_property_district_user jpdu ON jpcd.id = jpdu.property_company_district_id
+                 LEFT JOIN blade_user bu ON locate(jpdu.user_id, bu.id) > 0 and bu.is_deleted = 0
         WHERE jpc.is_deleted = 0
-        and bu.real_name is not null
-        and jpc.id = #{propertyCompany.id}
+          and bu.real_name is not null
+          and jpc.id = #{propertyCompany.id}
     </select>
 
     <select id="getDetailVO" resultType="org.springblade.modules.property.vo.PropertyCompanyDetailVO">
         SELECT
-            jpc.*,
-            jpcd.principal,
-            jpcd.principal_phone AS principalPhone,
-            jpdu.id AS cid
+            jpc.*
         FROM
             jczz_property_company jpc
-                LEFT JOIN jczz_property_company_district jpcd ON jpcd.property_company_id = jpc.id and jpcd.is_deleted = 0
-                LEFT JOIN jczz_property_district_user jpdu ON jpcd.id = jpdu.property_company_district_id
         WHERE jpc.is_deleted = 0
           and jpc.id = #{propertyCompany.id}
     </select>

--
Gitblit v1.9.3