diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java index d99c772f8b..872dbc96a2 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java @@ -116,6 +116,6 @@ public class IssueProjectCategoryDictDTO implements Serializable { /** * 颜色 */ - private String colour; + private String color; } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java index a029bb6f00..1c1afbcc08 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java @@ -83,6 +83,6 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { /** * 颜色 */ - private String colour; + private String color; } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java index 8f719ff94c..dea3653428 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java @@ -30,7 +30,7 @@ public class CategoryListResultDTO implements Serializable { /** * 颜色 */ - private String colour; + private String color; /** * 1级分类长度 @@ -42,6 +42,6 @@ public class CategoryListResultDTO implements Serializable { this.categoryName = ""; this.count = NumConstant.ZERO; this.codeLength = NumConstant.ZERO; - this.colour = ""; + this.color = ""; } } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java index c55641f333..22ae365945 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java @@ -35,12 +35,12 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable { /** * 颜色 */ - private String colour; + private String color; public ResiBuzzLeftPieChartResultDTO() { this.count = NumConstant.ZERO; this.categoryCode = ""; this.categoryName = ""; - this.colour = ""; + this.color = ""; } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java index 7481f4f4ed..0a05d29091 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java @@ -86,6 +86,6 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { /** * 颜色 */ - private String colour; + private String color; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql index 81473802f7..0ed1ab2b24 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql @@ -1,87 +1,87 @@ -alter table issue_project_category_dict add column `COLOUR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`; +alter table issue_project_category_dict add column `COLOR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`; UPDATE issue_project_category_dict -SET colour = '#ffba00' +SET color = '#ffba00' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '市场监管'; UPDATE issue_project_category_dict -SET colour = '#ffd074' +SET color = '#ffd074' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '卫生计生监督执法'; UPDATE issue_project_category_dict -SET colour = '#42cd05' +SET color = '#42cd05' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '建设管理'; UPDATE issue_project_category_dict -SET colour = '#16d783' +SET color = '#16d783' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '文化执法'; UPDATE issue_project_category_dict -SET colour = '#00e5ed' +SET color = '#00e5ed' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '民政'; UPDATE issue_project_category_dict -SET colour = '#0091ed' +SET color = '#0091ed' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '其他'; UPDATE issue_project_category_dict -SET colour = '#1b51ff' +SET color = '#1b51ff' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '城市管理'; UPDATE issue_project_category_dict -SET colour = '#1641cc' +SET color = '#1641cc' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '公安交通管理'; UPDATE issue_project_category_dict -SET colour = '#2a00ff' +SET color = '#2a00ff' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '消防安全'; UPDATE issue_project_category_dict -SET colour = '#7800ff' +SET color = '#7800ff' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '创卫复审类'; UPDATE issue_project_category_dict -SET colour = '#c600ff' +SET color = '#c600ff' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '环境保护'; UPDATE issue_project_category_dict -SET colour = '#ff00d2' +SET color = '#ff00d2' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '安全监管'; UPDATE issue_project_category_dict -SET colour = '#ff2a00' +SET color = '#ff2a00' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '社会治安综治'; UPDATE issue_project_category_dict -SET colour = '#ff7800' +SET color = '#ff7800' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '食品药品监管'; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 8a81f0ab47..d955db65ef 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -637,12 +637,12 @@