项目变更

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

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +36,9 @@ public class CmcProjectChangeController extends BaseController
     @Autowired
     private ICmcProjectChangeService cmcProjectChangeService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询cmc项目变更列表
      */
@@ -41,6 +47,15 @@ public class CmcProjectChangeController extends BaseController
     {
         startPage();
         List<CmcProjectChange> list = cmcProjectChangeService.selectCmcProjectChangeList(cmcProjectChange);
+        for (CmcProjectChange project : list) {
+            String underTakingDept = project.getUndertakingDept();
+            StringBuilder underTakingDeptName = new StringBuilder();
+            if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
+                for (String dept : underTakingDept.split(","))
+                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
+                project.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+            }
+        }
         return getDataTable(list);
     }
 
@@ -52,6 +67,15 @@ public class CmcProjectChangeController extends BaseController
     public void export(HttpServletResponse response, CmcProjectChange cmcProjectChange)
     {
         List<CmcProjectChange> list = cmcProjectChangeService.selectCmcProjectChangeList(cmcProjectChange);
+        for (CmcProjectChange project : list) {
+            String underTakingDept = project.getUndertakingDept();
+            StringBuilder underTakingDeptName = new StringBuilder();
+            if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
+                for (String dept : underTakingDept.split(","))
+                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
+                project.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+            }
+        }
         ExcelUtil<CmcProjectChange> util = new ExcelUtil<CmcProjectChange>(CmcProjectChange.class);
         util.exportExcel(response, list, "cmc项目变更数据");
     }

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

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -21,16 +22,29 @@ public class CmcProjectChange extends BaseEntity
     private String changeId;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    @Excel(name = "承担部门")
+    private String undertakingDeptName;
+    private String undertakingDept;
+    private CmcProject project;
 
     /** 变更内容 */
     @Excel(name = "变更内容")
     private String content;
 
+    @Excel(name = "项目负责人")
+    private String leaderUserName;
+    private SysUser leaderUser;
+
     /** 登记人 */
-    @Excel(name = "登记人")
     private Long registrant;
