审批表存projectid

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

@@ -81,7 +81,7 @@ public class CmcCarApprovalController extends BaseController
         formData.put("endTime", cmcCarApproval.getEndDate());
         formData.put("day", cmcCarApproval.getDays());
         formData.put("passengers", cmcCarApproval.getPassengers());
-        formData.put("projectNumber", cmcCarApproval.getProjectNumber());
+        formData.put("projectNumber", cmcCarApproval.getProjectId());
         formData.put("applyReason", cmcCarApproval.getApplyReason());
         formData.put("deptUser", userService.selectUserById(cmcCarApproval.getDeptUserId()).getNickName());
         formData.put("deptComment", cmcCarApproval.getDeptComment());
@@ -118,7 +118,7 @@ public class CmcCarApprovalController extends BaseController
         cmcCarApproval.setCarApplyId(formDataJson.getString("formId"));
         cmcCarApproval.setApplier(getLoginUser().getUserId());
         cmcCarApproval.setApplyDate(DateUtils.getNowDate());
-        cmcCarApproval.setProjectNumber(formDataJson.getString("projectNumber"));
+        cmcCarApproval.setProjectId(formDataJson.getString("projectNumber"));
         cmcCarApproval.setApplyReason(formDataJson.getString("applyReason"));
         cmcCarApproval.setPassengers(formDataJson.getInteger("passengers"));
         cmcCarApproval.setBeginDate(formDataJson.getDate("startTime"));

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

@@ -80,7 +80,7 @@ public class CmcDeviceApprovalController extends BaseController
         formData.put("startTime", cmcDeviceApproval.getBeginDate());
         formData.put("endTime", cmcDeviceApproval.getEndDate());
         formData.put("day", cmcDeviceApproval.getDays());
-        formData.put("projectNumber", cmcDeviceApproval.getProjectNumber());
+        formData.put("projectNumber", cmcDeviceApproval.getProjectId());
         formData.put("applyReason", cmcDeviceApproval.getApplyReason());
         formData.put("deptUser", userService.selectUserById(cmcDeviceApproval.getDeptUserId()).getNickName());
         formData.put("deptComment", cmcDeviceApproval.getDeptComment());
@@ -89,7 +89,7 @@ public class CmcDeviceApprovalController extends BaseController
         formData.put("dispatcher", userService.selectUserById(cmcDeviceApproval.getDispatcher()).getNickName());
         formData.put("dispatchComment", cmcDeviceApproval.getDispatchComment());
         formData.put("devices", cmcDeviceApproval.getDevices());
-        return success(cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(deviceApplyId));
+        return success(formData);
     }
 
     /**
@@ -114,7 +114,7 @@ public class CmcDeviceApprovalController extends BaseController
         cmcDeviceApproval.setDeviceApplyId(formDataJson.getString("formId"));
         cmcDeviceApproval.setApplier(getLoginUser().getUserId());
         cmcDeviceApproval.setApplyDate(DateUtils.getNowDate());
-        cmcDeviceApproval.setProjectNumber(formDataJson.getString("projectNumber"));
+        cmcDeviceApproval.setProjectId(formDataJson.getString("projectNumber"));
         cmcDeviceApproval.setApplyReason(formDataJson.getString("applyReason"));
         cmcDeviceApproval.setBeginDate(formDataJson.getDate("startTime"));
         cmcDeviceApproval.setEndDate(formDataJson.getDate("endTime"));

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

@@ -70,6 +70,16 @@ public class SysPostController extends BaseController
         return success(deptLeader);
     }
 
+    /**
+     * 获取分管领导
+     */
+    @GetMapping("/manageLeader")
+    public AjaxResult getManageLeader(String userId)
+    {
+        SysUser manageLeader = postService.selectManageLeaderByUserId(userId);
+        return success(manageLeader);
+    }
+
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
     @PostMapping("/export")

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCarApproval.java

@@ -35,7 +35,7 @@ public class CmcCarApproval extends BaseEntity
 
     /** 项目编号 */
     @Excel(name = "项目编号")
-    private String projectNumber;
+    private String projectId;
 
     /** 用车事由 */
     @Excel(name = "用车事由")
@@ -144,14 +144,14 @@ public class CmcCarApproval extends BaseEntity
     {
         return drivers;
     }
-    public void setProjectNumber(String projectNumber)
+    public void setProjectId(String projectId)
     {
-        this.projectNumber = projectNumber;
+        this.projectId = projectId;
     }
 
