feat: [试验管理] 选择审核人

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java

@@ -421,9 +421,12 @@ public class SysUserController extends BaseController
 
     /**
      * 获取部门树列表
+     * @param studyId
+     * @param studySubjectId
+     * @return
      */
     @GetMapping("/deptUserList")
-    public AjaxResult deptUserList()
+    public AjaxResult deptUserList(Long studyId,Long studySubjectId)
     {
         List<DeptUserTreeDto> depts = userService.selectDeptAndUser();
         for(DeptUserTreeDto dept : depts){
@@ -438,4 +441,21 @@ public class SysUserController extends BaseController
         }
         return success(depts);
     }
+
+    /**
+     * 获取试验人员
+     * @param studyId
+     * @param studySubjectId
+     * @param permit
+     * @return
+     */
+    @GetMapping("/studyUser")
+    public AjaxResult studyUser(Long studyId,Long studySubjectId,String permit)
+    {
+        if(studyId==null || studyId.longValue()<=0){
+            return AjaxResult.success(new ArrayList<>());
+        }
+        List<DeptUserTreeDto> depts = userService.selectStudyUser(studyId,studySubjectId,permit);
+        return success(depts);
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java

@@ -162,4 +162,13 @@ public interface SysUserMapper
      * @return
      */
     List<DeptUserTreeDto> selectDeptAndUser();
+
+    /**
+     * 获取试验人员列表
+     * @param studyId
+     * @param studySubjectId
+     * @param permit
+     * @return
+     */
+    List<DeptUserTreeDto> selectStudyUser(@Param("studyId") Long studyId, @Param("studySubjectId") Long studySubjectId, @Param("permit") String permit);
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java

@@ -235,6 +235,15 @@ public interface ISysUserService
     List<DeptUserTreeDto> selectDeptAndUser();
 
     /**
+     * 试验人员列表
+     * @param studyId
+     * @param studySubjectId
+     * @param permit
+     * @return
+     */
+    List<DeptUserTreeDto> selectStudyUser(Long studyId,Long studySubjectId,String permit);
+
+    /**
      * 检查密码是否正确
      * @param userId
      * @param password

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java

@@ -581,6 +581,11 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     @Override
+    public List<DeptUserTreeDto> selectStudyUser(Long studyId, Long studySubjectId, String permit) {
+        return userMapper.selectStudyUser(studyId,studySubjectId,permit);
+    }
+
+    @Override
     public Boolean checkPassword(Long userId, String password, Boolean needName) {
         SysUser sysUser = selectUserById(userId);
         if(sysUser==null){

hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -256,5 +256,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		(SELECT u.`user_id` AS id,u.`dept_id` AS parent_id,u.`nick_name` AS `name`,u.`user_name` AS `nameEn`,7 AS `type` FROM `sys_user` u
 		WHERE u.`del_flag`='0' AND u.`user_id`<>1 ORDER BY u.`user_id` DESC)
 	</select>
-	
+
+	<select id="selectStudyUser" resultType="com.hxhq.business.dto.select.DeptUserTreeDto">
+		SELECT u.`user_id` AS id,u.`user_name` AS nameEn,u.`nick_name` AS `name`
+		FROM `sys_user` u
+		WHERE del_flag='0' AND u.`user_id`&lt;>1
+		-- 试验下
+		<if test="studyId != null and studyId != 0">
+			AND
+			(
+			u.`user_id` IN(SELECT leader FROM `t_study` WHERE del_flag='0' AND id=#{studyId})
+			OR
+			u.`user_id` IN(SELECT leader FROM `t_study_subject` WHERE del_flag='0' AND study_id=#{studyId})
+			OR
+			u.`user_id` IN(SELECT user_id FROM `t_study_subject_user` WHERE del_flag='0' AND study_id=#{studyId})
+			)
+		</if>
+
+		-- 学科下
+		<if test="studySubjectId != null and studySubjectId != 0">
+			AND
+			(
+			u.`user_id` IN(SELECT leader FROM `t_study_subject` WHERE del_flag='0' AND id=#{studySubjectId})
+			OR
+			u.`user_id` IN(SELECT user_id FROM `t_study_subject_user` WHERE del_flag='0' AND study_subject_id=#{studySubjectId})
+			)
+		</if>
+
+		-- 权限
+		<if test="permit != null and permit != ''">
+			AND u.`user_id` IN (
+				SELECT user_id
+				FROM `sys_user_role` ur
+				JOIN `sys_role_menu` rm ON ur.`role_id`=rm.`role_id`
+				JOIN `sys_menu` m ON rm.`menu_id`=m.`menu_id`
+				WHERE m.`perms`=#{permit}
+			)
+		</if>
+	</select>
+
 </mapper>