通过部门获取分管领导

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -77,10 +77,10 @@ public class CmcCarApprovalController extends BaseController
         if (cmcCarApproval != null) {
             formData.put("user", userService.selectUserById(cmcCarApproval.getApplier()).getNickName());
             formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcCarApproval.getApplier()).getDeptId()).getDeptName());
-            formData.put("date", cmcCarApproval.getApplyDate());
-            formData.put("startTime", cmcCarApproval.getBeginDate());
-            formData.put("endTime", cmcCarApproval.getEndDate());
-            formData.put("day", cmcCarApproval.getDays());
+            formData.put("applyDate", cmcCarApproval.getApplyDate());
+            formData.put("beginDate", cmcCarApproval.getBeginDate());
+            formData.put("endDate", cmcCarApproval.getEndDate());
+            formData.put("days", cmcCarApproval.getDays());
             formData.put("passengers", cmcCarApproval.getPassengers());
             formData.put("projectNumber", cmcCarApproval.getProjectId());
             formData.put("applyReason", cmcCarApproval.getApplyReason());
@@ -123,9 +123,9 @@ public class CmcCarApprovalController extends BaseController
         cmcCarApproval.setProjectId(formDataJson.getString("projectNumber"));
         cmcCarApproval.setApplyReason(formDataJson.getString("applyReason"));
         cmcCarApproval.setPassengers(formDataJson.getInteger("passengers"));
-        cmcCarApproval.setBeginDate(formDataJson.getDate("startTime"));
-        cmcCarApproval.setEndDate(formDataJson.getDate("endTime"));
-        cmcCarApproval.setDays(formDataJson.getLong("day"));
+        cmcCarApproval.setBeginDate(formDataJson.getDate("beginDate"));
+        cmcCarApproval.setEndDate(formDataJson.getDate("endDate"));
+        cmcCarApproval.setDays(formDataJson.getLong("days"));
         cmcCarApprovalService.insertCmcCarApproval(cmcCarApproval);
         return AjaxResult.success("提交用车审批表成功");
     }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -77,10 +77,10 @@ public class CmcDeviceApprovalController extends BaseController
         if (cmcDeviceApproval != null) {
             formData.put("user", userService.selectUserById(cmcDeviceApproval.getApplier()).getNickName());
             formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcDeviceApproval.getApplier()).getDeptId()).getDeptName());
-            formData.put("date", cmcDeviceApproval.getApplyDate());
-            formData.put("startTime", cmcDeviceApproval.getBeginDate());
-            formData.put("endTime", cmcDeviceApproval.getEndDate());
-            formData.put("day", cmcDeviceApproval.getDays());
+            formData.put("applyDate", cmcDeviceApproval.getApplyDate());
+            formData.put("beginDate", cmcDeviceApproval.getBeginDate());
+            formData.put("endDate", cmcDeviceApproval.getEndDate());
+            formData.put("days", cmcDeviceApproval.getDays());
             formData.put("projectNumber", cmcDeviceApproval.getProjectId());
             formData.put("applyReason", cmcDeviceApproval.getApplyReason());
             formData.put("deptUser", cmcDeviceApproval.getDeptUserId());

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -77,28 +77,21 @@ public class SysPostController extends BaseController
     }
 
     /**
-     * 获取分管领导
+     * 通过userId获取分管领导
      */
     @GetMapping("/manageLeader")
     public AjaxResult getManageLeader(String userId)
     {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("2", Arrays.asList(103,105,113));
-        jsonObject.put("7", Arrays.asList(104, 112, 116));
-        jsonObject.put("9", Arrays.asList(108, 109));
-        jsonObject.put("10", Arrays.asList(110, 111));
-        jsonObject.put("11", Arrays.asList(160, 107));
-        jsonObject.put("12", Arrays.asList(117));
-        jsonObject.put("13", Arrays.asList(114, 115));
-        Iterator<String> iterator = jsonObject.keySet().iterator();
-        String manageId = "";
-        while(iterator.hasNext()){
-            String key = (String) iterator.next();
-            List<Long> value = jsonObject.getList(key, Long.class);
-            if (value.contains(userService.selectUserById(Long.parseLong(userId)).getDeptId()))
-                manageId = key;
-        }
-        return success(manageId);
+        return success(getManageId(userService.selectUserById(Long.parseLong(userId)).getDeptId()));
+    }
+
+    /**
+     * 通过deptId获取分管领导
+     */
+    @GetMapping("/manageLeaderByDept")
+    public AjaxResult getManageLeaderByDeptId(String deptId)
+    {
+        return success(getManageId(Long.parseLong(deptId)));
     }
 
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
@@ -181,4 +174,27 @@ public class SysPostController extends BaseController
         List<SysPost> posts = postService.selectPostAll();
         return success(posts);
     }
+
+    private SysUser getManageId(Long id) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("2", Arrays.asList(103,105,113));
+        jsonObject.put("7", Arrays.asList(104, 112, 116));
+        jsonObject.put("9", Arrays.asList(108, 109));
+        jsonObject.put("10", Arrays.asList(110, 111));
+        jsonObject.put("11", Arrays.asList(106, 107));
+        jsonObject.put("12", Arrays.asList(117));
+        jsonObject.put("13", Arrays.asList(114, 115));
+        Iterator<String> iterator = jsonObject.keySet().iterator();
+        String manageId = "";
+        while(iterator.hasNext()){
+            String key = (String) iterator.next();
+            List<Long> value = jsonObject.getList(key, Long.class);
+            if (value.contains(id))
+                manageId = key;
+        }
+        SysUser user = new SysUser();
+        if (!manageId.equals(""))
+            user = userService.selectUserById(Long.parseLong(manageId));
+        return user;
+    }
 }