Przeglądaj źródła

审批表存userId

lamphua 1 rok temu
rodzic
commit
c14901d919

+ 4
- 4
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java Wyświetl plik

83
         formData.put("passengers", cmcCarApproval.getPassengers());
83
         formData.put("passengers", cmcCarApproval.getPassengers());
84
         formData.put("projectNumber", cmcCarApproval.getProjectId());
84
         formData.put("projectNumber", cmcCarApproval.getProjectId());
85
         formData.put("applyReason", cmcCarApproval.getApplyReason());
85
         formData.put("applyReason", cmcCarApproval.getApplyReason());
86
-        formData.put("deptUser", userService.selectUserById(cmcCarApproval.getDeptUserId()).getNickName());
86
+        formData.put("deptUser", cmcCarApproval.getDeptUserId());
87
         formData.put("deptComment", cmcCarApproval.getDeptComment());
87
         formData.put("deptComment", cmcCarApproval.getDeptComment());
88
-        formData.put("managerUser", userService.selectUserById(cmcCarApproval.getManagerUserId()).getNickName());
88
+        formData.put("managerUser", cmcCarApproval.getManagerUserId());
89
         formData.put("managerComment", cmcCarApproval.getManagerComment());
89
         formData.put("managerComment", cmcCarApproval.getManagerComment());
90
-        formData.put("unionUser", userService.selectUserById(cmcCarApproval.getUnionUserId()).getNickName());
90
+        formData.put("unionUser", cmcCarApproval.getUnionUserId());
91
         formData.put("unionComment", cmcCarApproval.getUnionComment());
91
         formData.put("unionComment", cmcCarApproval.getUnionComment());
92
-        formData.put("dispatcher", userService.selectUserById(cmcCarApproval.getDispatcher()).getNickName());
92
+        formData.put("dispatcher", cmcCarApproval.getDispatcher());
93
         formData.put("dispatchComment", cmcCarApproval.getDispatchComment());
93
         formData.put("dispatchComment", cmcCarApproval.getDispatchComment());
94
         formData.put("cars", cmcCarApproval.getCars());
94
         formData.put("cars", cmcCarApproval.getCars());
95
         formData.put("drivers", cmcCarApproval.getDrivers());
95
         formData.put("drivers", cmcCarApproval.getDrivers());

+ 3
- 3
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java Wyświetl plik

82
         formData.put("day", cmcDeviceApproval.getDays());
82
         formData.put("day", cmcDeviceApproval.getDays());
83
         formData.put("projectNumber", cmcDeviceApproval.getProjectId());
83
         formData.put("projectNumber", cmcDeviceApproval.getProjectId());
84
         formData.put("applyReason", cmcDeviceApproval.getApplyReason());
84
         formData.put("applyReason", cmcDeviceApproval.getApplyReason());
85
-        formData.put("deptUser", userService.selectUserById(cmcDeviceApproval.getDeptUserId()).getNickName());
85
+        formData.put("deptUser", cmcDeviceApproval.getDeptUserId());
86
         formData.put("deptComment", cmcDeviceApproval.getDeptComment());
86
         formData.put("deptComment", cmcDeviceApproval.getDeptComment());
87
-        formData.put("managerUser", userService.selectUserById(cmcDeviceApproval.getManagerUserId()).getNickName());
87
+        formData.put("managerUser", cmcDeviceApproval.getManagerUserId());
88
         formData.put("managerComment", cmcDeviceApproval.getManagerComment());
88
         formData.put("managerComment", cmcDeviceApproval.getManagerComment());
89
-        formData.put("dispatcher", userService.selectUserById(cmcDeviceApproval.getDispatcher()).getNickName());
89
+        formData.put("dispatcher", cmcDeviceApproval.getDispatcher());
90
         formData.put("dispatchComment", cmcDeviceApproval.getDispatchComment());
90
         formData.put("dispatchComment", cmcDeviceApproval.getDispatchComment());
91
         formData.put("devices", cmcDeviceApproval.getDevices());
