diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java index 356bff7769..ef8c8f0d11 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java @@ -38,6 +38,11 @@ public class ProjectDTO implements Serializable { */ private String id; + /** + * 客户ID + */ + private String customerId; + /** * 机关ID */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java index a0c82726ea..38de1c8e93 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java @@ -38,6 +38,11 @@ public class ProjectEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; + /** + * 客户ID + */ + private String customerId; + /** * 机关ID */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectExcel.java index 00424b5fc6..8bbdf111d7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectExcel.java @@ -34,6 +34,9 @@ public class ProjectExcel { @Excel(name = "唯一标识") private String id; + @Excel(name = " 客户ID") + private String customerId; + @Excel(name = " 机关ID") private String agencyId; diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql index f87285eecd..9265cad8c9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql @@ -41,7 +41,7 @@ CREATE TABLE `customer_project_parameter` ( DROP TABLE IF EXISTS `project`; CREATE TABLE `project` ( `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识', - `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT ' 机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '机关ID', `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '来源:议题issue', `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '来源ID', `TITLE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目标题', @@ -129,7 +129,7 @@ CREATE TABLE `project_staff` ( `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '网格ID', `ORG_ID_PATH` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属机关(11:22:33)', `STAFF_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '人员ID', - `IS_HANDLE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '是否处理:未处理unhandle,已处理handle', + `IS_HANDLE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '是否处理:未处理unhandled,已处理handle', `DEL_FLAG` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识:0.未删除 1.已删除', `REVISION` int(11) NOT NULL COMMENT '乐观锁', `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', @@ -148,3 +148,5 @@ alter table project_process add column OPERATION_NAME varchar(200) NOT NULL COMM alter table project_staff add column DEPARTMENT_NAME varchar(200) NOT NULL COMMENT '处理部门' after STAFF_ID; alter table project_process add column DEPARTMENT_NAME varchar(200) NOT NULL COMMENT '处理部门' after PROJECT_ID; + +alter table project add column CUSTOMER_ID varchar(64) NOT NULL COMMENT '客户ID' after ID;