From d97ffae9bc771b4f8496bc46e8b7844459d34333 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Dec 2021 10:01:10 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=9B=B4=E5=B1=9E=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/AgencySubResultDTO.java  | 12 +++++++
 .../controller/CustomerGridController.java    |  2 +-
 .../resources/mapper/CustomerAgencyDao.xml    | 31 ++++++++++++++-----
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java
index 117976dee8..08bd0683b1 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java
@@ -49,4 +49,16 @@ public class AgencySubResultDTO implements Serializable {
      * 当前组织的所有上级组织Id
      */
     private String pids = "";
+    /**
+     * 组织级别
+     */
+    private String level = "";
+    /**
+     * 组织经度【没值取根组织的值】
+     */
+    private String longitude = "";
+    /**
+     * 组织维度【没值取根组织的值】
+     */
+    private String latitude = "";
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
index 9528ff6704..8422de2c41 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
@@ -314,7 +314,7 @@ public class CustomerGridController {
      * @Author sun
      * @Description 查询组织直属网格列表
      **/
-    @PostMapping("getGridIListByAgency/{agencyId}")
+    @PostMapping("getgridilistbyagency/{agencyId}")
     public Result<List<AgencyGridList>> gridListByAgencyId(@PathVariable("agencyId") String agencyId) {
         return new Result<List<AgencyGridList>>().ok(customerGridService.gridListByAgencyId(agencyId));
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 88ad6386d6..f5bca602f9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -178,13 +178,30 @@
 
     <select id="selectSubAgencyList" resultType="com.epmet.dto.result.AgencySubResultDTO">
         SELECT
-            id AS "agencyId",
-            organization_name AS "agencyName",
-            pids AS "pids"
-        FROM customer_agency
-        WHERE del_flag = '0'
-        AND pids = #{subAgencyPids}
-        ORDER BY created_time DESC
+            ca.id AS "agencyId",
+            ca.organization_name AS "agencyName",
+            ca.pids AS "pids",
+            ca.level level,
+	        ( CASE WHEN ca.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.longitude
+                END
+            ) longitude,
+            ( CASE WHEN ca.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.latitude
+                END
+            ) latitude
+        FROM customer_agency ca
+        WHERE ca.del_flag = '0'
+        AND ca.pids = #{subAgencyPids}
+        ORDER BY ca.created_time DESC
     </select>
 
     <select id="getCustomerRootAgency" resultType="com.epmet.dto.CustomerAgencyDTO">

From 38b16342c24325d27925089524c7399a03a4ef2e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Dec 2021 10:04:04 +0800
Subject: [PATCH 2/4] remark

---
 .../main/java/com/epmet/service/impl/IssueServiceImpl.java  | 6 +++++-
 .../java/com/epmet/service/impl/ProjectServiceImpl.java     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 4e7a09fd26..4a2b4821e2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -1586,6 +1586,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             formDTO.setOrgId(staffInfo.getAgencyId());
             formDTO.setOrgType(IssueConstant.ISSUE_AGENCY);
         }
+        // 分类编码长度
         Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
         PageInfo<ResiBuzzDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(),length));
         List<ResiBuzzDTO> list = pageInfo.getList();
@@ -1600,8 +1601,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         if (!usersResult.success()){
             throw new EpmetException("查询人员姓名失败...");
         }
+        // 默认最多50 产品要求
         Integer total = Integer.valueOf(String.valueOf(pageInfo.getTotal()));
         result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total);