+    @Excel(name = "登记人")
+    private String registrantUserName;
+    private SysUser registrantUser;
 
     /** 登记时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -55,6 +69,35 @@ public class CmcProjectChange extends BaseEntity
     {
         return projectId;
     }
+    public void setUndertakingDept(String undertakingDept)
+    {
+        this.undertakingDept = undertakingDept;
+    }
+
+    public String getUndertakingDept()
+    {
+        return undertakingDept;
+    }
+    public void setUndertakingDeptName(String undertakingDeptName)
+    {
+        this.undertakingDeptName = undertakingDeptName;
+    }
+
+    public String getUndertakingDeptName()
+    {
+        return undertakingDeptName;
+    }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
     public void setContent(String content) 
     {
         this.content = content;
@@ -73,6 +116,28 @@ public class CmcProjectChange extends BaseEntity
     {
         return registrant;
     }
+    public void setLeaderUser(SysUser leaderUser)
+    {
+        this.leaderUser = leaderUser;
+        this.leaderUserName = leaderUser == null ? "" : leaderUser.getNickName();
+
+    }
+
+    public SysUser getLeaderUser()
+    {
+        return leaderUser;
+    }
+    public void setRegistrantUser(SysUser registrantUser)
+    {
+        this.registrantUser = registrantUser;
+        this.registrantUserName = registrantUser == null ? "" : registrantUser.getNickName();
+
+    }
+
+    public SysUser getRegistrantUser()
+    {
+        return registrantUser;
+    }
     public void setRegisterTime(Date registerTime) 
     {
         this.registerTime = registerTime;

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

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcDeviceExpenseByDeviceExpenseId" parameterType="String" resultMap="CmcDeviceExpenseResult">
+    <select id="selectCmcDeviceExpenseByDeviceExpenseId" parameterType="Integer" resultMap="CmcDeviceExpenseResult">
         <include refid="selectCmcDeviceExpenseVo"/>
         where de.device_expense_id = #{deviceExpenseId}
     </select>

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

@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcDeviceHandoverByDeviceHandoverId" parameterType="String" resultMap="CmcDeviceHandoverResult">
+    <select id="selectCmcDeviceHandoverByDeviceHandoverId" parameterType="Integer" resultMap="CmcDeviceHandoverResult">
         <include refid="selectCmcDeviceHandoverVo"/>
         where dh.device_handover_id = #{deviceHandoverId}
     </select>

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

@@ -51,9 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcDeviceScrapByDeviceScrapId" parameterType="String" resultMap="CmcDeviceScrapResult">
+    <select id="selectCmcDeviceScrapByDeviceScrapId" parameterType="Integer" resultMap="CmcDeviceScrapResult">
         <include refid="selectCmcDeviceScrapVo"/>
-        where device_scrap_id = #{deviceScrapId}
+        where ds.device_scrap_id = #{deviceScrapId}
     </select>
         
     <insert id="insertCmcDeviceScrap" parameterType="CmcDeviceScrap">

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

@@ -7,28 +7,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcProjectChange" id="CmcProjectChangeResult">
         <result property="changeId"    column="change_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="content"    column="content"    />
         <result property="registrant"    column="registrant"    />
         <result property="registerTime"    column="register_time"    />
+        <association property="leaderUser"    javaType="SysUser"         resultMap="LeaderUserResult" />
+        <association property="registrantUser"    javaType="SysUser"         resultMap="RegistrantUserResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="LeaderUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="leader_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="RegistrantUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="registrant_nick_name"    />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
     </resultMap>
 
     <sql id="selectCmcProjectChangeVo">
-        select change_id, project_id, content, registrant, register_time from cmc_project_change
+        select pc.change_id, pc.project_id, p.project_name, p.project_number, p.undertaking_dept, pc.content, pc.registrant, u1.nick_name as registrant_nick_name, pc.register_time,
+        u.nick_name as leader_nick_name from cmc_project_change as pc
+        left join sys_user as u1 on u1.user_id = pc.registrant
+        left join cmc_project as p on p.project_id = pc.project_id
+        left join sys_user as u on u.user_id = p.project_leader
     </sql>
 
     <select id="selectCmcProjectChangeList" parameterType="CmcProjectChange" resultMap="CmcProjectChangeResult">
         <include refid="selectCmcProjectChangeVo"/>
         <where>  
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="registrant != null "> and registrant = #{registrant}</if>
-            <if test="registerTime != null "> and register_time = #{registerTime}</if>
+            <if test="projectId != null  and projectId != ''"> and pc.project_id = #{projectId}</if>
+            <if test="content != null  and content != ''"> and pc.content = #{content}</if>
+            <if test="registrant != null "> and pc.registrant = #{registrant}</if>
+            <if test="registerTime != null "> and pc.register_time = #{registerTime}</if>
+            <if test="undertakingDept != null "> and p.undertaking_dept like concat("%", #{undertakingDept} ,"%")</if>
         </where>
     </select>
     
     <select id="selectCmcProjectChangeByChangeId" parameterType="Long" resultMap="CmcProjectChangeResult">
         <include refid="selectCmcProjectChangeVo"/>
-        where change_id = #{changeId}
+        where pc.change_id = #{changeId}
     </select>
         
     <insert id="insertCmcProjectChange" parameterType="CmcProjectChange" useGeneratedKeys="true" keyProperty="changeId">

oa-back/sql/sql.sql

@@ -399,7 +399,8 @@ insert into sys_menu values('15', 	'预算管理', '2050', '3', 'budget',	'oa/bu
 insert into sys_menu values('16', 	'借款管理', '2050', '6', 'borrow',	'oa/borrow/index', 			'', 1, 0, 'C', '0', '0', 'oa:borrow:list', 	'borrow',	'admin', sysdate(), '', null, '借款管理菜单');
 insert into sys_menu values('17', 	'安全交底', '2050', '4', 'safe',	'oa/safe/index', 			'', 1, 0, 'C', '0', '0', 'oa:safe:list', 	'validCode','admin', sysdate(), '', null, '安全交底菜单');
 insert into sys_menu values('18', 	'技术方案', '2050', '5', 'technical','oa/technical/index', 		'', 1, 0, 'C', '0', '0', 'oa:technical:list','nested',	'admin', sysdate(), '', null, '技术方案菜单');
-insert into sys_menu values('19', 	'考核管理', '0', '7', 'assess',	'oa/assess/index', 			'', 1, 0, 'C', '0', '0', 'oa:assess:list',  'logininfor','admin',sysdate(), '', null, '考核管理菜单');
+insert into sys_menu values('19', 	'项目变更', '2050', '9', 'change',	'oa/project/change', 		'', 1, 0, 'C', '0', '0', 'oa:change:list',	'refresh',	'admin', sysdate(), '', null, '技术方案菜单');
+insert into sys_menu values('20', 	'考核管理', '0', 	'7', 'assess',	'oa/assess/index', 			'', 1, 0, 'C', '0', '0', 'oa:assess:list',  'logininfor','admin',sysdate(), '', null, '考核管理菜单');
 
 -- 二级菜单
 insert into sys_menu values('100',  '用户管理', '1',   '1', 'user',       'system/user/index',        '', 1, 0, 'C', '0', '0', 'system:user:list',        'user',          'admin', sysdate(), '', null, '用户管理菜单');
@@ -640,12 +641,18 @@ insert into sys_menu values('1159', '方案新增', '18', '2', '#', '', '', 1, 0
 insert into sys_menu values('1160', '方案修改', '18', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:technical:edit',           '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1161', '方案删除', '18', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:technical:remove',         '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1162', '方案导出', '18', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:technical:export',         '#', 'admin', sysdate(), '', null, '');
+-- 项目变更按钮
+insert into sys_menu values('1163', '变更查询', '19', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:change:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1164', '变更新增', '19', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:change:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1165', '变更修改', '19', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:change:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1166', '变更删除', '19', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:change:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1167', '变更导出', '19', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:change:export',          	'#', 'admin', sysdate(), '', null, '');
 -- 考核管理按钮
-insert into sys_menu values('1163', '考核查询', '19', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:query',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1164', '考核新增', '19', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1165', '考核修改', '19', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:edit',            	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1166', '考核删除', '19', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:remove',          	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1167', '考核导出', '19', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:export',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1168', '考核查询', '20', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1169', '考核新增', '20', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1170', '考核修改', '20', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1171', '考核删除', '20', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1172', '考核导出', '20', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:assess:export',          	'#', 'admin', sysdate(), '', null, '');
 -- -- 资料管理按钮
 -- insert into sys_menu values('1108', '资料查询', '14', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:query',			'#', 'admin', sysdate(), '', null, '');
 -- insert into sys_menu values('1109', '资料新增', '14', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:add',				'#', 'admin', sysdate(), '', null, '');
@@ -864,6 +871,7 @@ create table sys_role_menu (
 -- 初始化-角色和菜单关联表数据
 -- ----------------------------
 insert into `sys_role_menu` values (2, 14);
+insert into `sys_role_menu` values (2, 19);
 insert into `sys_role_menu` values (2, 100);
 insert into `sys_role_menu` values (2, 103);
 insert into `sys_role_menu` values (2, 1000);
@@ -893,10 +901,10 @@ insert into `sys_role_menu` values (3, 2048);
 insert into `sys_role_menu` values (4, 5);
 insert into `sys_role_menu` values (4, 120);
 insert into `sys_role_menu` values (4, 121);
+insert into `sys_role_menu` values (4, 122);
+insert into `sys_role_menu` values (4, 123);
+insert into `sys_role_menu` values (4, 124);
+insert into `sys_role_menu` values (4, 125);
 insert into `sys_role_menu` values (4, 1068);
 insert into `sys_role_menu` values (4, 1069);
 insert into `sys_role_menu` values (4, 1070);
@@ -910,9 +918,9 @@ insert into `sys_role_menu` values (4, 1077);
 insert into `sys_role_menu` values (4, 2048);
 insert into `sys_role_menu` values (5, 6);
 insert into `sys_role_menu` values (5, 126);
+insert into `sys_role_menu` values (5, 127);
+insert into `sys_role_menu` values (5, 128);
+insert into `sys_role_menu` values (5, 129);
 insert into `sys_role_menu` values (5, 1078);
 insert into `sys_role_menu` values (5, 1079);
 insert into `sys_role_menu` values (5, 1080);
@@ -950,19 +958,20 @@ insert into `sys_role_menu` values (7, 15);
 insert into `sys_role_menu` values (7, 16);
 insert into `sys_role_menu` values (7, 17);
 insert into `sys_role_menu` values (7, 18);
+insert into `sys_role_menu` values (7, 19);
+insert into `sys_role_menu` values (7, 20);
 insert into `sys_role_menu` values (7, 118);
 insert into `sys_role_menu` values (7, 119);
 insert into `sys_role_menu` values (7, 120);
 insert into `sys_role_menu` values (7, 121);
+insert into `sys_role_menu` values (7, 122);
+insert into `sys_role_menu` values (7, 123);
+insert into `sys_role_menu` values (7, 124);
+insert into `sys_role_menu` values (7, 125);
 insert into `sys_role_menu` values (7, 126);
+insert into `sys_role_menu` values (7, 127);
+insert into `sys_role_menu` values (7, 128);
+insert into `sys_role_menu` values (7, 129);
 insert into `sys_role_menu` values (7, 130);
 insert into `sys_role_menu` values (7, 131);
 insert into `sys_role_menu` values (7, 132);
@@ -1020,6 +1029,8 @@ insert into `sys_role_menu` values (7, 1158);
 insert into `sys_role_menu` values (7, 1162);
 insert into `sys_role_menu` values (7, 1163);
 insert into `sys_role_menu` values (7, 1167);
+insert into `sys_role_menu` values (7, 1168);
+insert into `sys_role_menu` values (7, 1172);
 insert into `sys_role_menu` values (7, 2048);
 insert into `sys_role_menu` values (7, 2049);
 insert into `sys_role_menu` values (7, 2050);
@@ -1071,7 +1082,7 @@ insert into `sys_role_menu` values (11, 1158);
 insert into `sys_role_menu` values (11, 1162);
 insert into `sys_role_menu` values (12, 17);
 insert into `sys_role_menu` values (12, 1153);
-insert into `sys_role_menu` values (12, 1167);
+insert into `sys_role_menu` values (12, 1157);
 
 -- ----------------------------
 -- 8、角色和部门关联表  角色1-N部门
@@ -1366,6 +1377,7 @@ insert into sys_dict_type values (24, '航飞机型', 'cmc_uav', '0', 'admin', '
 insert into sys_dict_type values (25, '成果类型', 'cmc_achi_type', '0', 'admin', '2022-10-14 11:16:00', '', NULL, NULL);
 insert into sys_dict_type values (26, '比例尺或等级', 'cmc_scale_grade', '0', 'admin', '2022-10-14 11:16:12', '', NULL, NULL);
 insert into sys_dict_type values (27, '员工状态', 'sys_post_status', '0', 'admin', '2022-10-14 11:16:12', '', NULL, NULL);
+insert into sys_dict_type values (28, '单位', 'cmc_unit', '0', 'admin', '2022-10-14 11:16:12', '', NULL, NULL);
 
 -- ----------------------------
 -- 12、字典数据表
@@ -7670,6 +7682,8 @@ INSERT INTO `cmc_price` VALUES (145, '内业-三维模型', '实景三维模型
 INSERT INTO `cmc_price` VALUES (146, '内业-三维模型', '实景三维模型制作', NULL, NULL, 'GSD 10cm～20cm', 'km²', 38.00, 38.00);
 INSERT INTO `cmc_price` VALUES (147, '内业-坐标转换', '坐标系转换', NULL, NULL, '无', '工天', 210.00, 210.00);
 INSERT INTO `cmc_price` VALUES (148, '内业-电子沙盘', '电子沙盘制作', NULL, NULL, '无', '工天', 210.00, 210.00);
+INSERT INTO `cmc_price` VALUES (149, '其他', '按天计算', NULL, NULL, '无', '天', 100.00, 100.00);
+INSERT INTO `cmc_price` VALUES (150, '其他', '按项计算', NULL, NULL, '无', '项', 100.00, 100.00);
 
 -- ----------------------------
 -- 39、cmc预算管理表
@@ -12341,7 +12355,7 @@ drop table if exists `cmc_project_change`;
 create table `cmc_project_change`  (
   `change_id` 		char(19) 		not null				comment '变更id',
   `project_id` 		char(19) 		default null 			comment '项目id',
-  `content` 		varchar(255) 	default null 			comment '变更内容',
+  `content` 		text			default null 			comment '变更内容',
   `registrant` 		bigint 			default null 			comment '登记人',
   `register_time` 	date 			default null 			comment '登记时间',
   primary key (`change_id`)
@@ -12350,6 +12364,117 @@ create table `cmc_project_change`  (
 -- ----------------------------
 -- 初始化-项目变更表数据
 -- ----------------------------
+INSERT INTO `cmc_project_change` VALUES ('1648881410555772930', '1648881410555772930', '4月24日增加1:2000地形地类图补测2.9KM2，,完成时间请与用户协商。城乡分公司联系人：王勇，15928683676', 21, '2023-04-26');
+INSERT INTO `cmc_project_change` VALUES ('1648881410631270403', '1648881410631270403', '工作量增加至63个平方公里。', 13, '2023-05-16');
+INSERT INTO `cmc_project_change` VALUES ('1648881410631270434', '1648881410631270434', '牙根一级比地吊桥和苦乐沟中桩放线测量及1:1000地形图测绘，老路边线及高程测量。联系人基础设施分公司：严群18512826373/18482022565，完成时间与用户现场协商。', 21, '2024-04-30');
+INSERT INTO `cmc_project_change` VALUES ('1648881410631270438', '1648881410631270438', 'ML公路控制网测量，控制网设计由技术部完成，并于基础设施分公司沟通后实施，完成时间待定。基础设施分公司联系人杨锐。', 21, '2024-04-26');
+INSERT INTO `cmc_project_change` VALUES ('1648881410815819777', '1648881410815819777', '新增：1、困牛山水库1:1000水下地形测绘，面积为0.2平方公里（要求和之前测的1000图接边）； 2、困牛山水库引水渠1:1000地形图测绘，面积约0.4平方公里（已在2023C01中，本次为补下任务，在本项目中结算）。', 13, '2023-03-07');
+INSERT INTO `cmc_project_change` VALUES ('1648881410832596993', '1648881410832596993', '拉哇水库CS20~拉哇坝址河段1:2000带状地形测绘（不含水下地形图）4月18日跟规划院王锐沟通落实明确实施。', 13, '2023-04-18');
+INSERT INTO `cmc_project_change` VALUES ('1648881410866151425', '1648881410866151425', '5月15日，新增1:5000地形图测绘（德吉2#沟、麦村东西沟2块），预计61.28KM2，联系人：城乡分公司陈歆怡17383469819，完成时间请杨振与用户协调。', 21, '2023-05-15');
+INSERT INTO `cmc_project_change` VALUES ('1648881410866151525', '1648881410866151425', '4月20日新增ML库区德吉1、德吉2、麦村、甲格、卧龙5块地方1:1000地形图测绘，公司现场负责人杨振，完成时间请杨振与用户沟通。', 21, '2023-04-21');
+INSERT INTO `cmc_project_change` VALUES ('1648881410866151625', '1648881410866151425', '新增甲格、真多村、麦村、卧龙噶加、里龙益当、里龙色比单噶、德吉居民点新址、扎绕拍立地坎娘、扎村9块地方1:2000地形图测绘工作，预计工作量6.9KM2，联系人：陈歆怡17383469819', 21, '2023-03-15');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491342', '1648881411499491342', '2024.5.7杨俊主任通知本项目新增了1.7平方千米的1:2000地形图测绘工作。', 23, '2024-05-07');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491343', '1648881411499491343', '贡白路渣场1:2000地形图测绘，面积0.038KM2，尽快完成。联系人：城乡分公司王增福：13281233292', 21, '2024-05-28');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491359', '1648881411499491359', '申弄沟右岸人工骨料场4.2平方公里1:2000地形图补测，工期按3月4日控制。', 13, '2024-02-28');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491363', '1648881411499491363', '新增上下库测图范围内DOM制作。', 13, '2023-09-01');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491365', '1648881411499491365', '偶曲及金沙江岩比河段的断面补充测量工作，断面测量共计26条。先测岩比段的，再测偶曲河段的断面。多与用户沟通，尽量满足他们的需要。联系人：城乡分公司王增福：13281233292，郑萍伟：13882289003', 21, '2023-10-12');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491372', '1648881411499491372', '汤坝外部供水1:1000地形图补测（2块），预计0.8KM2；桥梁高程补测，补测地物、地形线及拍照等工作。联系人城乡分公司张波：13708019335。请尽快完成。', 21, '2023-12-28');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491375', '1648881411499491375', '排涝区域1:2000地形图测绘改为1:5000地形图测绘，平面和高程控制取消不做，1:1000地形图缩编成1:5000地形图并与新测1:5000地形图拼接', 21, '2023-07-05');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491378', '1648881411499491378', '新增1:1000地形图测绘4.160KM2，1:5000地形图测绘6.002KM2（用1:1000的地形图缩编），工期项目负责人与用户沟通为准。', 13, '2023-11-24');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491379', '1648881411499491379', '新增4.8平方公里隆巴下库1:5000地形图测量，工期暂按10天考虑。飞行范围可外扩一些。', 13, '2023-11-22');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491381', '1648881411499491381', '增加1条路界桩测设工作，工作量以与用户沟通完成量为准，完成时间与用户沟通。联系人城乡分公司：施蔺，13540784140', 21, '2023-11-24');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491383', '1648881411499491383', '大坪安置点1:1000地形图测绘，联系人：李宗锴,18081555510；完成时间2023.12.18.', 21, '2023-12-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491384', '1648881411499491384', '老木孔排水口高程测量，放点位置见陈爽提供的CAD图。黄色框框涉及的排水口都需要测一下，在河里面的就不用测了，拍照就行。联系人城乡分公司陈爽：17340088515。预计9月11日下周一进场，完成时间与用户协商。', 21, '2023-09-07');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491387', '1648881411499491387', 'ML国道G219大断面测量14条（1:500），同时水边线测量，航拍视频及岸坡照片等，联系人：规划院：蒋陶（13568827702）、曾强（17311299553）。', 21, '2023-12-07');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491472', '1648881411499491372', '汤坝供水线路1:1000地形图补测，联系人城乡分公司张波13708019335，请尽快安排完成。', 21, '2023-09-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491487', '1648881411499491387', 'ML库区公路坐标转换，联系人基础设施分公司高绍清', 21, '2023-08-10');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491587', '1648881411499491387', '桥位1:500水下地形图测绘，3座桥，每座桥300M*200M范围。完成时间杨振与用户沟通。联系人杨锐：15208223387', 21, '2023-06-02');
+INSERT INTO `cmc_project_change` VALUES ('1648881411499491687', '1648881411499491387', '1:5000地形图测绘，11处，面积9.39平方公里，完成时间请杨振与用户协商。联系人：基础设施分公司聂柏琳18780019248', 21, '2023-06-02');
+INSERT INTO `cmc_project_change` VALUES ('1648881412153802753', '1648881412153802753', '按测图范围提供DOM及三维地形面。', 13, '2022-10-27');
+INSERT INTO `cmc_project_change` VALUES ('1648881412204134402', '1648881412204134402', '5000和2000范围需制作三维地形面。', 13, '2023-01-05');
+INSERT INTO `cmc_project_change` VALUES ('1648881412220911618', '1648881412220911618', '白石河1:500地形图测绘项目，用户通知取消。通知人：城乡分公司凌源媛15320349072', 21, '2023-05-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881412220911718', '1648881412220911618', '白石河瞭望塔及巡护步道1:500地形图补测，预计0.066平方公里，联系人：城乡分公司赖臻瑞：13990155739，完成与赖臻瑞协商，尽快完成。', 21, '2023-05-06');
+INSERT INTO `cmc_project_change` VALUES ('1648881412220911818', '1648881412220911618', '草米岗增测1:500地形图测绘，面积0.017353KM2，完成时间请与用户沟通。', 21, '2023-02-17');
+INSERT INTO `cmc_project_change` VALUES ('1648881412237688834', '1648881412237688834', '新增1:1000DOM制作，工作量以实际发生计。', 13, '2022-10-19');
+INSERT INTO `cmc_project_change` VALUES ('1648881412254466049', '1648881412254466049', '新增1:1000DOM制作，工作量以实际发生计。', 13, '2022-10-19');
+INSERT INTO `cmc_project_change` VALUES ('1648881412346740737', '1648881412346740737', '1:2000范围地形图改为地形地类图。', 13, '2022-08-26');
+INSERT INTO `cmc_project_change` VALUES ('1648881412401266689', '1648881412401266689', '新增1：1万地形图测绘（修测）25.6平方公里。', 13, '2022-09-28');
+INSERT INTO `cmc_project_change` VALUES ('1648881412514512898', '1648881412514512898', '新增2个平方公里1:1000地形地类图测绘，工期暂按20天考虑。', 13, '2022-08-17');
+INSERT INTO `cmc_project_change` VALUES ('1648881412573233153', '1648881412573233153', '测图范围内需提供水下地形，待汛期结束后具备条件再施测。', 13, '2022-07-22');
+INSERT INTO `cmc_project_change` VALUES ('1648881412682285058', '1648881412682285058', '1、工程区1:5000三维地形面制作（含水下地形） 2、右岸方案上库范围1:2000三维地形面制作 3、右岸方案下库进出水口1:2000三维地形面制作提交时间8月11日', 13, '2022-08-04');
+INSERT INTO `cmc_project_change` VALUES ('1648881412736811010', '1648881412736811010', '新增溢洪道0.33平方公里1:1000地形图测绘，新增库区5000三维地形面。', 13, '2022-06-22');
+INSERT INTO `cmc_project_change` VALUES ('1648881412892000257', '1648881412892000257', '新增0.88平方公里1:2000地形图测绘。', 13, '2022-08-22');
+INSERT INTO `cmc_project_change` VALUES ('1648881412892000357', '1648881412892000257', '新增工程区1：2000地形图测绘5.98平方公里，新增1:5000地形图测绘4.28平方公里，新增各比例尺三维地形面，新增2个五等GNSS测量，新增四等高程测量3公里。工期以与业主沟通落实而定。', 13, '2022-07-04');
+INSERT INTO `cmc_project_change` VALUES ('1648881413164630018', '1648881413164630018', '新增成雅工业园区百丈安置房一期房屋建筑面积测绘，预估面积5万平方米，城乡分公司联系人：邓韬略15882318271，完成时间10月19日。', 13, '2022-10-10');
+INSERT INTO `cmc_project_change` VALUES ('1648881413164630118', '1648881413164630018', '新增百丈镇安置区二期项目1:500地形图测绘，面积约93465平方米。', 13, '2022-09-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881413181407233', '1648881413181407233', '台山黄茅岗工程区补充测量12平方公里（航飞按1：1000 精度、成图按1：5000精度），工期暂按外业飞行结束后5日内提交资用成果控制。', 13, '2022-07-14');
+INSERT INTO `cmc_project_change` VALUES ('1648881413181407333', '1648881413181407233', '新增梅县杨背樟料场1:5000地形图4.32平方公里；梅县九龙嶂及台山黄茅岗工程区制作1:5000DOM及三维地形面（注意：料场不需要）。', 13, '2022-05-25');
+INSERT INTO `cmc_project_change` VALUES ('1648881413210767362', '1648881413210767362', '1、大川镇停车场1:500地形图补测，预计0.2KM2,2块； 2、杨开村停车场1:500地形图测绘，预计0.1KM2。联系人：城乡分公司黄文虎，13982236680', 13, '2022-08-10');
+INSERT INTO `cmc_project_change` VALUES ('1648881413210767462', '1648881413210767362', '新增工作内容：1、芦山县乐家坝停车楼1:500宗地图测绘0.1平方公里；联系人：城乡分公司黄文虎，13982236680', 13, '2022-08-05');
+INSERT INTO `cmc_project_change` VALUES ('1648881413210767562', '1648881413210767362', '新增工作内容：1、芦山县乐家坝停车楼1:500地形图测绘0.1平方公里； 2、芦山县西街老财政局停车场1:500地形图测绘0.1平方公里； 3、芦山县黎明新村停车场1:500地形图测绘0.1平方公里； 4、芦山县大川镇文化站停车场1:500地形图测绘0.1平方公里； 5、芦山县大川镇露营地1:1000地形图测绘0.1平方公里； 6、五等GNSS测量20个。（2000国家大地坐标，85国家高程基准；）工期：6月16日前完成；联系人：城乡分公司赖臻瑞，13990155739', 13, '2022-06-02');
+INSERT INTO `cmc_project_change` VALUES ('1648881413244321794', '1648881413244321794', '1:2000范围的地形图改为地形地类图，工期15天，移民专业联系人冯春：13981823592', 13, '2022-07-05');
+INSERT INTO `cmc_project_change` VALUES ('1648881413244321894', '1648881413244321794', '1:2000范围内的缩编为1:5000，同时制作三维地形面。', 13, '2022-05-25');
+INSERT INTO `cmc_project_change` VALUES ('1648881413412093953', '1648881413412093953', '新增约18平方公里1:1000DOM制作，范围已发赵洪，9月1日前提交。', 13, '2022-08-25');
+INSERT INTO `cmc_project_change` VALUES ('1648881413483397121', '1648881413483397121', '新增楞古上坝址~楞古中坝址（力丘河汇口以下约300M）雅砻江干流河段、支流力丘河河口~河口以上2.5KM河段的2430M高程以下1:1000地形图测绘（含水下），面积约0.415平方公里。', 13, '2022-04-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881413529534465', '1648881413529534465', '该范围内的水下地形复核工作1项。', 13, '2022-03-30');
+INSERT INTO `cmc_project_change` VALUES ('1648881413667946498', '1648881413667946498', '孙家沟实物指标配合测量，2块地方，预计2人，5天。联系人城乡分公司张波13708019335.进场时间5月16日，完成时间5月22日', 13, '2022-05-11');
+INSERT INTO `cmc_project_change` VALUES ('1648881413667946598', '1648881413667946498', '牛棚子沟泥石流治理工程初步设计1:1000地形图测绘工作量变更为0.52平方公里，新增牛棚子沟泥石流治理拟设坝1:500地形图测绘0.16平方公里，新增磨子沟取水口1:500地形图测绘0.1平方公里。', 13, '2022-02-25');
+INSERT INTO `cmc_project_change` VALUES ('1648881414213206018', '1648881414213206018', '放样测量40点（图根精度），视频航拍飞行8KM', 13, '2022-01-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881414410338305', '1648881414410338305', '1:2000范围的地形图改为地形地类图，工期15天，移民专业联系人冯春：13981823592', 13, '2022-07-05');
+INSERT INTO `cmc_project_change` VALUES ('1648881414410338405', '1648881414410338305', '新增料场0.7平方公里1:2000地形图测绘和三维地形面制作。', 13, '2022-05-11');
+INSERT INTO `cmc_project_change` VALUES ('1648881414641025025', '1648881414641025025', '新增84KM1:1000断面测量工作，用户方联系人：刘家富，电话：13548009012，工期：视现场情况尽快实施，11月底前完成。', 13, '2021-11-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881414657802242', '1648881414657802242', '新增龚嘴渣场1/1000地形图测量（含水下地形）,（业主严锦林，电话13881352845）', 13, '2021-10-12');
+INSERT INTO `cmc_project_change` VALUES ('1648881414674579458', '1648881414674579458', '新增坐标转换工作1项，图纸已交项目管理部，转换工作量及时报我部。', 13, '2021-10-12');
+INSERT INTO `cmc_project_change` VALUES ('1648881414674579558', '1648881414674579458', '新增小河坝居民点供水1:500补测0.32平方公里，安靖供水点1:500地形图0.013平方公里，安靖供水站取水口1:500地形图0.112平方公里', 13, '2021-09-30');
+INSERT INTO `cmc_project_change` VALUES ('1648881414976569346', '1648881414976569346', '1:2000范围的地形图改为地形地类图，工期暂定于8月中旬，移民专业联系人冯春：13981823592', 13, '2022-07-05');
+INSERT INTO `cmc_project_change` VALUES ('1648881414976569446', '1648881414976569346', '成图范围均需提供三维地形面。', 13, '2021-08-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881415047872514', '1648881415047872514', '新增18.5平方公里1:2000地形图测量。', 13, '2021-09-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881415047872614', '1648881415047872514', '成图范围均需提供三维地形面。', 13, '2021-08-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881415047872714', '1648881415047872514', '淹没区任务取消，新增29平方公里1:5000地形图测量。', 13, '2021-08-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881415265976322', '1648881415265976322', '成图范围均需提供三维地形面。', 13, '2021-08-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881415429554178', '1648881415429554178', '新增20个特征点放样。', 13, '2021-08-24');
+INSERT INTO `cmc_project_change` VALUES ('1648881415458914305', '1648881415458914305', '成图范围均需提供三维地形面。实景三维模型', 13, '2021-08-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881415588937730', '1648881415588937730', '2021.6.25增加外业调绘工作，比例尺1：2000，调绘面积68平方千米。', 23, '2021-06-25');
+INSERT INTO `cmc_project_change` VALUES ('1648881415832207361', '1648881415832207361', '增加1:2000地形图工作量5.783KM2。', 13, '2021-05-25');
+INSERT INTO `cmc_project_change` VALUES ('1648881415861567490', '1648881415861567490', '邓家桥1:1000地形图测绘，0.3平方公里，联系人李美蓉，测绘项目负责人李锋。', 21, '2021-05-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881416029339649', '1648881416029339649', '绰斯甲干流及支沟河段视频航摄，预计40KM，联系人周静13350870068，测绘负责人李锋', 21, '2021-05-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881416029339749', '1648881416029339649', '（1）、5#渣场1:500地形图测量及断面测量，工作量根据实际计，联系人：何富刚；（2）、浦西乡上游场地1:500水下地形图测绘及堤防上下高程测量，联系人：罗鹏，18161377583', 21, '2021-04-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881416029339849', '1648881416029339649', '浦西乡上游场地1:500地形图测绘，预计0.2平方公里，李锋完成。', 21, '2021-04-20');
+INSERT INTO `cmc_project_change` VALUES ('1648881416163557378', '1648881416163557378', '八窝龙施工场地1:500地形图补测,0.26平方公里', 21, '2021-03-22');
+INSERT INTO `cmc_project_change` VALUES ('1648881416260026369', '1648881416260026369', '三道桥地勘钻孔放样测量；水桥村1:500地形图补测，公路外侧测至水边。联系人城乡分公司：张波13708019335', 21, '2021-06-01');
+INSERT INTO `cmc_project_change` VALUES ('1648881416260026469', '1648881416260026369', '1、康定市牛棚子村1:1000地形图测绘，预计0.3KM2，五等GNSS测量3点，联系人：张波，13708019335； 2、康定市三道桥村1:1000地形图补测，预计1.2KM2，引水线路1:2000地形图测绘，预计1.4平方，联系人：张波，13708019335', 21, '2021-04-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881416260026569', '1648881416260026369', '1、康定市三道桥村1:1000地形图测绘，面积约0.93平方公里； 2、康定市水桥村1:500地形图测绘，面积约0.5平方公里； 3、康定市水桥村引水线路1:1000地形图测绘，面积约0.8平方公里。', 21, '2021-03-29');
+INSERT INTO `cmc_project_change` VALUES ('1648881416310358017', '1648881416310358017', '新联料场供水补测约0.18平方公里', 13, '2021-09-01');
+INSERT INTO `cmc_project_change` VALUES ('1648881416310358117', '1648881416310358017', '新联料场坐标转换（转成1954北京坐标系），联系人城乡分公司：张波13708019335', 21, '2021-06-01');
+INSERT INTO `cmc_project_change` VALUES ('1648881416360689665', '1648881416360689665', '名称变更为：瀑布沟水电站武警营房扩建等1:500地形图，其它不变；联系人增加地质工程院钟果：13558898894', 21, '2021-03-03');
+INSERT INTO `cmc_project_change` VALUES ('1648881416394244098', '1648881416394244098', '双江口双柏树钻孔放样测量人工配合16人天。（后补）', 13, '2021-09-18');
+INSERT INTO `cmc_project_change` VALUES ('1648881416499101698', '1648881416499101698', '引水线路1:1000地形图测绘，引水水源需要把沟和路测到，两侧再多测个10M', 21, '2021-01-25');
+INSERT INTO `cmc_project_change` VALUES ('1648881416792702977', '1648881416792702977', '多吉坝址三维地形面制作约2.9平方公里。', 13, '2021-06-22');
+INSERT INTO `cmc_project_change` VALUES ('1648881417723838466', '1648881417723838466', '雾化区1:1000地形图和三维地形面制作，工作量由1.0KM2变更为1.9KM2，其他不变。', 21, '2020-11-12');
+INSERT INTO `cmc_project_change` VALUES ('1648881417736421378', '1648881417736421378', '依生沟渣场1:1000地形图测绘，面积约1.23KM2，联系人：刘放 13980409051', 21, '2020-11-25');
+INSERT INTO `cmc_project_change` VALUES ('1648881417753198593', '1648881417753198593', '双江口征地红线图ARCGIS构面，20201106安排，20201109提交成果。联系人：罗鹏，13408698670', 21, '2020-11-09');
+INSERT INTO `cmc_project_change` VALUES ('1648881417753198693', '1648881417753198593', '增加：大石凼场平和斯米勒俄场平2幅图坐标转换，城乡发展分公司联系人罗鹏：13408698670；完成时间：2020年11月9日。', 21, '2020-11-05');
+INSERT INTO `cmc_project_change` VALUES ('1648881417782558721', '1648881417782558721', '两河口水电站车渡码头1:1000地形图测绘（3块：右岸车渡码头、左岸车渡码头、左岸料场），面积约 2.08KM2，完成时间2020.11.20。城乡分公司联系人：王增福 13281233292', 21, '2020-11-05');
+INSERT INTO `cmc_project_change` VALUES ('1648881418197794818', '1648881418197794818', '闸坝左右岸及闸坝本身1:500地形图测绘，范围：左岸从上游0-200～下游0+400，右岸从上游0-200～下游0+400。右岸增加100M范围', 21, '2020-09-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881418214572034', '1648881418214572034', '汉源县万里工业园区白岩河堤防修复工程新增测量及初步设计补测要求 1、海子河坝基础重建段起点、终点及中间桥下位置处补测已损毁河堤基础断面和高程，现有完好部分河堤基础高程，详见附图。 2、新增固床坝处现状河床及两岸高程，若有挡墙，应测出其断面，固床坝位置见附图。 3、工程河段所有现有固床坝在平面图中表示，并测量其高程及断面。 4、附图中基础加固段应测出其河底高程，并提供各段典型断面。 5、增测3个范围（范围内若有已损毁堤防应表示，并测完好段典型断面）、29个大断面，见KML文件。 联系人，任萧 13628025974', 21, '2020-12-31');
+INSERT INTO `cmc_project_change` VALUES ('1648881418256515073', '1648881418256515073', '增加1:500水下地形图测绘，范围：现有设计坝址上游3KM，下游测至水上范围结束的地方，水下地形最好能跟刚测的水上的地形接边。左岸水渠部分测至小周村桥的位置。完成时间尽快，目前能测多少算多少？测不到部分等汛期过后再去补测。', 21, '2020-09-16');
+INSERT INTO `cmc_project_change` VALUES ('1648881418327818241', '1648881418327818241', '双江口水电站足木足集镇施工用地范围国家2000坐标系测量，161点。双江口测量中心李锋完成', 21, '2020-09-30');
+INSERT INTO `cmc_project_change` VALUES ('1648881418327818341', '1648881418327818241', '孔龙集镇场地平整布置图坐标转换，转换成国家2000大地坐标，完成后工作量尽快报给我，城乡发展分公司联系人金勇：13550046031', 21, '2020-07-14');
+INSERT INTO `cmc_project_change` VALUES ('1648881418369761282', '1648881418369761282', '2020年6月29日，项目临时被甲方叫停。', 0, '2020-06-30');
+INSERT INTO `cmc_project_change` VALUES ('1648881418441064449', '1648881418441064449', '坝区开挖竣工1:1000地形图修补测，开挖竣工1:1000三维地形面制作。现场联系人：马行东13795668566，资料提交时间7月29日', 21, '2020-06-29');
+INSERT INTO `cmc_project_change` VALUES ('1648881418441064549', '1648881418441064449', '增加两项工作内容： 1、阿斯布土料场三维地形面制作； 2、当卡料场三维地形面制作。完成时间6月19日前。', 21, '2020-06-09');
+INSERT INTO `cmc_project_change` VALUES ('1648881418441064649', '1648881418441064449', '阿斯布土料场1:1000断面测量，变更为阿斯布土料场、当卡料场1:1000地形图修补测，地形变化范围进行修补测。预计工作量', 21, '2020-06-09');
+INSERT INTO `cmc_project_change` VALUES ('1648881418453647362', '1648881418453647362', '完成时间变更为6月15日，如果确实无法完成，请提前与用户协商。', 21, '2020-06-09');
+INSERT INTO `cmc_project_change` VALUES ('1648881418483007490', '1648881418483007490', '数据采集 100KM2；激光点云数据处理、分类 100KM2；正射影像图制作 100KM2；1:2000地形图制作 75KM2。', 21, '2020-08-03');
+INSERT INTO `cmc_project_change` VALUES ('1648881418558504961', '1648881418558504961', '新增测图范围正射影像制作，面积约53平方公里。', 13, '2022-07-19');
+INSERT INTO `cmc_project_change` VALUES ('1648881418592059394', '1648881418592059394', '1:1000水下地形图测绘，1:1000横断面测量，3KM（11条），断面基点22点，汛期结束后视现场情况开展，完成时间预计11月30日；图纸及坐标点坐标转换，465点，7月31日提交资料', 21, '2020-06-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881418696916993', '1648881418696916993', '料场1:1000地形图测绘，预计0.183KM2；天然气管道测量（1:1000），预计0.8KM；参考点测量13点', 21, '2020-04-16');
+INSERT INTO `cmc_project_change` VALUES ('1648881418764025857', '1648881418764025857', '曾家沟1:1000地形图测绘，在原曾家沟1:5000地形图范围内测1:1000，工作量以实际完成为准。', 21, '2021-02-23');
+INSERT INTO `cmc_project_change` VALUES ('1648881418764025957', '1648881418764025857', '老鹰岩一级水电站曾家沟曾家沟泥石流1:5000地形图测绘，8.3 KM2，完成时间：尽快完成。项目部联系人：刘云鹏，15928752650', 21, '2020-11-09');
+INSERT INTO `cmc_project_change` VALUES ('1648881419086987266', '1648881419086987266', '汉源湖景观坝（一期）料场（一）或料场（二）1:2000地形地类图测绘，或者按地方（例如某某料场）。联系人城乡发展分公司梁炎13908183297', 21, '2020-01-08');
+INSERT INTO `cmc_project_change` VALUES ('1648881419128930305', '1648881419128930305', '项目新增2块1:2000 DOM制作，面积3.5平方公里', 21, '2019-12-04');
+INSERT INTO `cmc_project_change` VALUES ('1648881419313479682', '1648881419313479682', '铜街子水电站枢纽1:200地形图测绘，根据用户要求进行测量。预计完成时间1月15日。项目部联系人：向涛：87399920、18581885020；业主现场联系人：郑有全：18227866606。到现场后，及时与业主联系人联系。', 21, '2020-01-06');
+INSERT INTO `cmc_project_change` VALUES ('1648881421276413954', '1648881421276413954', '1、汪子岩水库1:2000数字线划专用图（DLG）、数字高程模型（DEM）、正射影像图（DOM）制作，1.12 KM2； 2、马桥河1:2000数字线划专用图（DLG）、数字高程模型（DEM）、正射影像图（DOM）制作，2.66 KM2； 3、磨刀岩河1:2000数字线划专用图（DLG）、数字高程模型（DEM）、正射影像图（DOM）制作，2.64 KM2； 4、中嘴河1:2000数字线划专用图（DLG）、数字高程模型（DEM）、正射影像图（DOM）制作，1.9 KM2； 5、大佛岩水库1:2000数字线划专用图（DLG）、数字高程模型（DEM）、正射影像图（DOM）制作，0.29 KM2； 6、石柱房水库右岸支流1:2000数字线划专用图（DLG）、数字高程模型（DEM）、正射影像图（DOM）制作，0.6 KM2； 7、龙兴寺水库1:2000数字线划专用图（DLG）、数字高程模型（DEM）、正射影像图（DOM）制作，0.74 KM2； 8、泸江水库1:2000数字线划专用图（DLG）、数字高程模型（DEM）、正射影像图（DOM）制作，0.85 KM2； 9、汪子岩水库、马桥河、磨刀岩河、中嘴河、大佛岩水库、石柱房水库右岸支流、龙兴寺水库、泸江水库告示牌制作与安装，18点/座； 10、汪子岩水库、马桥河、磨刀岩河、中嘴河、大佛岩水库、石柱房水库右岸支流、龙兴寺水库、泸江水库、双河', 21, '2020-01-07');
 
 -- ----------------------------
 -- 69、cmc项目分包合同表

oa-ui/src/assets/icons/svg/refresh.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1718958475481" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4302" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M544.56312 1023.978003h-389.753564c-51.093913 0-92.788945-42.094985-92.788945-93.988802v-836.000399c0-51.793829 41.795021-93.988802 92.988921-93.988802h701.216457c51.393877 0 92.988921 42.194973 92.988921 94.188778v463.744749c0 18.79776-15.198189 34.095938-34.095938 34.095938s-34.095938-15.198189-34.095938-34.095938v-463.544773c0-14.298296-11.198666-25.896915-24.797045-25.896914h-701.216457c-13.698368 0-24.797046 11.49863-24.797046 25.696938v836.000399c0 14.398285 10.798713 25.696938 24.497082 25.696938h389.753564c18.79776 0 34.095938 15.198189 34.095938 34.095938 0 18.79776-15.098201 33.99595-33.99595 33.99595zM768.936388 337.159831h-526.537268c-18.79776 0-34.095938-15.198189-34.095937-34.095938s15.198189-34.095938 34.095937-34.095938h526.537268c18.79776 0 34.095938 15.198189 34.095938 34.095938s-15.198189 34.095938-34.095938 34.095938zM534.864276 516.338483h-292.465156c-18.79776 0-34.095938-15.198189-34.095937-34.095938s15.198189-34.095938 34.095937-34.095937h292.465156c18.79776 0 34.095938 15.198189 34.095938 34.095937s-15.198189 34.095938-34.095938 34.095938zM739.639879 964.285114c-115.586229 0-209.575031-95.788588-209.575031-213.27459 0-18.79776 15.198189-34.095938 34.095938-34.095938 18.79776 0 34.095938 15.198189 34.095937 34.095938 0 79.99047 63.492435 145.082715 141.283168 145.082715 19.897629 0 39.095342-4.1995 57.193186-12.398523 17.197951-7.799071 37.395545-0.199976 45.194615 16.897987 7.799071 17.197951 0.199976 37.395545-16.897987 45.194615-26.896795 12.198547-55.593377 18.497796-85.389826 18.497796z m175.579081-179.178652c-18.79776 0-34.095938-15.198189-34.095938-34.095938 0-79.99047-63.492435-145.082715-141.283167-145.082715-18.697772 0-36.995592 3.699559-54.093555 10.99869-17.397927 7.399118-37.395545-0.699917-44.794663-17.997856-7.399118-17.397927 0.699917-37.395545 17.997855-44.794663 25.696938-10.898702 52.893698-16.398046 80.890363-16.398046 115.586229 0 209.575031 95.788588 209.575031 213.27459-0.099988 18.79776-15.398165 34.095938-34.195926 34.095938zM681.146848 665.620698h-58.593019c-11.798594 0-22.697296-6.099273-28.896558-16.098083-6.199261-9.998809-6.79919-22.397332-1.699797-33.096056l29.296509-59.792877c5.799309-11.798594 17.597903-19.097725 30.596355-19.097724 13.098439 0 24.997022 7.399118 30.596355 19.097724l29.296509 59.792877c5.199381 10.598737 4.599452 22.99726-1.699797 33.096056-6.099273 10.098797-17.197951 16.098082-28.896557 16.098083zM826.929479 973.683995h-1.199857c-11.798594-0.399952-22.597308-6.79919-28.396617-16.997975l-29.296509-50.593972c-5.899297-10.198785-6.099273-22.697296-0.599929-33.096057 5.499345-10.398761 16.098082-17.197951 27.796688-17.997856l66.39209-4.599452c12.998451-0.799905 25.296986 5.799309 31.8962 16.997975 6.499226 11.298654 5.999285 25.296986-1.199857 36.095699l-37.09558 55.193425c-6.399238 9.39888-16.897987 14.998213-28.296629 14.998213z" p-id="4303" fill="#ffffff"></path></svg>

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

@@ -0,0 +1,244 @@
+<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="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
+      </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="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:change:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="projectChangeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column label="项目编号" align="center" width="80" prop="project.projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" />
+      <el-table-column label="承担部门" align="center" prop="undertakingDeptName" />
+      <el-table-column label="项目负责人" align="center" width="90" prop="leaderUser.nickName" />
+      <el-table-column label="变更内容" align="center" width="600" prop="content" />
+      <el-table-column label="登记人" align="center" width="80" prop="registrantUser.nickName" />
+      <el-table-column label="登记时间" align="center" prop="registerTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.registerTime, '{y}-{m}-{d}') }}</span>
+        </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="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <el-form-item label="变更内容" prop="content">
+          <el-input v-model="form.content" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="登记人" prop="registrant">
+          <el-input v-model="form.registrant" placeholder="请输入登记人" />
+        </el-form-item>
+        <el-form-item label="登记时间" prop="registerTime">
+          <el-date-picker clearable
+            v-model="form.registerTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择登记时间">
+          </el-date-picker>
+        </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 { listProjectChange, getProjectChange, delProjectChange, addProjectChange, updateProjectChange } from "@/api/oa/project/projectChange";
+import { listProject } from '@/api/oa/project/project';
+import { mapGetters } from 'vuex';
+
+export default {
+  name: "ProjectChange",
+  computed: {
+    ...mapGetters(['deptId'])
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc项目变更表格数据
+      projectChangeList: [],
+      projectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        undertakingDept: null,
+        content: null,
+        registrant: null,
+        registerTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc项目变更列表 */
+    getList() {
+      this.loading = true;
+      if (this.deptId > 107) {
+        this.queryParams.undertakingDept = this.deptId
+      }
+      listProjectChange(this.queryParams).then(response => {
+        this.projectChangeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    remoteMethod(val) {
+      if (this.deptId > 107) {
+        this.queryParams.undertakingDept = this.deptId
+      }
+      this.queryParams.projectNumber = val;
+      listProject(this.queryParams).then(res => {
+        this.projectList = res.rows;
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        changeId: null,
+        projectId: null,
+        content: null,
+        registrant: null,
+        registerTime: 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.changeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc项目变更";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const changeId = row.changeId || this.ids
+      getProjectChange(changeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc项目变更";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.changeId != null) {
+            updateProjectChange(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProjectChange(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const changeIds = row.changeId || this.ids;
+      this.$modal.confirm('是否确认删除cmc项目变更编号为"' + changeIds + '"的数据项？').then(function() {
+        return delProjectChange(changeIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/projectChange/export', {
+        ...this.queryParams
+      }, `projectChange_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>