From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml | 107 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 31 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..847de74 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,29 @@
<!--自定义分页查询-->
<select id="selectPlacePractitionerPage" resultType="org.springblade.modules.place.vo.PlacePractitionerVO">
SELECT
- *
+ jpp.id,
+ jpp.place_id,
+ jpp.name,
+ jpp.telephone,
+ jpp.temp_address,
+ TIMESTAMPDIFF(year, substring(jpp.id_card, 7, 8), now()) as age,
+ jpp.gender,
+ jpp.id_card,
+ jp.place_name employer,
+ jpp.employer_img,
+ jpp.create_time,
+ jpp.ethnicity,
+ jpp.is_deleted,
+ jpp.criminal_record_flag,
+ jpp.fake_id_card,
+ jpp.employment_time,
+ jpp.resignation_time,
+ jpp.resignation_flag,
+ jpp.confirm_user_id,
+ jpp.confirm_flag,
+ jpp.confirm_time,
+ jpp.confirm_notion,
+ jc.category_name
FROM
jczz_place_practitioner jpp
LEFT JOIN jczz_place jp ON jp.id = jpp.place_id
@@ -31,40 +53,37 @@
<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 test="placePractitioner.resignationFlag != null and placePractitioner.resignationFlag !='' ">
+ and jpp.resignation_flag = #{placePractitioner.resignationFlag}
</if>
- <if test="placePractitioner.employer != null and placePractitioner.employer != ''">and jpp.employer =
- #{placePractitioner.employer}
- </if>
- <if test="placePractitioner.registeredAddress != null and placePractitioner.registeredAddress != ''">and
- jpp.registered_address = #{placePractitioner.registeredAddress}
- </if>
- <if test="placePractitioner.jobNature != null and placePractitioner.jobNature != ''">and jpp.job_nature =
- #{placePractitioner.jobNature}
- </if>
+
<if test="placePractitioner.employerImg != null and placePractitioner.employerImg != ''">and
jpp.employer_img =
#{placePractitioner.employerImg}
</if>
- <if test="placePractitioner.wxAccount != null and placePractitioner.wxAccount != ''">and jpp.wx_account =
- #{placePractitioner.wxAccount}
- </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.confirmUserId != null "> and confirm_user_id = #{placePractitioner.confirmUserId}</if>
+ <if test="placePractitioner.confirmFlag != null "> and confirm_flag = #{placePractitioner.confirmFlag}</if>
+ <if test="placePractitioner.confirmTime != null "> and confirm_time = #{placePractitioner.confirmTime}</if>
+ <if test="placePractitioner.confirmNotion != null and placePractitioner.confirmNotion != ''"> and confirm_notion = #{placePractitioner.confirmNotion}</if>
+
<if test="placePractitioner.type == 1">
- and (YEAR(CURDATE()) - YEAR(jpp.birthday)) < 18
+ and TIMESTAMPDIFF(year, substring(jpp.id_card, 7, 8), now()) < 18
+ 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() < DATE_ADD( jpp.birthday, INTERVAL 18 YEAR ) or ( jpp.ethnicity != 1))
+ and (TIMESTAMPDIFF(year, substring(jpp.id_card, 7, 8), now()) < 18 or jpp.ethnicity != 1)
and jc.category_no in (180202,180201)
</if>
and jpp.is_deleted = 0
+ order by jpp.id desc
</where>
</select>
@@ -78,13 +97,16 @@
<result property="age" column="age"/>
<result property="gender" column="gender"/>
<result property="idCard" column="id_card"/>
- <result property="cardType" column="card_type"/>
- <result property="employer" column="employer"/>
- <result property="registeredAddress" column="registered_address"/>
<result property="jobNature" column="job_nature"/>
<result property="employerImg" column="employer_img"/>
- <result property="wxAccount" column="wx_account"/>
<result property="createTime" column="create_time"/>
+ <result property="ethnicity" column="ethnicity"/>
+ <result property="isDeleted" column="is_deleted"/>
+ <result property="criminalRecordFlag" column="criminal_record_flag"/>
+ <result property="fakeIdCard" column="fake_id_card"/>
+ <result property="anoTypeName" column="ano_type_name"/>
+ <result property="employmentTime" column="employment_time"/>
+ <result property="resignationTime" column="resignation_time"/>
</resultMap>
<sql id="selectJczzPlacePractitioner">
@@ -96,15 +118,16 @@
age,
gender,
id_card,
- card_type,
- employer,
- registered_address,
job_nature,
employer_img,
- wx_account,
create_time,
- birthday,
- ethnicity
+ ethnicity,
+ is_deleted,
+ criminal_record_flag,
+ fake_id_card,
+ ano_type_name,
+ employment_time,
+ resignation_time
from jczz_place_practitioner
</sql>
@@ -117,12 +140,34 @@
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, substring(jpp.id_card, 7, 8), now()) < 18
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
</where>
--
Gitblit v1.9.3