查询车辆、驾驶员列表

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

@@ -1,8 +1,7 @@
-package com.ruoyi.oa.controller;
+package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +36,6 @@ public class CmcCarApprovalController extends BaseController
     /**
      * 查询cmc用车审批列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcCarApproval cmcCarApproval)
     {
@@ -49,7 +47,6 @@ public class CmcCarApprovalController extends BaseController
     /**
      * 导出cmc用车审批列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:export')")
     @Log(title = "cmc用车审批", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcCarApproval cmcCarApproval)
@@ -62,7 +59,6 @@ public class CmcCarApprovalController extends BaseController
     /**
      * 获取cmc用车审批详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:query')")
     @GetMapping(value = "/{carApplyId}")
     public AjaxResult getInfo(@PathVariable("carApplyId") String carApplyId)
     {
@@ -72,7 +68,6 @@ public class CmcCarApprovalController extends BaseController
     /**
      * 新增cmc用车审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:add')")
     @Log(title = "cmc用车审批", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcCarApproval cmcCarApproval)
@@ -83,7 +78,6 @@ public class CmcCarApprovalController extends BaseController
     /**
      * 修改cmc用车审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:edit')")
     @Log(title = "cmc用车审批", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcCarApproval cmcCarApproval)
@@ -94,7 +88,6 @@ public class CmcCarApprovalController extends BaseController
     /**
      * 删除cmc用车审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:remove')")
     @Log(title = "cmc用车审批", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{carApplyIds}")
     public AjaxResult remove(@PathVariable String[] carApplyIds)

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

@@ -1,8 +1,8 @@
-package com.ruoyi.oa.controller;
+package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * cmc车辆信息Controller
- * 
+ *
  * @author cmc
  * @date 2024-02-23
  */
@@ -33,11 +33,9 @@ public class CmcCarController extends BaseController
 {
     @Autowired
     private ICmcCarService cmcCarService;
-
     /**
      * 查询cmc车辆信息列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcCar cmcCar)
     {
@@ -49,7 +47,6 @@ public class CmcCarController extends BaseController
     /**
      * 导出cmc车辆信息列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:export')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcCar cmcCar)
@@ -62,7 +59,6 @@ public class CmcCarController extends BaseController
     /**
      * 获取cmc车辆信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:query')")
     @GetMapping(value = "/{carId}")
     public AjaxResult getInfo(@PathVariable("carId") Long carId)
     {
@@ -72,7 +68,6 @@ public class CmcCarController extends BaseController
     /**
      * 新增cmc车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:add')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcCar cmcCar)
@@ -83,7 +78,6 @@ public class CmcCarController extends BaseController
     /**
      * 修改cmc车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:edit')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcCar cmcCar)
@@ -94,7 +88,6 @@ public class CmcCarController extends BaseController
     /**
      * 删除cmc车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:car:remove')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{carIds}")
     public AjaxResult remove(@PathVariable Long[] carIds)

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

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -45,7 +48,18 @@ public class SysPostController extends BaseController
         List<SysPost> list = postService.selectPostList(post);
         return getDataTable(list);
     }
-    
+
+    /**
+     * 获取岗位列表
+     */
+    @GetMapping("/driverList")
+    public TableDataInfo driverList()
+    {
+        startPage();
+        List<SysUser> list = postService.driverList();
+        return getDataTable(list);
+    }
+
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
     @PostMapping("/export")

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

@@ -66,6 +66,10 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目登记人")
     private String projectRegistrant;
 
+    /** 承担部门 */
+    @Excel(name = "承担部门")
+    private String undertakingDept;
+
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -183,6 +187,15 @@ public class CmcProject extends BaseEntity
     {
         return projectRegistrant;
     }
+    public void setUndertakingDept(String undertakingDept)
+    {
+        this.undertakingDept = undertakingDept;
+    }
+
+    public String getUndertakingDept()
+    {
+        return undertakingDept;
+    }
 
     @Override
     public String toString() {
@@ -199,6 +212,7 @@ public class CmcProject extends BaseEntity
                 .append("projectType", getProjectType())
                 .append("projectLevel", getProjectLevel())
                 .append("projectRegistrant", getProjectRegistrant())
+                .append("undertakingDept", getUndertakingDept())
                 .toString();
     }
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.domain.SysUserPost;
 
 /**
@@ -41,4 +43,12 @@ public interface SysUserPostMapper
      * @return 结果
      */
     public int batchUserPost(List<SysUserPost> userPostList);
+
+    /**
+     * 查询驾驶员集合
+     *
+     * @param
+     * @return 驾驶员列表
+     */
+    List<SysUser> selectDriverList();
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.domain.SysPost;
 
 /**
@@ -96,4 +98,12 @@ public interface ISysPostService
      * @return 结果
      */
     public int updatePost(SysPost post);
+
+    /**
+     * 查询驾驶员集合
+     *
+     * @param
+     * @return 驾驶员列表
+     */
+    List<SysUser> driverList();
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.constant.UserConstants;
@@ -175,4 +177,15 @@ public class SysPostServiceImpl implements ISysPostService
     {
         return postMapper.updatePost(post);
     }
+
+    /**
+     * 查询驾驶员集合
+     *
+     * @param
+     * @return 驾驶员列表
+     */
+    @Override
+    public List<SysUser> driverList() {
+        return userPostMapper.selectDriverList();
+    }
 }

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

