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 |   63 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 17 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..e92911d 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,26 @@
     <!--自定义分页查询-->
     <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.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,
+        jc.category_name
         FROM
         jczz_place_practitioner jpp
         LEFT JOIN jczz_place jp ON jp.id = jpp.place_id
@@ -37,34 +56,34 @@
             <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.resignationFlag != null  and placePractitioner.resignationFlag !='' ">
+                and jpp.resignation_flag = #{placePractitioner.resignationFlag}
             </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.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>
 
@@ -79,12 +98,17 @@
         <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="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">
@@ -97,14 +121,17 @@
                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>
 
@@ -123,8 +150,10 @@
             </if>
             <if test="type == 2">
                 and jpp.ethnicity != 1
+                and jc.category_no in (180202,180201)
             </if>
             and jpp.is_deleted = 0
+            and jpp.resignation_flag = 1
         </where>
     </select>
 

--
Gitblit v1.9.3