-    public String getProjectNumber()
+    public String getProjectId()
     {
-        return projectNumber;
+        return projectId;
     }
     public void setApplyReason(String applyReason)
     {
@@ -314,7 +314,7 @@ public class CmcCarApproval extends BaseEntity
                 .append("applier", getApplier())
                 .append("cars", getCars())
                 .append("drivers", getDrivers())
-                .append("projectNumber", getProjectNumber())
+                .append("projectId", getProjectId())
                 .append("applyReason", getApplyReason())
                 .append("passengers", getPassengers())
                 .append("beginDate", getBeginDate())

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java

@@ -31,7 +31,7 @@ public class CmcDeviceApproval extends BaseEntity
 
     /** 项目编号 */
     @Excel(name = "项目编号")
-    private String projectNumber;
+    private String projectId;
 
     /** 申领事由 */
     @Excel(name = "申领事由")
@@ -124,14 +124,14 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return devices;
     }
-    public void setProjectNumber(String projectNumber) 
+    public void setProjectId(String projectId) 
     {
-        this.projectNumber = projectNumber;
+        this.projectId = projectId;
     }
 
-    public String getProjectNumber() 
+    public String getProjectId() 
     {
-        return projectNumber;
+        return projectId;
     }
     public void setApplyReason(String applyReason) 
     {
@@ -275,7 +275,7 @@ public class CmcDeviceApproval extends BaseEntity
             .append("deviceApplyId", getDeviceApplyId())
             .append("applier", getApplier())
             .append("deviceId", getDevices())
-            .append("projectNumber", getProjectNumber())
+            .append("projectId", getProjectId())
             .append("applyReason", getApplyReason())
             .append("beginDate", getBeginDate())
             .append("beginHalfday", getBeginHalfday())

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -59,4 +59,12 @@ public interface SysUserPostMapper
      * @return 查询部门主任
      */
     public SysUser selectDeptLeaderByUserId(String userId);
+
+    /**
+     * 查询分管领导
+     *
+     * @param
+     * @return 查询分管领导
+     */
+    public SysUser selectManageLeaderByUserId(String userId);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -116,4 +116,12 @@ public interface ISysPostService
      */
     public SysUser selectDeptLeaderByUserId(String userId);
 
+    /**
+     * 查询分管领导
+     *
+     * @param
+     * @return 查询分管领导
+     */
+    public SysUser selectManageLeaderByUserId(String userId);
+
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -189,8 +189,23 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectDriverList();
     }
 
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
     @Override
     public SysUser selectDeptLeaderByUserId(String userId) {
         return userPostMapper.selectDeptLeaderByUserId(userId);
     }
+
+    /**
+     * 查询分管领导
+     *
+     * @param
+     * @return 查询分管领导
+     */
+    @Override
+    public SysUser selectManageLeaderByUserId(String userId) { return userPostMapper.selectManageLeaderByUserId(userId); }
 }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml

@@ -9,7 +9,7 @@
         <result property="applier"    column="applier"    />
         <result property="cars"    column="cars"    />
         <result property="drivers"    column="drivers"    />
-        <result property="projectNumber"    column="project_number"    />
+        <result property="projectId"    column="project_id"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="passengers"    column="passengers"    />
         <result property="applyDate"    column="apply_date"    />
@@ -30,7 +30,7 @@
     </resultMap>
 
     <sql id="selectCmcCarApprovalVo">
-        select car_apply_id, applier, cars, drivers, project_number, apply_reason, passengers, apply_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, union_user_id, union_comment, dispatcher, dispatch_comment, estimate_cost from cmc_car_approval
+        select car_apply_id, applier, cars, drivers, project_id, apply_reason, passengers, apply_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, union_user_id, union_comment, dispatcher, dispatch_comment, estimate_cost from cmc_car_approval
     </sql>
 
     <select id="selectCmcCarApprovalList" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">
@@ -39,7 +39,7 @@
             <if test="applier != null "> and applier = #{applier}</if>
             <if test="cars != null  and cars != ''"> and cars = #{cars}</if>
             <if test="drivers != null  and drivers != ''"> and drivers = #{drivers}</if>
-            <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
             <if test="passengers != null "> and passengers = #{passengers}</if>
             <if test="applyDate != null "> and apply_date = #{beginDate}</if>
@@ -72,7 +72,7 @@
             <if test="applier != null">applier,</if>
             <if test="cars != null">cars,</if>
             <if test="drivers != null">drivers,</if>
-            <if test="projectNumber != null">project_number,</if>
+            <if test="projectId != null">project_id,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="passengers != null">passengers,</if>
             <if test="applyDate != null">apply_date,</if>
@@ -96,7 +96,7 @@
             <if test="applier != null">#{applier},</if>
             <if test="cars != null">#{cars},</if>
             <if test="drivers != null">#{drivers},</if>
-            <if test="projectNumber != null">#{projectNumber},</if>
+            <if test="projectId != null">#{projectId},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="passengers != null">#{passengers},</if>
             <if test="applyDate != null">#{applyDate},</if>
