From d65293482a2f06c23b8d1d5cd1d440d1302d915d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 16 Mar 2024 18:03:20 +0800
Subject: [PATCH] 从业人员查询统计修改，去除多余字段
---
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 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 e92911d..1368830 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -10,20 +10,19 @@
jpp.name,
jpp.telephone,
jpp.temp_address,
- TRUNCATE( DATEDIFF( CURDATE(), jpp.birthday )/ 365.2422,0 ) age,
+ TIMESTAMPDIFF(YEAR, DATE_FORMAT(jpp.id_card, '%Y%m%d%'), CURDATE()) as age,
jpp.gender,
jpp.id_card,
- jpp.card_type,
jp.place_name employer,
jpp.employer_img,
jpp.create_time,
- jpp.birthday,
jpp.ethnicity,
jpp.is_deleted,
jpp.criminal_record_flag,
jpp.fake_id_card,
jpp.employment_time,
jpp.resignation_time,
+ jpp.resignation_flag,
jc.category_name
FROM
jczz_place_practitioner jpp
@@ -50,13 +49,6 @@
<if test="placePractitioner.idCard != null and placePractitioner.idCard != ''">and jpp.id_card =
#{placePractitioner.idCard}
</if>
- <if test="placePractitioner.cardType != null and placePractitioner.cardType != ''">and jpp.card_type =
- #{placePractitioner.cardType}
- </if>
- <if test="placePractitioner.employer != null and placePractitioner.employer != ''">and jpp.employer =
- #{placePractitioner.employer}
- </if>
-
<if test="placePractitioner.resignationFlag != null and placePractitioner.resignationFlag !='' ">
and jpp.resignation_flag = #{placePractitioner.resignationFlag}
</if>
@@ -67,11 +59,10 @@
</if>
<if test="placePractitioner.createTime != null ">and jpp.create_time = #{placePractitioner.createTime}</if>
- <if test="placePractitioner.birthday != null ">and jpp.birthday = #{placePractitioner.birthday}</if>
<if test="placePractitioner.ethnicity != null ">and jpp.ethnicity = #{placePractitioner.ethnicity}</if>
<if test="placePractitioner.type == 1">
- and (CURDATE() < DATE_ADD( jpp.birthday, INTERVAL 18 YEAR )
+ and TIMESTAMPDIFF(YEAR, DATE_FORMAT(jpp.id_card, '%Y%m%d%'), CURDATE()) < 18
and jc.category_no in (180202,180201)
</if>
<if test="placePractitioner.type == 2">
@@ -79,7 +70,7 @@
and jc.category_no in (180202,180201)
</if>
<if test="placePractitioner.type == 3">
- and (CURDATE() < DATE_ADD( jpp.birthday, INTERVAL 18 YEAR ) or ( jpp.ethnicity != 1))
+ and (TIMESTAMPDIFF(YEAR, DATE_FORMAT(jpp.id_card, '%Y%m%d%'), CURDATE()) < 18 or jpp.ethnicity != 1)
and jc.category_no in (180202,180201)
</if>
and jpp.is_deleted = 0
@@ -97,11 +88,9 @@
<result property="age" column="age"/>
<result property="gender" column="gender"/>
<result property="idCard" column="id_card"/>
- <result property="cardType" column="card_type"/>
<result property="jobNature" column="job_nature"/>
<result property="employerImg" column="employer_img"/>
<result property="createTime" column="create_time"/>
- <result property="birthday" column="birthday"/>
<result property="ethnicity" column="ethnicity"/>
<result property="isDeleted" column="is_deleted"/>
<result property="criminalRecordFlag" column="criminal_record_flag"/>
@@ -120,11 +109,9 @@
age,
gender,
id_card,
- card_type,
job_nature,
employer_img,
create_time,
- birthday,
ethnicity,
is_deleted,
criminal_record_flag,
@@ -144,16 +131,36 @@
LEFT JOIN jczz_place_poi_label jppl on jppl.place_id = jp.id and type = 3
LEFT JOIN jczz_category jc on jc.category_no = jppl.poi_code
<where>
- <if test="type == 1">
- and (CURDATE() < DATE_ADD( jpp.birthday, INTERVAL 18 YEAR ) or ( jpp.ethnicity != 1))
+ <if test="placePractitioner.type == 1">
+ and (TIMESTAMPDIFF(YEAR, DATE_FORMAT(jpp.id_card, '%Y%m%d%'), CURDATE()) < 18 or jpp.ethnicity != 1)
and jc.category_no in (180202,180201)
</if>
- <if test="type == 2">
+ <if test="placePractitioner.type == 2">
and jpp.ethnicity != 1
and jc.category_no in (180202,180201)
</if>
+ <if test="placePractitioner.id != null ">and jpp.id = #{placePractitioner.id}</if>
+ <if test="placePractitioner.placeId != null ">and jpp.place_id = #{placePractitioner.placeId}</if>
+ <if test="placePractitioner.name != null and placePractitioner.name != ''">and jpp.name like concat('%',
+ #{placePractitioner.name},'%')
+ </if>
+ <if test="placePractitioner.telephone != null and placePractitioner.telephone != ''">and jpp.telephone like
+ concat('%', #{placePractitioner.telephone},'%')
+
+ </if>
+ <if test="placePractitioner.tempAddress != null and placePractitioner.tempAddress != ''">and
+ jpp.temp_address =
+ #{placePractitioner.tempAddress}
+ </if>
+ <if test="placePractitioner.age != null ">and jpp.age = #{placePractitioner.age}</if>
+ <if test="placePractitioner.gender != null ">and jpp.gender = #{placePractitioner.gender}</if>
+ <if test="placePractitioner.idCard != null and placePractitioner.idCard != ''">and jpp.id_card =
+ #{placePractitioner.idCard}
+ </if>
+ <if test="placePractitioner.resignationFlag != null and placePractitioner.resignationFlag !='' ">
+ and jpp.resignation_flag = #{placePractitioner.resignationFlag}
+ </if>
and jpp.is_deleted = 0
- and jpp.resignation_flag = 1
</where>
</select>
--
Gitblit v1.9.3