查询项目负责人id转昵称

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -8,6 +9,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.oa.domain.CmcProjectWork;
 import com.ruoyi.oa.service.ICmcProjectWorkService;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -35,6 +37,9 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ICmcProjectWorkService cmcProjectWorkService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询cmc项目列表
      */
@@ -42,7 +47,13 @@ public class CmcProjectController extends BaseController
     public TableDataInfo list(CmcProject cmcProject)
     {
         startPage();
-        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        List<CmcProject> orilist = cmcProjectService.selectCmcProjectList(cmcProject);
+        List<CmcProject> list = new ArrayList<>();
+        for (CmcProject project : orilist) {
+            if (project.getProjectLeader() != null && !project.getProjectLeader().equals(""))
+                project.setProjectLeader(userService.selectUserById(Long.parseLong(project.getProjectLeader())).getNickName());
+            list.add(project);
+        }
         return getDataTable(list);
     }
 
@@ -64,7 +75,10 @@ public class CmcProjectController extends BaseController
     @GetMapping(value = "/{projectId}")
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
     {
-        return success(cmcProjectService.selectCmcProjectByProjectId(projectId));
+        CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(projectId);
+        if (cmcProject.getProjectLeader() != null && !cmcProject.getProjectLeader().equals(""))
+            cmcProject.setProjectLeader(userService.selectUserById(Long.parseLong(cmcProject.getProjectLeader())).getNickName());
+        return success(cmcProject);
     }
 
     /**
@@ -90,7 +104,7 @@ public class CmcProjectController extends BaseController
         cmcProject.setProjectId(new SnowFlake().generateId());
         cmcProject.setProjectName(formDataJson.getString("projectName"));
         cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
-        cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));
+        cmcProject.setProjectLeader(formDataJson.getString("projectLeader"));
         cmcProject.setIsFinished(formDataJson.getString("isFinished"));
         cmcProject.setProjectSource(formDataJson.getString("projectSource"));
         cmcProject.setPartyA(formDataJson.getString("partyA"));
@@ -98,7 +112,7 @@ public class CmcProjectController extends BaseController
         cmcProject.setTelephone(formDataJson.getString("telephone"));
         cmcProject.setProjectType(formDataJson.getString("projectType"));
         cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
-        cmcProject.setProjectRegistrant(formDataJson.getLong("projectRegistrant"));
+        cmcProject.setProjectRegistrant(formDataJson.getString("projectRegistrant"));
         cmcProject.setCreateTime(DateUtils.getNowDate());
         String workList = formDataJson.getString("workList");
         workList = workList.substring(1, workList.length() - 1);
@@ -153,7 +167,7 @@ public class CmcProjectController extends BaseController
         CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(formDataJson.getString("projectId"));
         cmcProject.setProjectName(formDataJson.getString("projectName"));
         cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
-        cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));
+        cmcProject.setProjectLeader(formDataJson.getString("projectLeader"));
         cmcProject.setIsFinished(formDataJson.getString("isFinished"));
         cmcProject.setProjectSource(formDataJson.getString("projectSource"));
         cmcProject.setPartyA(formDataJson.getString("partyA"));
@@ -161,7 +175,7 @@ public class CmcProjectController extends BaseController
         cmcProject.setTelephone(formDataJson.getString("telephone"));
         cmcProject.setProjectType(formDataJson.getString("projectType"));
         cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
-        cmcProject.setProjectRegistrant(formDataJson.getLong("projectRegistrant"));
+        cmcProject.setProjectRegistrant(formDataJson.getString("projectRegistrant"));
         cmcProject.setCreateTime(DateUtils.getNowDate());
         String workList = formDataJson.getString("workList");
         workList = workList.substring(1, workList.length() - 1);

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

@@ -28,7 +28,7 @@ public class CmcProject extends BaseEntity
 
     /** 项目负责人 */
     @Excel(name = "项目负责人")
-    private Long projectLeader;
+    private String projectLeader;
 
     /** 项目状态（0进行中、1已结束） */
     @Excel(name = "项目状态", readConverterExp = "0=进行中、1=已结束")
@@ -60,7 +60,7 @@ public class CmcProject extends BaseEntity
 
     /** 项目登记人 */
     @Excel(name = "项目登记人")
