项目、车辆管理前端界面

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

@@ -26,6 +26,10 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目编号")
     private String projectNumber;
 
+    /** 项目负责人 */
+    @Excel(name = "项目负责人")
+    private Integer projectLeader;
+
     /** 项目状态 */
     @Excel(name = "项目状态")
     private String isFinished;
@@ -57,6 +61,15 @@ public class CmcProject extends BaseEntity
     {
         return projectNumber;
     }
+    public void setProjectLeader(Integer projectLeader)
+    {
+        this.projectLeader = projectLeader;
+    }
+
+    public Integer getProjectLeader()
+    {
+        return projectLeader;
+    }
     public void setIsFinished(String isFinished)
     {
         this.isFinished = isFinished;
@@ -72,6 +85,7 @@ public class CmcProject extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("projectId", getProjectId())
             .append("projectName", getProjectName())
+            .append("projectLeader", getProjectLeader())
             .append("projectNumber", getProjectNumber())
             .append("isFinished", getIsFinished())
             .toString();

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

@@ -8,11 +8,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId"    column="project_id"    />
         <result property="projectName"    column="project_name"    />
         <result property="projectNumber"    column="project_number"    />
+        <result property="projectLeader"    column="project_leader"    />
         <result property="isFinished"    column="is_finished"    />
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select project_id, project_name, project_number, is_finished from cmc_project
+        select project_id, project_name, project_number, project_leader, is_finished from cmc_project
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
@@ -20,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="projectLeader != null  and projectLeader != ''"> and project_laeder like concat('%', #{projectLeader}, '%')</if>
             <if test="isFinished != null  and isFinished != ''"> and is_finished = #{isFinished}</if>
         </where>
     </select>
@@ -35,12 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id,</if>
             <if test="projectName != null">project_name,</if>
             <if test="projectNumber != null">project_number,</if>
+            <if test="projectLeader != null">project_leader,</if>
             <if test="isFinished != null">is_finished,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
             <if test="projectName != null">#{projectName},</if>
             <if test="projectNumber != null">#{projectNumber},</if>
+            <if test="projectLeader != null">#{projectLeader},</if>
             <if test="isFinished != null">#{isFinished},</if>
          </trim>
     </insert>
@@ -50,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectName != null">project_name = #{projectName},</if>
             <if test="projectNumber != null">project_number = #{projectNumber},</if>
+            <if test="projectLeader != null">project_leader = #{projectLeader},</if>
             <if test="isFinished != null">is_finished = #{isFinished},</if>
         </trim>
         where project_id = #{projectId}

oa-back/sql/ry_20231130.sql

@@ -364,6 +364,8 @@ insert into sys_menu values('114',  '缓存列表', '2',   '6', 'cacheList',  'm
 insert into sys_menu values('115',  '表单构建', '3',   '1', 'build',      'tool/build/index',         '', 1, 0, 'C', '0', '0', 'tool:build:list',         'build',         'admin', sysdate(), '', null, '表单构建菜单');
 insert into sys_menu values('116',  '代码生成', '3',   '2', 'gen',        'tool/gen/index',           '', 1, 0, 'C', '0', '0', 'tool:gen:list',           'code',          'admin', sysdate(), '', null, '代码生成菜单');
 insert into sys_menu values('117',  '系统接口', '3',   '3', 'swagger',    'tool/swagger/index',       '', 1, 0, 'C', '0', '0', 'tool:swagger:list',       'swagger',       'admin', sysdate(), '', null, '系统接口菜单');
+insert into sys_menu values('118',  '车辆信息', '0',   '5', 'car',    	  'oa/car/index',        	  '', 1, 0, 'C', '0', '0', 'oa:car:list',       	  'car',       	   'admin', sysdate(), '', null, '车辆管理菜单');
+insert into sys_menu values('119',  '项目信息', '0',   '6', 'project',   'oa/project/index',         '', 1, 0, 'C', '0', '0', 'oa:project:list',         'project',       'admin', sysdate(), '', null, '项目管理菜单');
 -- 三级菜单
 insert into sys_menu values('500',  '操作日志', '108', '1', 'operlog',    'monitor/operlog/index',    '', 1, 0, 'C', '0', '0', 'monitor:operlog:list',    'form',          'admin', sysdate(), '', null, '操作日志菜单');
 insert into sys_menu values('501',  '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
@@ -442,7 +444,18 @@ insert into sys_menu values('1058', '生成删除', '116', '3', '#', '', '', 1,
 insert into sys_menu values('1059', '导入代码', '116', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import',            '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1060', '预览代码', '116', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview',           '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1061', '生成代码', '116', '6', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code',              '#', 'admin', sysdate(), '', null, '');
-
+-- 车辆管理按钮
+insert into sys_menu values('1062', '车辆查询', '118', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1063', '车辆新增', '118', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:add',					'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1064', '车辆修改', '118', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:edit',              	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1065', '车辆删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:remove',              '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1066', '车辆导出', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:export',              '#', 'admin', sysdate(), '', null, '');
+-- 车辆管理按钮
+insert into sys_menu values('1067', '项目查询', '119', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1068', '项目新增', '119', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1069', '项目修改', '119', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1070', '项目删除', '119', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1071', '项目导出', '119', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          '#', 'admin', sysdate(), '', null, '');
 
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
@@ -1258,6 +1271,7 @@ create table cmc_project  (
   project_id		char(19)				not null			comment '项目id',
   project_number	varchar(10)				default null		comment '项目编号',
   project_name		varchar(255)			default null		comment '项目名称',
+  project_leader	bigint					default null		comment '项目负责人',
   is_finished		char(1)					default null		comment '项目状态',
   primary key (project_id)
 ) engine = innodb comment = 'cmc项目表';
@@ -1265,63 +1279,63 @@ create table cmc_project  (
 -- ----------------------------
 -- 初始化-项目表数据
 -- ----------------------------
-insert into `cmc_project` values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', '0');
-insert into `cmc_project` values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', '0');
-insert into `cmc_project` values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', '0');
-insert into `cmc_project` values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', '0');
-insert into `cmc_project` values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', '0');
-insert into `cmc_project` values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', '0');
-insert into `cmc_project` values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', '0');
-insert into `cmc_project` values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', '0');
-insert into `cmc_project` values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', '0');
-insert into `cmc_project` values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', '0');
-insert into `cmc_project` values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', '0');
-insert into `cmc_project` values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', '0');
-insert into `cmc_project` values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', '0');
-insert into `cmc_project` values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘', '0');
-insert into `cmc_project` values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', '0');
-insert into `cmc_project` values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘', '0');
-insert into `cmc_project` values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', '0');
-insert into `cmc_project` values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', '0');
-insert into `cmc_project` values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', '0');
-insert into `cmc_project` values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本', '0');
-insert into `cmc_project` values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', '0');
-insert into `cmc_project` values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', '0');
-insert into `cmc_project` values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', '0');
-insert into `cmc_project` values ('1679770747494465538', '2023C47', '绵竹抽水蓄能电站界桩测设工作', '0');
-insert into `cmc_project` values ('1679772570787774466', '2023W24', '双流地形图测绘', '0');
-insert into `cmc_project` values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘', '0');
-insert into `cmc_project` values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', '0');
-insert into `cmc_project` values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘', '0');
-insert into `cmc_project` values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', '0');
-insert into `cmc_project` values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量', '0');
-insert into `cmc_project` values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', '0');
-insert into `cmc_project` values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作', '0');
-insert into `cmc_project` values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', '0');
-insert into `cmc_project` values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘', '0');
-insert into `cmc_project` values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', '0');
-insert into `cmc_project` values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', '1');
-insert into `cmc_project` values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', '1');
-insert into `cmc_project` values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', '0');
-insert into `cmc_project` values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', '0');
-insert into `cmc_project` values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘', '0');
-insert into `cmc_project` values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', '1');
-insert into `cmc_project` values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', '1');
-insert into `cmc_project` values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', '0');
-insert into `cmc_project` values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', '0');
-insert into `cmc_project` values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', '0');
-insert into `cmc_project` values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', '0');
-insert into `cmc_project` values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', '1');
-insert into `cmc_project` values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘', '0');
-insert into `cmc_project` values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', '0');
-insert into `cmc_project` values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', '0');
-insert into `cmc_project` values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', '0');
-insert into `cmc_project` values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', '0');
-insert into `cmc_project` values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', '0');
-insert into `cmc_project` values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', '0');
-insert into `cmc_project` values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', '0');
-insert into `cmc_project` values ('1752902350986543105', '2024HY01', '航测遥感中心借调、零星项目', '0');
-insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平乐风电场地形图测绘', '0');
+insert into `cmc_project` values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', null, '0');
+insert into `cmc_project` values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', null, '0');
+insert into `cmc_project` values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', null, '0');
+insert into `cmc_project` values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', null, '0');
+insert into `cmc_project` values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', null, '0');
+insert into `cmc_project` values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', null, '0');
+insert into `cmc_project` values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', null, '0');
+insert into `cmc_project` values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', null, '0');
+insert into `cmc_project` values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', null, '0');
+insert into `cmc_project` values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', null, '0');
+insert into `cmc_project` values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', null, '0');
+insert into `cmc_project` values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', null, '0');
+insert into `cmc_project` values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', null, '0');
+insert into `cmc_project` values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘', null, '0');
+insert into `cmc_project` values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', null, '0');
+insert into `cmc_project` values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘', null, '0');
+insert into `cmc_project` values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', null, '0');
+insert into `cmc_project` values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', null, '0');
+insert into `cmc_project` values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', null, '0');
+insert into `cmc_project` values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本', null, '0');
+insert into `cmc_project` values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', null, '0');
+insert into `cmc_project` values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', null, '0');
+insert into `cmc_project` values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', null, '0');
+insert into `cmc_project` values ('1679770747494465538', '2023C47', '绵竹抽水蓄能电站界桩测设工作', null, '0');
+insert into `cmc_project` values ('1679772570787774466', '2023W24', '双流地形图测绘', null, '0');
+insert into `cmc_project` values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘', null, '0');
+insert into `cmc_project` values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', null, '0');
+insert into `cmc_project` values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘', null, '0');
+insert into `cmc_project` values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', null, '0');
+insert into `cmc_project` values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量', null, '0');
+insert into `cmc_project` values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', null, '0');
+insert into `cmc_project` values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作', null, '0');
+insert into `cmc_project` values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', null, '0');
+insert into `cmc_project` values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘', null, '0');
+insert into `cmc_project` values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', null, '0');
+insert into `cmc_project` values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', null, '1');
+insert into `cmc_project` values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', null, '1');
+insert into `cmc_project` values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', null, '0');
+insert into `cmc_project` values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', null, '0');
+insert into `cmc_project` values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘', null, '0');
+insert into `cmc_project` values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', null, '1');
+insert into `cmc_project` values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', null, '1');
+insert into `cmc_project` values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', null, '0');
+insert into `cmc_project` values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', null, '0');
+insert into `cmc_project` values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', null, '0');
+insert into `cmc_project` values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', null, '0');
+insert into `cmc_project` values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', null, '1');
+insert into `cmc_project` values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘', null, '0');
+insert into `cmc_project` values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', null, '0');
+insert into `cmc_project` values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', null, '0');
+insert into `cmc_project` values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', null, '0');
+insert into `cmc_project` values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', null, '0');
+insert into `cmc_project` values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', null, '0');
+insert into `cmc_project` values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', null, '0');
+insert into `cmc_project` values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', null, '0');
+insert into `cmc_project` values ('1752902350986543105', '2024HY01', '航测遥感中心借调、零星项目', null, '0');
+insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平乐风电场地形图测绘', null, '0');
 
 
 -- ----------------------------

oa-ui/src/api/oa/car/car.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-02-27 13:47:55
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-02-27 13:48:00
+ */
+import request from '@/utils/request'
+
+// 查询cmc车辆信息列表
+export function listCar(query) {
+  return request({
+    url: '/oa/car/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc车辆信息详细
+export function getCar(carId) {
+  return request({
+    url: '/oa/car/' + carId,
+    method: 'get'
+  })
+}
+
+// 新增cmc车辆信息
+export function addCar(data) {
+  return request({
+    url: '/oa/car',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc车辆信息
+export function updateCar(data) {
+  return request({
+    url: '/oa/car',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc车辆信息
+export function delCar(carId) {
+  return request({
+    url: '/oa/car/' + carId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/oa/car/index.vue

@@ -0,0 +1,259 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="车牌号" prop="licensePlate">
+        <el-input
+          v-model="queryParams.licensePlate"
+          placeholder="请输入车牌号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="驾驶员" prop="driver">
+        <el-input
+          v-model="queryParams.driver"
+          placeholder="请输入驾驶员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:car:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:car:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:car:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:car:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="carList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="车辆id" align="center" prop="carId" />
+      <el-table-column label="车牌号" align="center" prop="licensePlate" />
+      <el-table-column label="驾驶员" align="center" prop="driver" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:car:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:car:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改cmc车辆信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="车牌号" prop="licensePlate">
+          <el-input v-model="form.licensePlate" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="驾驶员" prop="driver">
+          <el-input v-model="form.driver" placeholder="请输入驾驶员" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCar, getCar, delCar, addCar, updateCar } from "@/api/oa/car/car";
+
+export default {
+  name: "Car",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc车辆信息表格数据
+      carList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        licensePlate: null,
+        driver: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc车辆信息列表 */
+    getList() {
+      this.loading = true;
+      listCar(this.queryParams).then(response => {
+        this.carList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        carId: null,
+        licensePlate: null,
+        driver: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.carId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc车辆信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const carId = row.carId || this.ids
+      getCar(carId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc车辆信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.carId != null) {
+            updateCar(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCar(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const carIds = row.carId || this.ids;
+      this.$modal.confirm('是否确认删除cmc车辆信息编号为"' + carIds + '"的数据项？').then(function() {
+        return delCar(carIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/car/export', {
+        ...this.queryParams
+      }, `car_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/project/index.vue

@@ -0,0 +1,290 @@
+
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目编号" prop="projectNumber">
+        <el-input
+          v-model="queryParams.projectNumber"
+          placeholder="请输入项目编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目负责人" prop="projectLeader">
+        <el-input
+          v-model="queryParams.projectLeader"
+          placeholder="请输入项目负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目状态" prop="isFinished">
+        <el-input
+          v-model="queryParams.isFinished"
+          placeholder="请输入项目状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:project:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:project:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:project:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:project:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目编号" align="center" prop="projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <el-table-column label="项目负责人" align="center" prop="projectLeader" />
+      <el-table-column label="项目状态" align="center" prop="isFinished" ></el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:project:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:project:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改项目管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目编号" prop="projectNumber">
+          <el-input v-model="form.projectNumber" placeholder="请输入项目编号" />
+        </el-form-item>
+        <el-form-item label="项目名称" prop="projectName">
+          <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+        </el-form-item>
+        <el-form-item label="项目负责人" prop="projectLeader">
+          <el-input v-model="form.projectLeader" placeholder="请输入项目负责人" />
+        </el-form-item>
+        <el-form-item label="项目状态" prop="isFinished">
+          <el-radio-group v-model="form.isFinished">
+              <el-radio :label="0" size="large">进行中</el-radio>
+              <el-radio :label="1" size="large">已结束</el-radio>
+            </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProject, getProject, delProject, addProject, updateProject } from "@/api/oa/project/project";
+
+export default {
+  name: "Project",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目管理表格数据
+      projectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectNumber: null,
+        projectName: null,
+        projectLeader: null,
+        isFinished: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询项目管理列表 */
+    getList() {
+      this.loading = true;
+      listProject(this.queryParams).then(response => {
+        this.projectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        projectId: null,
+        projectNumber: null,
+        projectName: null,
+        projectLeader: null,
+        isFinished: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.projectId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加项目管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const projectId = row.projectId || this.ids
+      getProject(projectId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.projectId != null) {
+            updateProject(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProject(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const projectIds = row.projectId || this.ids;
+      this.$modal.confirm('是否确认删除项目管理编号为"' + projectIds + '"的数据项？').then(function() {
+        return delProject(projectIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/project/export', {
+        ...this.queryParams
+      }, `project_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>