From 01cf8140ee6ea6a98ff12d5ef973b050fbf75bf1 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 16 Mar 2024 15:23:02 +0800
Subject: [PATCH] 场所添加字段+从业人员添加字段
---
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml | 97 +++++++++++++++++++++++++++---------------------
1 files changed, 54 insertions(+), 43 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 f243d1c..927abd8 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -15,16 +15,15 @@
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,
+ jpp.employment_time,
+ jpp.resignation_time,
jc.category_name
FROM
jczz_place_practitioner jpp
@@ -57,19 +56,20 @@
<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 test="placePractitioner.resignation != null and placePractitioner.resignation == 1">
+ and jpp.resignation_time is null
</if>
- <if test="placePractitioner.jobNature != null and placePractitioner.jobNature != ''">and jpp.job_nature =
- #{placePractitioner.jobNature}
+
+ <if test="placePractitioner.resignation != null and placePractitioner.resignation == 2">
+ and jpp.resignation_time is not null
</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>
@@ -93,42 +93,52 @@
<resultMap type="org.springblade.modules.place.dto.PlacePractitionerDTO" id="JczzPlacePractitionerDTOResult">
- <result property="id" column="id"/>
- <result property="placeId" column="place_id"/>
- <result property="name" column="name"/>
- <result property="telephone" column="telephone"/>
- <result property="tempAddress" column="temp_address"/>
- <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="id" column="id" />
+ <result property="placeId" column="place_id" />
+ <result property="name" column="name" />
+ <result property="telephone" column="telephone" />
+ <result property="tempAddress" column="temp_address" />
+ <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" />
+ <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">
- select id,
- place_id,
- name,
- telephone,
- temp_address,
- age,
- gender,
- id_card,
- card_type,
- employer,
- registered_address,
- job_nature,
- employer_img,
- wx_account,
- create_time,
- birthday,
- ethnicity
- from jczz_place_practitioner
+ select
+ id,
+ place_id,
+ name,
+ telephone,
+ temp_address,
+ age,
+ gender,
+ id_card,
+ card_type,
+ job_nature,
+ employer_img,
+ create_time,
+ birthday,
+ ethnicity,
+ is_deleted,
+ criminal_record_flag,
+ fake_id_card,
+ ano_type_name,
+ employment_time,
+ resignation_time
+ from
+ jczz_place_practitioner
</sql>
<select id="selectPlaceCountByType" parameterType="long" resultType="integer">
@@ -149,6 +159,7 @@
and jc.category_no in (180202,180201)
</if>
and jpp.is_deleted = 0
+ and jpp.resignation_time is null
</where>
</select>
--
Gitblit v1.9.3