@@ -17,12 +17,13 @@
         <result property="projectType"    column="project_type"    />
         <result property="projectLevel"    column="project_level"    />
         <result property="projectRegistrant"    column="project_registrant"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="createTime"    column="create_time"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select project_id, project_number, project_name, project_leader, is_finished, project_source, party_a, contact_person, telephone, project_type, project_level, project_registrant, create_time, remark from cmc_project
+        select project_id, project_number, project_name, project_leader, is_finished, project_source, party_a, contact_person, telephone, project_type, project_level, project_registrant, undertaking_dept, create_time, remark from cmc_project
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
@@ -30,7 +31,6 @@
         <where>
             <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="projectLeader != null "> and project_leader = #{projectLeader}</if>
             <if test="isFinished != null  and isFinished != ''"> and is_finished = #{isFinished}</if>
             <if test="projectSource != null  and projectSource != ''"> and project_source = #{projectSource}</if>
             <if test="partyA != null  and partyA != ''"> and party_a like concat('%', #{partyA}, '%')</if>
@@ -38,7 +38,6 @@
             <if test="telephone != null  and telephone != ''"> and telephone like concat('%', #{telephone}, '%')</if>
             <if test="projectType != null  and projectType != ''"> and project_type like concat('%', #{projectType}, '%')</if>
             <if test="projectLevel != null  and projectLevel != ''"> and project_level = #{projectLevel}</if>
-            <if test="projectRegistrant != null "> and project_registrant = #{projectRegistrant}</if>
         </where>
     </select>
 
@@ -62,6 +61,7 @@
             <if test="projectType != null">project_type,</if>
             <if test="projectLevel != null">project_level,</if>
             <if test="projectRegistrant != null">project_registrant,</if>
+            <if test="undertakingDept != null">undertaking_dept,</if>
             <if test="createTime != null">create_time,</if>
             <if test="remark != null">remark,</if>
         </trim>
@@ -78,6 +78,7 @@
             <if test="projectType != null">#{projectType},</if>
             <if test="projectLevel != null">#{projectLevel},</if>
             <if test="projectRegistrant != null">#{projectRegistrant},</if>
+            <if test="undertakingDept != null">#{undertakingDept},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="remark != null">#{remark},</if>
         </trim>
@@ -97,6 +98,7 @@
             <if test="projectType != null">project_type = #{projectType},</if>
             <if test="projectLevel != null">project_level = #{projectLevel},</if>
             <if test="projectRegistrant != null">project_registrant = #{projectRegistrant},</if>
+            <if test="undertakingDept != null">undertaking_dept = #{undertakingDept},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>

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

@@ -9,6 +9,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="postId"     column="post_id"      />
 	</resultMap>
 
+	<resultMap type="SysUser" id="SysUserResult">
+		<id     property="userId"       column="user_id"      />
+		<result property="nickName"     column="nick_name"    />
+	</resultMap>
+
+	<select id="selectDriverList" parameterType="SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.update_reason, u.engineer_level, u.entry_date, u.age,
+			   up.post_id
+		from sys_user u
+				 left join sys_user_post up on u.user_id = up.user_id
+		where up.post_id = 27
+	</select>
+
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>

oa-back/sql/ry_20231130.sql

@@ -1280,6 +1280,7 @@ create table cmc_project  (
   project_type			varchar(20)				default null		comment '项目类型',
   project_level			char(1)					default null		comment '项目级别（0一般项目、1重大项目）',
   project_registrant	varchar(3)				default null		comment '项目登记人',
+  undertaking_dept		varchar(20)				default null		comment '承担部门',
   create_time			datetime				default null		comment '项目登记时间',
   remark				varchar(255)				default null		comment '项目备注',
   primary key (project_id)
@@ -1288,63 +1289,63 @@ create table cmc_project  (
 -- ----------------------------
 -- 初始化-项目表数据
 -- ----------------------------
-insert into `cmc_project` values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1679770747494465538', '2023C47', '绵竹抽水蓄能电站界桩测设工作', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1679772570787774466', '2023W24', '双流地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', null, '1', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', null, '1', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', null, '1', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', null, '1', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', null, '1', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1752902350986543105', '2024HY01', '航测遥感中心借调、零星项目', null, '0', null, null, null, null, null, null, null, null, null);
-insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平乐风电场地形图测绘', null, '0', null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679770747494465538', '2023C47', '绵竹抽水蓄能电站界桩测设工作', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1679772570787774466', '2023W24', '双流地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', null, '1', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', null, '1', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', null, '1', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', null, '1', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', null, '1', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1752902350986543105', '2024HY01', '航测遥感中心借调、零星项目', null, '0', null, null, null, null, null, null, null, null, null, null);
+insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平乐风电场地形图测绘', null, '0', null, null, null, null, null, null, null, null, null, null);
 
 -- ----------------------------
 -- 24、cmc项目内容表

oa-ui/src/api/system/post.js

@@ -9,6 +9,14 @@ export function listPost(query) {
   })
 }
 
+// 查询驾驶员列表
+export function listDriver() {
+  return request({
+    url: '/system/post/driverList',
+    method: 'get'
+  })
+}
+
 // 查询岗位详细
 export function getPost(postId) {
   return request({

oa-ui/src/views/flowable/form/carForm.vue

@@ -1,3 +1,9 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-02-29 17:24:39
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-04 14:10:06
+-->
 <template>
   <div>
     <h2 style="text-align: center;">用车申请表</h2>
@@ -36,30 +42,17 @@
             <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
             }}</el-descriptions-item>
             <el-descriptions-item label="承担部门" label-class-name="my-label">
-              <el-tag size="small">{{ chooseProject.underDept }}</el-tag>
+              <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
             }}</el-descriptions-item>
           </el-descriptions>
         </el-form-item>
         <el-form-item label="车牌号：">
-          <el-select v-model="form.projectNumber" filterable placeholder="请选择" @change="handleSelectProject" clearable>
-            <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber" :value="item.projectId">
+          <el-select v-model="form.licensePlate" filterable multiple placeholder="请选择" clearable>
+            <el-option v-for="item in carList" :key="item.id" :label="item.licensePlate" :value="item.id">
             </el-option>
           </el-select>
-          <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
-            <el-descriptions-item label="车牌号" label-class-name="my-label">{{ chooseProject.projectNumber
-            }}</el-descriptions-item>
-            <el-descriptions-item label="车辆型号" label-class-name="my-label">{{ chooseProject.projectName
-            }}</el-descriptions-item>
-            <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
-            }}</el-descriptions-item>
-            <el-descriptions-item label="承担部门" label-class-name="my-label">
-              <el-tag size="small">{{ chooseProject.underDept }}</el-tag>
-            </el-descriptions-item>
-            <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-            }}</el-descriptions-item>
-          </el-descriptions>
         </el-form-item>
         <el-row>
           <el-col :span="6" :xs="24">
