Merge remote-tracking branch 'origin/develop_master' into develop_3

2021-12-05 09:46:16 +08:00
parent fb04c67b17 505be3cdc9
commit 2d1b55fa76
6 changed files with 61 additions and 7 deletions
@@ -17,7 +17,10 @@
        wg_leader,
        draft_time,
        release_time,
-        unit
+        unit,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName
    </sql>
    <resultMap id="BaseInfoMap" type="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan">
        <id property="id" column="id"></id>
@@ -206,4 +209,12 @@
            #{id}
        </foreach>
    </delete>
+
+    <select id="selectPageByName" resultMap="BaseInfoMap">
+        select <include refid="BaseInfo"></include> from es_revise_plan
+        where es_name = #{esName}
+        <if test="id != null and id != '' ">
+            and id != #{id}
+        </if>
+    </select>
 </mapper>