From 355c80552e606d3448f2ebca078621f331fb5d10 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 13 Dec 2021 10:44:45 +0800 Subject: [PATCH] =?UTF-8?q?colour=E6=94=B9color=20=E4=BA=BA=E6=89=8D?= =?UTF-8?q?=E6=B5=8E=E6=B5=8E=20=E6=8E=89=E5=A4=B4=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java | 2 +- .../dto/govproject/result/ProjectCategoryTotalResultDTO.java | 2 +- .../service/govproject/impl/GovProjectServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java index 4555a86cd2..fc11fafe4f 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java @@ -87,7 +87,7 @@ public class IssueProjectCategoryDictDTO implements Serializable { /** * 颜色 */ - private String colour; + private String color; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java index 69e247e5d8..5ae7d12cda 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java @@ -19,7 +19,7 @@ public class ProjectCategoryTotalResultDTO implements Serializable { //一级分类名称 private String categoryName; //一级分类颜色 - private String colour = ""; + private String color = ""; //分类下项目总数 private Integer total = 0; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 0bb46ba328..7c821cffaa 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -373,7 +373,7 @@ public class GovProjectServiceImpl implements GovProjectService { if (ca.getCategoryCode().equals(l.getCategoryCode())) { dto.setCategoryCode(ca.getCategoryCode()); dto.setCategoryName(ca.getCategoryName()); - dto.setColour(ca.getColour()); + dto.setColor(ca.getColor()); } }); map.put(l.getCategoryCode(), l.getCategoryCode()); @@ -385,7 +385,7 @@ public class GovProjectServiceImpl implements GovProjectService { dto.setAgencyId(formDTO.getAgencyId()); dto.setCategoryCode(ca.getCategoryCode()); dto.setCategoryName(ca.getCategoryName()); - dto.setColour(ca.getColour()); + dto.setColor(ca.getColor()); resultList.add(dto); map.put(ca.getCategoryCode(), ca.getCategoryCode()); }