From 09e0f8fbeef7d21e3cc00b5348b40f32a1c770c4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 12 Sep 2020 15:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=94=E6=9D=91=E5=A4=A7=E5=B1=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=87=87=E9=9B=86/data/stats/kcscreencoll/project/cat?=
 =?UTF-8?q?egorysummary=EF=BC=8C=E5=85=A5=E5=8F=82=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=80=E7=BA=A7=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?id=E4=B8=80=E7=BA=A7=E7=B1=BB=E5=88=AB=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java   | 4 ++--
 .../src/main/java/com/epmet/controller/DemoController.java    | 4 ++--
 .../screen/ScreenKcProjectCategoryGridDailyEntity.java        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java
index 495e3ac7f7..045e515fe1 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java
@@ -36,12 +36,12 @@ public class KcCategorySummaryFormDTO implements Serializable {
     private String allParentIds;
 
     /**
-     * 类别id
+     * 一级类别id
      */
     private String categoryId;
 
     /**
-     * 分类名称
+     * 一级分类名称
      */
     private String categoryName;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 59ed8ba771..360571a1e4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -168,9 +168,9 @@ public class DemoController {
 //        List<GridScoreDTO> gridScoreDTOList=gridScoreDao.selectList(formDTO);
 //        return new Result<List<GridScoreDTO>>().ok(gridScoreDTOList);
 
-        cpcIndexCalculateService.cpcIndexCalculate(formDTO);
+//        cpcIndexCalculateService.cpcIndexCalculate(formDTO);
         gridCorreLationService.calculateGridCorreLation(formDTO);
-        deptScoreService.calculateDeptCorreLation(formDTO);
+//        deptScoreService.calculateDeptCorreLation(formDTO);
         return new Result();
     }
     @DataSource(DataSourceConstant.EVALUATION_INDEX)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java
index 3307b3dcfa..ba35584411 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java
@@ -69,12 +69,12 @@ public class ScreenKcProjectCategoryGridDailyEntity extends BaseEpmetEntity {
 	private String allParentIds;
 
     /**
-     * 类别id
+     * 一级类别id
      */
 	private String categoryId;
 
     /**
-     * 分类名称
+     * 一级分类名称
      */
 	private String categoryName;