-    private Long projectRegistrant;
+    private String projectRegistrant;
 
     public void setProjectId(String projectId)
     {
@@ -89,12 +89,12 @@ public class CmcProject extends BaseEntity
     {
         return projectName;
     }
-    public void setProjectLeader(Long projectLeader)
+    public void setProjectLeader(String projectLeader)
     {
         this.projectLeader = projectLeader;
     }
 
-    public Long getProjectLeader()
+    public String getProjectLeader()
     {
         return projectLeader;
     }
@@ -161,12 +161,12 @@ public class CmcProject extends BaseEntity
     {
         return projectLevel;
     }
-    public void setProjectRegistrant(Long projectRegistrant)
+    public void setProjectRegistrant(String projectRegistrant)
     {
         this.projectRegistrant = projectRegistrant;
     }
 
-    public Long getProjectRegistrant()
+    public String getProjectRegistrant()
     {
         return projectRegistrant;
     }

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

@@ -18,10 +18,11 @@
         <result property="projectLevel"    column="project_level"    />
         <result property="projectRegistrant"    column="project_registrant"    />
         <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 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, create_time, remark from cmc_project
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
@@ -62,6 +63,7 @@
             <if test="projectLevel != null">project_level,</if>
             <if test="projectRegistrant != null">project_registrant,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -77,6 +79,7 @@
             <if test="projectLevel != null">#{projectLevel},</if>
             <if test="projectRegistrant != null">#{projectRegistrant},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
 
@@ -95,6 +98,7 @@
             <if test="projectLevel != null">project_level = #{projectLevel},</if>
             <if test="projectRegistrant != null">project_registrant = #{projectRegistrant},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where project_id = #{projectId}
     </update>

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

@@ -11,10 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit"    column="unit"    />
         <result property="workLoad"    column="work_load"    />
         <result property="finishTime"    column="finish_time"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectCmcProjectWorkVo">
-        select project_id, work_content, scale_grade, unit, work_load, finish_time from cmc_project_work
+        select project_id, work_content, scale_grade, unit, work_load, finish_time, remark from cmc_project_work
     </sql>
 
     <select id="selectCmcProjectWorkList" parameterType="CmcProjectWork" resultMap="CmcProjectWorkResult">
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">unit,</if>
             <if test="workLoad != null">work_load,</if>
             <if test="finishTime != null">finish_time,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">#{unit},</if>
             <if test="workLoad != null">#{workLoad},</if>
             <if test="finishTime != null">#{finishTime},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -61,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">unit = #{unit},</if>
             <if test="workLoad != null">work_load = #{workLoad},</if>
             <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where project_id = #{projectId}
     </update>

oa-back/sql/ry_20231130.sql

@@ -1271,7 +1271,7 @@ create table cmc_project  (
   project_id			char(19)				not null			comment '项目id',
   project_number		varchar(10)				default null		comment '项目编号',
   project_name			varchar(50)				default null		comment '项目名称',
-  project_leader		bigint					default null		comment '项目负责人',
+  project_leader		char(3)					default null		comment '项目负责人',
   is_finished			char(1)					default null		comment '项目状态（0进行中、1已结束）',
   project_source		char(1)					default null		comment '项目来源（0院内、1院外）',
   party_a				varchar(50)				default null		comment '甲方单位',
@@ -1279,71 +1279,72 @@ create table cmc_project  (
   telephone				char(11)				default null		comment '联系电话',
   project_type			char(20)				default null		comment '项目类型',
   project_level			char(1)					default null		comment '项目级别（0一般项目、1重大项目）',
-  project_registrant	bigint					default null		comment '项目登记人',
+  project_registrant	char(3)					default null		comment '项目登记人',
   create_time			datetime				default null		comment '项目登记时间',
+  remark				varchar(255)				default null		comment '项目备注',
   primary key (project_id)
 ) engine = innodb comment = 'cmc项目表';
 
 -- ----------------------------
 -- 初始化-项目表数据
 -- ----------------------------
-insert into `cmc_project` values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', null, '0', 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);
-insert into `cmc_project` values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', null, '0', 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);
-insert into `cmc_project` values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', null, '0', 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);
-insert into `cmc_project` values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', null, '0', 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);
-insert into `cmc_project` values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', null, '0', 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);
-insert into `cmc_project` values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', null, '0', 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);
-insert into `cmc_project` values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', null, '0', 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);
-insert into `cmc_project` values ('1679772570787774466', '2023W24', '双流地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', null, '0', 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);
-insert into `cmc_project` values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', null, '0', 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);
-insert into `cmc_project` values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', null, '1', 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);
-insert into `cmc_project` values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', null, '1', 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);
-insert into `cmc_project` values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', null, '1', 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);
-insert into `cmc_project` values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', null, '0', 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);
-insert into `cmc_project` values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', null, '0', 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);
-insert into `cmc_project` values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', null, '0', 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);
-insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平乐风电场地形图测绘', null, '0', 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);
+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);
 
 -- ----------------------------
 -- 24、cmc项目内容表
@@ -1356,6 +1357,7 @@ create table `cmc_project_work`  (
   `unit`			varchar(10)		default null	comment '单位',
   `work_load`		varchar(10)		default null	comment '工作量',
   `finish_time`		datetime		default null	comment '要求完成时间',
+  `remark`			varchar(255)		default null	comment '工作内容备注',
   primary key (`project_id`)
 ) engine = innodb comment = 'cmc项目内容表';