From 05600d089901d44e8d5036046025b6a90ceb896a Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期二, 03 十二月 2024 16:57:20 +0800
Subject: [PATCH] 修改及增加功能

---
 expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml b/expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml
index e244223..3ed17c5 100644
--- a/expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml
@@ -8,7 +8,7 @@
                graduation_school,degree,speciality,current_profession,support_direction_safety,
                support_direction_prevention,support_direction_emergency,resume_key,paper_situation_key,
                reward_key,achievement_key,personal_opinion_key,recommend_unit_opinion_key,remark,create_by,
-               create_time,big_classify,small_classify,del_flag,source,rating_level,employment_date_start,employment_date_end,expert_certificate,dept_id,domain
+               create_time,big_classify,small_classify,del_flag,source,rating_level,employment_date_start,employment_date_end,expert_certificate,dept_id,domain,evidence
         from sys_expert_info
     </sql>
 
@@ -20,16 +20,25 @@
     </update>
 
     <select id="expertInfoList" resultType="com.gkhy.system.domain.SysExpertInfo">
-        select id,name,sex,birthday,phone,title,degree,state,speciality,big_classify,small_classify,id_card,company_name,
+        select id,name,sex,birthday,phone,title,degree,state,speciality,big_classify,small_classify,id_card,company_name,evidence,
             domain,level,current_profession,duty_status,support_direction_safety,support_direction_prevention,support_direction_emergency,create_time,
-            rating_level,employment_date_start,employment_date_end,expert_certificate from sys_expert_info
+            rating_level,employment_date_start,employment_date_end,expert_certificate,update_time from sys_expert_info
         <where>
             and del_flag = 0
             <if test="name != null and name != ''">
                 and name like concat('%', #{name}, '%')
             </if>
+            <if test="phone != null and phone != ''">
+                and phone like concat('%', #{phone}, '%')
+            </if>
             <if test="idCard != null and idCard != ''">
                 and id_card like concat('%', #{idCard}, '%')
+            </if>
+            <if test="domain != null and domain != ''">
+                and domain  = #{domain}
+            </if>
+            <if test="level != null and level != ''">
+                and level  = #{level}
             </if>
             <if test="bigClassify != null">
                 and big_classify = #{bigClassify}
@@ -70,7 +79,7 @@
 
 
     <select id="queryApprove" parameterType="com.gkhy.system.domain.vo.request.SysExpertSearchReqDto" resultType="com.gkhy.system.domain.vo.response.SysExpertSearchRep">
-        select expert_certificate,state from sys_expert_info where id_card=#{idCard} and dept_id = #{deptId} and phone = #{phone} and del_flag=0 limit 1
+        select name,employment_date_start,employment_date_end,update_time,state from sys_expert_info where id_card=#{idCard} and dept_id = #{deptId} and phone = #{phone} and del_flag=0 limit 1
     </select>
 
     <select id="getExpertRound" parameterType="com.gkhy.system.domain.vo.request.SysExpertInfoRoundReq"
@@ -78,6 +87,7 @@
         select id,name,sex,id_card idCard,
             domain,rating_level ratingLevel from sys_expert_info
         where del_flag = 0
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="domain != null and domain.size() > 0">
                 and domain in
                 <foreach collection="domain" item="item" open="(" separator="," close=")">

--
Gitblit v1.9.2