@@ -84,11 +77,10 @@
         </el-row>
 
         <el-form-item label="驾驶员：">
-          <el-radio-group v-model="form.driver">
-            <el-radio :label="3">备选项</el-radio>
-            <el-radio :label="6">备选项</el-radio>
-            <el-radio :label="9">备选项</el-radio>
-          </el-radio-group>
+          <el-select v-model="form.driver" filterable multiple placeholder="请选择" clearable>
+            <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-form>
     </div>
@@ -97,11 +89,15 @@
 
 <script>
 import { listProject, getProject } from "@/api/oa/project/project";
+import { listCar } from "@/api/oa/car/car";
+import { listDriver } from "@/api/system/post";
 export default {
   created() {
     this.form.user = this.$store.getters.name;
     this.form.deptName = this.$store.getters.deptName;
     this.getProjectList();
+    this.getCarList();
+    this.getDriverList();
   },
   data() {
     return {
@@ -110,6 +106,7 @@ export default {
         day: ''
       },
       projectList: [],
+      carList: [],
       driverList: [],
       chooseProject: {},
       isSelect: false
@@ -138,6 +135,25 @@ export default {
       }
 
     },
+    // 查询车辆列表
+    getCarList() {
+      listCar({
+        pageNum: 1,
+        pageSize: 9999999999
+      }).then(response => {
+        this.carList = response.rows;
+      })
+    },
+    
+    // 查询驾驶员列表
+    getDriverList() {
+      listDriver({
+        pageNum: 1,
+        pageSize: 9999999999
+      }).then(response => {
+        this.driverList = response.rows;
+      })
+    },
     calculateDay() {
       if (this.form.startTime && this.form.endTime) {
         let y1 = new Date(this.form.startTime);