+        // 赋值展示名字
         list.forEach(l -> {
             l.setSort(no.getAndSet(no.get() + NumConstant.ONE));
             usersResult.getData().forEach(u -> {
@@ -1631,6 +1634,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             formDTO.setOrgId(staffInfo.getAgencyId());
             formDTO.setOrgType(IssueConstant.ISSUE_AGENCY);
         }
+        // 分类编码长度
         Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
         List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId());
         if(CollectionUtils.isEmpty(result)){
@@ -1647,7 +1651,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
      */
     @Override
     public List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) {
-        List<ProjectDistributionAnalysisRightDTO> result = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
+        List<ProjectDistributionAnalysisRightDTO> result    = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 13b710ec7f..771dfd2d74 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -2982,6 +2982,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 	/**
 	 * @Description  区间项目分类数量处理
+	 * 查询的是时间段内的分类项目数，查询的时间 是传入一个日期，拼上时间，在进行比较大小
 	 * @param categories
 	 * @param date
 	 * @param listResult
@@ -2989,6 +2990,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * @date 2021/12/8 9:45 上午
 	 */
 	public List<ProjectDistributionAnalysisLeftResultDTO> disposeTimeInterval(List<ProjectCategoryByDateDTO> categories, String date,List<CategoryListResultDTO> listResult){
+		// 把一天分成6段
 		List<String> intervalTimeList = getIntervalTimeList("00:00", "24:00", 240);
 		List<ProjectDistributionAnalysisLeftResultDTO> result = new ArrayList<>();
 		Map<String, List<ProjectCategoryByDateDTO>> groupByCode = categories.stream().collect(Collectors.groupingBy(ProjectCategoryByDateDTO::getCategoryCode));

From 8580a2c467e6c843fef500d1f5bd56e46a7c70e0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 13 Dec 2021 10:44:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=8C=96=E5=85=9A?=
 =?UTF-8?q?=E5=BB=BA=E5=8D=95=E4=BD=8D=E6=BB=A1=E6=84=8F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/demand/FinishResultDTO.java    | 15 ++++++++++++
 .../controller/IcUserDemandRecController.java | 19 +++++++++++++--
 .../epmet/service/IcUserDemandRecService.java |  3 ++-
 .../impl/IcUserDemandRecServiceImpl.java      | 23 +++++++------------
 4 files changed, 42 insertions(+), 18 deletions(-)
 create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java
new file mode 100644
index 0000000000..96d03b9c2d
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java
@@ -0,0 +1,15 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 完成需求时，是否需要计算  区域化党建单位的满意度
+ *
+ */
+@Data
+public class FinishResultDTO implements Serializable {
+    private Boolean sendCalStatisfaction;
+    private String partyUnitId;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
index 9ce587e7b3..0d5567ad63 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
@@ -17,16 +17,21 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserDemandConstant;
+import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.FinishResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +64,8 @@ public class IcUserDemandRecController {
     private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService;
     @Autowired
     private IcPartyUnitService icPartyUnitService;
-
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     /**
      * 根据服务方类型查询  下拉框
@@ -178,7 +184,16 @@ public class IcUserDemandRecController {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO,FinishStaffFromDTO.AddUserShowGroup.class,FinishStaffFromDTO.AddUserInternalGroup.class);
-        icUserDemandRecService.finish(formDTO);
+        FinishResultDTO finishResultDTO=icUserDemandRecService.finish(formDTO);
+        if(finishResultDTO.getSendCalStatisfaction()){
+            CalPartyUnitSatisfactionFormDTO mqMsg = new CalPartyUnitSatisfactionFormDTO();
+            mqMsg.setCustomerId(formDTO.getCustomerId());
+            mqMsg.setPartyUnitId(finishResultDTO.getPartyUnitId());
+            SystemMsgFormDTO form = new SystemMsgFormDTO();
+            form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
+            form.setContent(mqMsg);
+            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+        }
         return new Result();
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
index 0ed62b84be..87ffcaa67f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.FinishResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.IcUserDemandRecEntity;
@@ -128,7 +129,7 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
      * 完成并评价
      * @param formDTO
      */
-    void finish(FinishStaffFromDTO formDTO);
+    FinishResultDTO finish(FinishStaffFromDTO formDTO);
 
     /**
      * 数据分析-个人档案，居民需求列表table
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 7f55c2ecfd..447531f7fd 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -20,7 +20,6 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -33,7 +32,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.dao.IcUserDemandOperateLogDao;
 import com.epmet.dao.IcUserDemandRecDao;
@@ -42,16 +40,15 @@ import com.epmet.dao.IcUserDemandServiceDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.FinishResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcResiDemandDictService;
@@ -91,8 +88,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
-    @Autowired
-    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+
 
     @Override
     public PageData<IcUserDemandRecDTO> page(Map<String, Object> params) {
@@ -414,7 +410,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void finish(FinishStaffFromDTO formDTO) {
+    public FinishResultDTO finish(FinishStaffFromDTO formDTO) {
         IcUserDemandRecEntity entity = baseDao.selectById(formDTO.getDemandRecId());
         if (null == entity) {
             throw new RenException(EpmetErrorCode.DEMAND_NOT_EXITS.getCode(), EpmetErrorCode.DEMAND_NOT_EXITS.getMsg());
@@ -462,18 +458,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         satisfactionEntity.setEvaluateTime(logEntity.getOperateTime());
         satisfactionEntity.setScore(formDTO.getScore());
         demandSatisfactionDao.insert(satisfactionEntity);
+        FinishResultDTO finishResultDTO=new FinishResultDTO();
+        finishResultDTO.setPartyUnitId(serviceEntity.getServerId());
+        finishResultDTO.setSendCalStatisfaction(false);
         //5、如果服务方区域化党建单位，需求重新计算当前这个单位的满意度。
-
         //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。
         if(UserDemandConstant.PARTY_UNIT.equals(serviceEntity.getServiceType())){
-            CalPartyUnitSatisfactionFormDTO mqMsg = new CalPartyUnitSatisfactionFormDTO();
-            mqMsg.setCustomerId(formDTO.getCustomerId());
-            mqMsg.setPartyUnitId(serviceEntity.getServerId());
-            SystemMsgFormDTO form = new SystemMsgFormDTO();
-            form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
-            form.setContent(mqMsg);
-            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+            finishResultDTO.setSendCalStatisfaction(true);
         }
+        return finishResultDTO;
     }
 
     /**

From 355c80552e606d3448f2ebca078621f331fb5d10 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Dec 2021 10:44:45 +0800
Subject: [PATCH 4/4] =?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());
 			}