From 5512a67d1d70d8da7a1df8b75c91e25919885168 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 30 Sep 2020 10:46:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/issue/StatsIssueDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml index eeb0458c56..945fd7b0e3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml @@ -234,7 +234,7 @@ ip.created_time as createTime, (case when i.RESOLVE_TYPE = 'resolved' then 'closed_resolved' when i.RESOLVE_TYPE = 'unresolved' then 'closed_unresolved' - else i.ISSUE_STATUS end ) AS actionCode + else ip.ISSUE_STATUS end ) AS actionCode FROM issue_process ip LEFT JOIN issue i ON i.id = ip.issue_id From e692051bd490060f4f72b696eb9f4f9304c37ffb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 30 Sep 2020 10:47:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index a4ab0a72fa..b747ba3660 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.123 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.124 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0746d0aa11..869e173325 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.123 + 0.3.124 data-statistical com.epmet From b9d53b1b8a1d5b31dc74e6cb9f1f948be5341539 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 10:50:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=20=E6=B7=BB=E5=8A=A0orgType=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dto/form/SubAgencyIndexRankYMFormDTO.java | 5 +++++ .../resources/mapper/screen/ScreenIndexDataYearlyDao.xml | 9 ++++++++- .../screen/impl/ScreenCustomerDeptServiceImpl.java | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java index fc7e43593e..e973fefa50 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java @@ -48,4 +48,9 @@ public class SubAgencyIndexRankYMFormDTO implements Serializable { * 月份Id */ private String monthId; + + /** + * 组织类型 组织：agency 网格：grid + */ + private String orgType; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml index 6c0ebfb5e8..5b445202d5 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml @@ -13,7 +13,6 @@ screen_index_data_yearly WHERE del_flag = '0' - AND org_type = 'agency' AND org_id = #{agencyId} AND year_id = DATE_FORMAT(NOW(),'%Y') @@ -34,6 +33,14 @@ del_flag = '0' AND parent_id = #{agencyId} AND year_id = YEAR(CURDATE()) + + + AND ORG_TYPE = #{orgType,jdbcType=VARCHAR} + + + AND ORG_TYPE != 'department' + + ORDER BY index_total ASC diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java index 037681a247..95e7f066c0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java @@ -61,6 +61,7 @@ public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl depts2Add, List depts2Update) { String dateStr = DateUtils.format(new Date(), "YYYYmmdd"); From b930a876a2a09c169d4abd7fa8e77699d126e334 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 30 Sep 2020 10:55:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=83=A8=E7=BD=B2report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index 668a5a7c03..a264991d2d 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.94 + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.95 ports: - "8109:8109" diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 0f0d165734..354e1244df 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.94 + 0.3.95 data-report-server