From f81d793cd9aa250b427b2f5e3445fb4edefcdad3 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 16 Mar 2024 16:59:14 +0800
Subject: [PATCH] 添加离职字段

---
 src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml |   94 ++++++++++++++++++++++-------------------------
 1 files changed, 44 insertions(+), 50 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 927abd8..e92911d 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -57,12 +57,8 @@
                 #{placePractitioner.employer}
             </if>
 
-            <if test="placePractitioner.resignation != null  and placePractitioner.resignation == 1">
-                and jpp.resignation_time is  null
-            </if>
-
-            <if test="placePractitioner.resignation != null  and placePractitioner.resignation == 2">
-                and jpp.resignation_time is not null
+            <if test="placePractitioner.resignationFlag != null  and placePractitioner.resignationFlag !='' ">
+                and jpp.resignation_flag = #{placePractitioner.resignationFlag}
             </if>
 
             <if test="placePractitioner.employerImg != null  and placePractitioner.employerImg != ''">and
@@ -93,52 +89,50 @@
 
 
     <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="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"    />
+        <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,
-            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
+        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">
@@ -159,7 +153,7 @@
                 and jc.category_no in (180202,180201)
             </if>
             and jpp.is_deleted = 0
-            and jpp.resignation_time is  null
+            and jpp.resignation_flag = 1
         </where>
     </select>
 

--
Gitblit v1.9.3