91
         formData.put("devices", cmcDeviceApproval.getDevices());
92
         return success(formData);
92
         return success(formData);

+ 4
- 3
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java Wyświetl plik

3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
 
5
 
6
+import com.alibaba.fastjson2.JSONArray;
7
+import com.alibaba.fastjson2.JSONObject;
6
 import com.ruoyi.common.core.domain.entity.SysUser;
8
 import com.ruoyi.common.core.domain.entity.SysUser;
7
-import com.ruoyi.system.service.ISysUserService;
8
 import org.springframework.beans.factory.annotation.Autowired;
9
 import org.springframework.beans.factory.annotation.Autowired;
9
 import org.springframework.security.access.prepost.PreAuthorize;
10
 import org.springframework.security.access.prepost.PreAuthorize;
10
 import org.springframework.validation.annotation.Validated;
11
 import org.springframework.validation.annotation.Validated;
76
     @GetMapping("/manageLeader")
77
     @GetMapping("/manageLeader")
77
     public AjaxResult getManageLeader(String userId)
78
     public AjaxResult getManageLeader(String userId)
78
     {
79
     {
79
-        SysUser manageLeader = postService.selectManageLeaderByUserId(userId);
80
-        return success(manageLeader);
80
+        SysUser sysUser = new SysUser();
81
+        return success(sysUser);
81
     }
82
     }
82
 
83
 
83
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
84
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)

+ 1
- 1
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java Wyświetl plik

66
      * @param
66
      * @param
67
      * @return 查询分管领导
67
      * @return 查询分管领导
68
      */
68
      */
69
-    public SysUser selectManageLeaderByUserId(String userId);
69
+    public List<SysUser> selectManageLeaderList();
70
 }
70
 }

+ 1
- 2
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java Wyświetl plik

122
      * @param
122
      * @param
123
      * @return 查询分管领导
123
      * @return 查询分管领导
124
      */
124
      */
125
-    public SysUser selectManageLeaderByUserId(String userId);
126
-
125
+    public List<SysUser> selectManageLeaderList();
127
 }
126
 }

+ 1
- 1
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java Wyświetl plik

207
      * @return 查询分管领导
207
      * @return 查询分管领导
208
      */
208
      */
209
     @Override
209
     @Override
210
-    public SysUser selectManageLeaderByUserId(String userId) { return userPostMapper.selectManageLeaderByUserId(userId); }
210
+    public List<SysUser> selectManageLeaderList() { return userPostMapper.selectManageLeaderList(); }
211
 }
211
 }

+ 4
- 8
oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml Wyświetl plik

16
 
16
 
17
 	<select id="selectDriverList" resultMap="SysUserResult">
17
 	<select id="selectDriverList" resultMap="SysUserResult">
18
 		select u.user_id, u.nick_name
18
 		select u.user_id, u.nick_name
19
-		from sys_user u
20
-				 left join sys_user_post up on u.user_id = up.user_id
19
+		from sys_user u left join sys_user_post up on u.user_id = up.user_id
21
 		where up.post_id = 27
20
 		where up.post_id = 27
22
 	</select>
21
 	</select>
23
 
22
 
30
 		where up.post_id = 12
29
 		where up.post_id = 12
31
 	</select>
30
 	</select>
32
 
31
 
33
-	<select id="selectManageLeaderByUserId" parameterType="String" resultMap="SysUserResult">
34
-		select r.user_id, r.nick_name, up.post_id from
35
-		(select u1.user_id, u1.nick_name, u.dept_id from
36
-		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
37
-		left join sys_user_post as up
38
-		on r.user_id = up.user_id
32
+	<select id="selectManageLeaderList" resultMap="SysUserResult">
33
+		select u.user_id, u.nick_name
34
+		from sys_user u left join sys_user_post up on u.user_id = up.user_id
39
 		where up.post_id = 6
35
 		where up.post_id = 6
40
 	</select>
36
 	</select>
41
 
37
 

Ładowanie…
Anuluj
Zapisz