视频会议

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.user_id = #{userId}
+		where u.user_id = #{userId} and  u.del_flag = '0'
 	</select>
 
 	<select id="selectUserByDeptId" parameterType="Long" resultMap="SysUserResult">
@@ -320,7 +320,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
     <select id="selectUserByRole" resultType="com.ruoyi.common.core.domain.entity.SysUser">
-		select u.user_id,u.user_name,u.nick_name,u.specialty  from ms_sys_user u
+		select u.user_id userId,u.user_name userName,u.nick_name nickName,u.specialty  from ms_sys_user u
 		    join ms_sys_user_role ur on ur.user_id =u.user_id
 		    join ms_sys_role r on ur.role_id = r.role_id and r.role_name='调解员'
 		    where r.del_flag = '0' and r.status='0' and u.del_flag = '0' and u.status='0'

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml

@@ -37,4 +37,20 @@
     <result column="adjudica_counter_reason" jdbcType="LONGVARCHAR" property="adjudicaCounterReason" />
     <result column="mediation_agreement" jdbcType="LONGVARCHAR" property="mediationAgreement" />
   </resultMap>
+
+  <select id="listMediator" resultMap="BaseResultMap">
+    select mediator_id ,id  from ms_case_application <where>
+    <if test = 'userIds!=null and userIds.size()>0'>
+      and mediator_id in
+      <foreach item='item' index='index' collection='userIds' open='(' separator=',' close=')'>
+        #{item}
+        </foreach>
+      </if>
+    <if test = 'recordCaeIdList!=null and recordCaeIdList.size()>0'> and id not in
+      <foreach item='id' index='index' collection='recordCaeIdList' open='(' separator=',' close=')'>
+        #{id}
+        </foreach>
+      </if>
+    </where>
+    </select>
 </mapper>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseLogRecordMapper.xml

@@ -12,8 +12,14 @@
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_nick_name" jdbcType="VARCHAR" property="createNickName" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="notes" jdbcType="LONGVARCHAR" property="notes" />
   </resultMap>
+
+  <select id="selectCompleteByCreateBy" resultMap="BaseResultMap">
+    select create_by,GROUP_CONCAT(DISTINCT case_appli_id)  case_appli_id from ms_case_log_record
+    where create_by in  <foreach collection="list" item="item" separator="," open="(" close=")">
+    #{item}
+  </foreach>
+    group by create_by,case_appli_id
+    </select>
 </mapper>