From aca33b1ff34ea0f2db3290d4c0b5d898f66de108 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 16 Mar 2024 11:09:59 +0800
Subject: [PATCH] 1.房屋查询返回房屋标签颜色 2.新增预警接口处置和宣传

---
 src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
index db045ec..f243d1c 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -5,7 +5,27 @@
     <!--自定义分页查询-->
     <select id="selectPlacePractitionerPage" resultType="org.springblade.modules.place.vo.PlacePractitionerVO">
         SELECT
-        *
+        jpp.id,
+        jpp.place_id,
+        jpp.name,
+        jpp.telephone,
+        jpp.temp_address,
+        TRUNCATE( DATEDIFF( CURDATE(), jpp.birthday )/ 365.2422,0 ) age,
+        jpp.gender,
+        jpp.id_card,
+        jpp.card_type,
+        jp.place_name employer,
+        jpp.registered_address,
+        jpp.job_nature,
+        jpp.employer_img,
+        jpp.wx_account,
+        jpp.create_time,
+        jpp.birthday,
+        jpp.ethnicity,
+        jpp.is_deleted,
+        jpp.criminal_record_flag,
+        jpp.fake_id_card,
+        jc.category_name
         FROM
         jczz_place_practitioner jpp
         LEFT JOIN jczz_place jp ON jp.id = jpp.place_id
@@ -55,16 +75,19 @@
             <if test="placePractitioner.ethnicity != null ">and jpp.ethnicity = #{placePractitioner.ethnicity}</if>
 
             <if test="placePractitioner.type == 1">
-                and (YEAR(CURDATE()) - YEAR(jpp.birthday)) &lt; 18
+                and (CURDATE() &lt; DATE_ADD( jpp.birthday, INTERVAL 18 YEAR )
+                and jc.category_no in (180202,180201)
             </if>
             <if test="placePractitioner.type == 2">
                 and jpp.ethnicity != 1
+                and jc.category_no in (180202,180201)
             </if>
             <if test="placePractitioner.type == 3">
                 and (CURDATE() &lt; DATE_ADD( jpp.birthday, INTERVAL 18 YEAR ) or ( jpp.ethnicity != 1))
                 and jc.category_no in (180202,180201)
             </if>
             and jpp.is_deleted = 0
+            order by jpp.id desc
         </where>
     </select>
 
@@ -123,6 +146,7 @@
             </if>
             <if test="type == 2">
                 and jpp.ethnicity != 1
+                and jc.category_no in (180202,180201)
             </if>
             and jpp.is_deleted = 0
         </where>

--
Gitblit v1.9.3