@@ -123,7 +123,7 @@
             <if test="applier != null">applier = #{applier},</if>
             <if test="cars != null">cars = #{cars},</if>
             <if test="drivers != null">drivers = #{drivers},</if>
-            <if test="projectNumber != null">project_number = #{projectNumber},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="passengers != null">passengers = #{passengers},</if>
             <if test="applyDate != null">apply_date = #{applyDate},</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceApplyId"    column="device_apply_id"    />
         <result property="applier"    column="applier"    />
         <result property="devices"    column="devices"    />
-        <result property="projectNumber"    column="project_number"    />
+        <result property="projectId"    column="project_id"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDate"    column="apply_date"    />
         <result property="returnDate"    column="return_date"    />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        select device_apply_id, applier, devices, project_number, apply_reason, apply_date, return_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
+        select device_apply_id, applier, devices, project_id, apply_reason, apply_date, return_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
     </sql>
 
     <select id="selectCmcDeviceApprovalList" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="applier != null "> and applier = #{applier}</if>
             <if test="devices != null  and devices != ''"> and devices = #{devices}</if>
-            <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
             <if test="applyDate != null "> and apply_date = #{applyDate}</if>
             <if test="returnDate != null "> and return_date = #{returnDate}</if>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceApplyId != null">device_apply_id,</if>
             <if test="applier != null">applier,</if>
             <if test="devices != null">devices,</if>
-            <if test="projectNumber != null">project_number,</if>
+            <if test="projectId != null">project_id,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="applyDate != null">apply_date,</if>
             <if test="returnDate != null">return_date,</if>
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceApplyId != null">#{deviceApplyId},</if>
             <if test="applier != null">#{applier},</if>
             <if test="devices != null">#{devices},</if>
-            <if test="projectNumber != null">#{projectNumber},</if>
+            <if test="projectId != null">#{projectId},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applyDate != null">#{applyDate},</if>
             <if test="returnDate != null">#{returnDate},</if>
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="applier != null">applier = #{applier},</if>
             <if test="devices != null">devices = #{devices},</if>
-            <if test="projectNumber != null">project_number = #{projectNumber},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applyDate != null">apply_date = #{applyDate},</if>
             <if test="returnDate != null">return_date = #{returnDate},</if>

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -30,6 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where up.post_id = 12
 	</select>
 
+	<select id="selectManageLeaderByUserId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name, up.post_id from
+		(select u1.user_id, u1.nick_name, u.dept_id from
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		left join sys_user_post as up
+		on r.user_id = up.user_id
+		where up.post_id = 6
+	</select>
+
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>

oa-back/sql/sql.sql

@@ -1425,7 +1425,7 @@ create table `cmc_car_approval`  (
   `applier`				bigint			default null	comment '申请人',
   `cars`				varchar(10)		default null	comment '车辆id',
   `drivers`				varchar(20)		default null	comment '驾驶员id',
-  `project_number`		varchar(10)		default null	comment '项目编号',
+  `project_id`			char(19)		default null	comment '项目id',
   `apply_reason`		varchar(255)	default null 	comment '用车事由',
   `passengers`			int				default null 	comment '人数',
   `begin_date`			date			default null 	comment '开始日期',
@@ -1477,7 +1477,7 @@ create table `cmc_device_approval`  (
   `device_apply_id`		char(19)		not null		comment '设备申请id',
   `applier`				bigint			default null	comment '申请人',
   `devices`				varchar(50)		default null	comment '设备id',
-  `project_number`		varchar(10)		default null	comment '项目编号',
+  `project_id`			char(19)		default null	comment '项目id',
   `apply_reason`		varchar(255)	default null 	comment '申领事由',
   `begin_date`			date			default null 	comment '开始日期',
   `begin_halfday`		char(2)			default null 	comment '开始日期上/下午',

oa-ui/src/api/oa/device/deviceApproval.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-03-05 17:24:50
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-07 10:27:26
+ */
 import request from '@/utils/request'
 
 // 查询cmc设备审批列表
@@ -26,6 +32,15 @@ export function addDeviceApproval(data) {
   })
 }
 
+// 新增cmc设备审批
+export function submitDeviceApproval(data) {
+  return request({
+    url: '/oa/deviceApproval/submit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改cmc设备审批
 export function updateDeviceApproval(data) {
   return request({
@@ -35,6 +50,15 @@ export function updateDeviceApproval(data) {
   })
 }
 
+// 修改cmc设备审批
+export function modifyDeviceApproval(data) {
+  return request({
+    url: '/oa/deviceApproval/modify',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除cmc设备审批
 export function delDeviceApproval(deviceApplyId) {
   return request({