From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/ExamineStaffProjectV1ServiceDaoImplMapper.xml |  146 ++++++++++++++++++++++++++----------------------
 1 files changed, 78 insertions(+), 68 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/ExamineStaffProjectV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/ExamineStaffProjectV1ServiceDaoImplMapper.xml
index b135572..2685f0a 100644
--- a/java110-db/src/main/resources/mapper/user/ExamineStaffProjectV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/ExamineStaffProjectV1ServiceDaoImplMapper.xml
@@ -5,93 +5,103 @@
 <mapper namespace="examineStaffProjectV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨鍛樺伐鑰冩牳椤圭洰淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveExamineStaffProjectInfo" parameterType="Map">
         insert into examine_staff_project(
-es_id,esp_id,community_id,project_id
-) values (
-#{esId},#{espId},#{communityId},#{projectId}
-)
+        es_id,esp_id,community_id,project_id
+        ) values (
+        #{esId},#{espId},#{communityId},#{projectId}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨ鍛樺伐鑰冩牳椤圭洰淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getExamineStaffProjectInfo" parameterType="Map" resultType="Map">
-        select  t.es_id,t.es_id esId,t.esp_id,t.esp_id espId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.project_id,t.project_id projectId 
-from examine_staff_project t 
-where 1 =1 
-<if test="esId !=null and esId != ''">
-   and t.es_id= #{esId}
-</if> 
-<if test="espId !=null and espId != ''">
-   and t.esp_id= #{espId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="projectId !=null and projectId != ''">
-   and t.project_id= #{projectId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.es_id,t.es_id esId,t.esp_id,t.esp_id espId,t.status_cd,t.status_cd
+        statusCd,t.community_id,t.community_id communityId,t.project_id,t.project_id projectId,
+        ep.`name` projectName,ep.weight
+        from examine_staff_project t
+        left join examine_project ep on t.project_id = ep.project_id and ep.status_cd = '0'
+        where 1 =1
+        <if test="esId !=null and esId != ''">
+            and t.es_id= #{esId}
+        </if>
+        <if test="esIds !=null ">
+            and t.es_id in
+            <foreach collection="esIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="espId !=null and espId != ''">
+            and t.esp_id= #{espId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="projectId !=null and projectId != ''">
+            and t.project_id= #{projectId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼鍛樺伐鑰冩牳椤圭洰淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateExamineStaffProjectInfo" parameterType="Map">
-        update  examine_staff_project t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="esId !=null and esId != ''">
-, t.es_id= #{esId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="projectId !=null and projectId != ''">
-, t.project_id= #{projectId}
-</if> 
- where 1=1 <if test="espId !=null and espId != ''">
-and t.esp_id= #{espId}
-</if> 
+        update examine_staff_project t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="projectId !=null and projectId != ''">
+            , t.project_id= #{projectId}
+        </if>
+        where 1=1
+        <if test="espId !=null and espId != ''">
+            and t.esp_id= #{espId}
+        </if>
+        <if test="esId !=null and esId != ''">
+            and t.es_id= #{esId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鍛樺伐鑰冩牳椤圭洰鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryExamineStaffProjectsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from examine_staff_project t 
-where 1 =1 
-<if test="esId !=null and esId != ''">
-   and t.es_id= #{esId}
-</if> 
-<if test="espId !=null and espId != ''">
-   and t.esp_id= #{espId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="projectId !=null and projectId != ''">
-   and t.project_id= #{projectId}
-</if> 
+    <select id="queryExamineStaffProjectsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from examine_staff_project t
+        where 1 =1
+        <if test="esId !=null and esId != ''">
+            and t.es_id= #{esId}
+        </if>
+        <if test="esIds !=null ">
+            and t.es_id in
+            <foreach collection="esIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="espId !=null and espId != ''">
+            and t.esp_id= #{espId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="projectId !=null and projectId != ''">
+            and t.project_id= #{projectId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0