From 378d5d73a26ae76b90d0e05cd65f473025c1eb35 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Sun, 28 Jun 2020 14:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=A8=8B=E5=BA=8FBug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/StatsProjectServiceImpl.java     | 4 ++--
 .../src/main/resources/mapper/project/ProjectProcessDao.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
index 0c4793e565..1dbb6f81f1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
@@ -246,7 +246,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 agencyDailyEntity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) closedTotal.intValue())));
             }
             agencyDailyEntity.setProjectIncr(projectIncr.intValue());
-            agencyDailyEntity.setPendingIncr(projectIncr.intValue() - closedIncr.intValue());
+            agencyDailyEntity.setPendingIncr(projectIncr.intValue());
             agencyDailyEntity.setClosedIncr(closedIncr.intValue());
             agencyDailyEntity.setResolvedIncr(resolvedIncr.intValue());
             agencyDailyEntity.setUnresolvedIncr(unResolvedIncr.intValue());
@@ -539,7 +539,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 gridDailyEntity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) closedTotal.intValue())));
             }
             gridDailyEntity.setProjectIncr(projectIncr.intValue());
-            gridDailyEntity.setPendingIncr(projectIncr.intValue() - closedIncr.intValue());
+            gridDailyEntity.setPendingIncr(projectIncr.intValue());
             gridDailyEntity.setClosedIncr(closedIncr.intValue());
             gridDailyEntity.setResolvedIncr(resolvedIncr.intValue());
             gridDailyEntity.setUnresolvedIncr(unResolvedIncr.intValue());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
index 9f839a668e..5f6816ff3b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
@@ -5,9 +5,9 @@
 
     <select id="selectProcessList" resultType="com.epmet.entity.project.ProjectProcessEntity">
         SELECT
-            pro.project_id,
-            pro.operation,
-            DATE_FORMAT(pro.created_time, "%Y-%m-%d"),
+            pro.project_id AS "projectId",
+            pro.operation AS "operation",
+            DATE_FORMAT(pro.created_time, "%Y-%m-%d") AS "createdTime",
             p.agency_id
         FROM
             project_process pro