diff --git a/epdc-cloud-analysis/doc/kettle/analysis-yushan/analysis_extracting/epdc_user_statistics_extracting.ktr b/epdc-cloud-analysis/doc/kettle/analysis-yushan/analysis_extracting/epdc_user_statistics_extracting.ktr
index d23e470..d729775 100644
--- a/epdc-cloud-analysis/doc/kettle/analysis-yushan/analysis_extracting/epdc_user_statistics_extracting.ktr
+++ b/epdc-cloud-analysis/doc/kettle/analysis-yushan/analysis_extracting/epdc_user_statistics_extracting.ktr
@@ -435,6 +435,95 @@
N
+
+ 榆山居民数，不计入未认证数。
+若计入未认证居民数，请使用原sql：
+SELECT total.GRID_ID,
+ SUM(total.USER_TOTAL+total.COMPANY_REPRESENT_TOTAL) AS USER_TOTAL,
+ SUM(total.RESIDENTS_TOTAL) AS RESIDENTS_TOTAL,
+ SUM(total.PARTY_TOTAL) AS PARTY_TOTAL,
+ SUM(total.OVER_FIFTY_PARTY_TOTAL) AS OVER_FIFTY_PARTY_TOTAL,
+ SUM(total.UNDER_FIFTY_PARTY_TOTAL) AS UNDER_FIFTY_PARTY_TOTAL,
+ SUM(total.COMPANY_REPRESENT_TOTAL) AS COMPANY_REPRESENT_TOTAL,
+ NOW() AS CREATED_TIME
+ from
+ (SELECT
+ t1.GRID_ID,
+ t1.USER_TOTAL,
+ ( t1.USER_TOTAL - t1.PARTY_TOTAL ) AS RESIDENTS_TOTAL,
+ t1.PARTY_TOTAL,
+ t1.OVER_FIFTY_PARTY_TOTAL,
+ ( t1.PARTY_TOTAL - t1.OVER_FIFTY_PARTY_TOTAL ) AS UNDER_FIFTY_PARTY_TOTAL,
+ 0 AS COMPANY_REPRESENT_TOTAL
+ FROM
+ (
+ SELECT
+ t.GRID_ID,
+ COUNT( t.ID ) AS USER_TOTAL,
+ SUM( t.PARTY_FLAG = 1 ) AS PARTY_TOTAL,
+ SUM( t.age >= 50 AND t.PARTY_FLAG = 1 ) AS OVER_FIFTY_PARTY_TOTAL
+ FROM
+ (
+ SELECT
+ eu.ID,
+ eu.PARTY_FLAG,
+ IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+ CASE
+
+ WHEN eu.DEPT_ID IS NOT NULL
+ AND eu.DEPT_ID <> 0 THEN
+ eu.DEPT_ID ELSE (
+ SELECT
+ eugr.GRID_ID
+ FROM
+ meta_epdc_user_grid_relation eugr
+ WHERE
+ eugr.DEL_FLAG = '0'
+ AND eugr.USER_ID = eu.ID
+ ORDER BY
+ CREATED_TIME
+ LIMIT 1
+ )
+ END AS GRID_ID
+ FROM
+ meta_epdc_user eu
+ WHERE
+ eu.DEL_FLAG = '0'
+ ) t
+ where t.grid_id != ''
+ GROUP BY t.GRID_ID
+ ) t1
+UNION ALL
+ select DEPT_ID AS GRID_ID,
+ 0 AS USER_TOTAL,
+ 0 AS RESIDENTS_TOTAL,
+ 0 AS PARTY_TOTAL,
+ 0 AS OVER_FIFTY_PARTY_TOTAL,
+ 0 AS UNDER_FIFTY_PARTY_TOTAL,
+ COUNT(ID) AS COMPANY_REPRESENT_TOTAL
+ FROM meta_epdc_enterprise_info
+ WHERE DEL_FLAG=0
+ GROUP BY DEPT_ID)total
+ group by total.GRID_ID
+ 327
+ 339
+ 670
+ 1115
+ Microsoft YaHei UI
+ 9
+ N
+ N
+ 0
+ 0
+ 0
+ 255
+ 205
+ 112
+ 100
+ 100
+ 100
+ Y
+
esua_epdc_analysis
@@ -571,73 +660,50 @@
esua_epdc_analysis
- SELECT total.GRID_ID,
- SUM(total.USER_TOTAL+total.COMPANY_REPRESENT_TOTAL) AS USER_TOTAL,
- SUM(total.RESIDENTS_TOTAL) AS RESIDENTS_TOTAL,
- SUM(total.PARTY_TOTAL) AS PARTY_TOTAL,
- SUM(total.OVER_FIFTY_PARTY_TOTAL) AS OVER_FIFTY_PARTY_TOTAL,
- SUM(total.UNDER_FIFTY_PARTY_TOTAL) AS UNDER_FIFTY_PARTY_TOTAL,
- SUM(total.COMPANY_REPRESENT_TOTAL) AS COMPANY_REPRESENT_TOTAL,
- NOW() AS CREATED_TIME
- from
- (SELECT
- t1.GRID_ID,
- t1.USER_TOTAL,
- ( t1.USER_TOTAL - t1.PARTY_TOTAL ) AS RESIDENTS_TOTAL,
- t1.PARTY_TOTAL,
- t1.OVER_FIFTY_PARTY_TOTAL,
- ( t1.PARTY_TOTAL - t1.OVER_FIFTY_PARTY_TOTAL ) AS UNDER_FIFTY_PARTY_TOTAL,
- 0 AS COMPANY_REPRESENT_TOTAL
- FROM
- (
+ SELECT
+ total.GRID_ID,
+ SUM( total.USER_TOTAL + total.COMPANY_REPRESENT_TOTAL ) AS USER_TOTAL,
+ SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL,
+ SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL,
+ SUM( total.OVER_FIFTY_PARTY_TOTAL ) AS OVER_FIFTY_PARTY_TOTAL,
+ SUM( total.UNDER_FIFTY_PARTY_TOTAL ) AS UNDER_FIFTY_PARTY_TOTAL,
+ SUM( total.COMPANY_REPRESENT_TOTAL ) AS COMPANY_REPRESENT_TOTAL,
+ NOW() AS CREATED_TIME
+FROM (
+ SELECT
+ t1.GRID_ID, t1.USER_TOTAL,
+ ( t1.USER_TOTAL - t1.PARTY_TOTAL) AS RESIDENTS_TOTAL,
+ t1.PARTY_TOTAL, t1.OVER_FIFTY_PARTY_TOTAL,
+ (t1.PARTY_TOTAL - t1.OVER_FIFTY_PARTY_TOTAL) AS UNDER_FIFTY_PARTY_TOTAL,
+ 0 AS COMPANY_REPRESENT_TOTAL
+ FROM (
+ SELECT
+ t.GRID_ID, COUNT( t.ID ) AS USER_TOTAL,
+ SUM( t.PARTY_FLAG = 1 ) AS PARTY_TOTAL,
+ SUM( t.age >= 50 AND t.PARTY_FLAG = 1 ) AS OVER_FIFTY_PARTY_TOTAL
+ FROM (
SELECT
- t.GRID_ID,
- COUNT( t.ID ) AS USER_TOTAL,
- SUM( t.PARTY_FLAG = 1 ) AS PARTY_TOTAL,
- SUM( t.age >= 50 AND t.PARTY_FLAG = 1 ) AS OVER_FIFTY_PARTY_TOTAL
+ eu.ID, eu.PARTY_FLAG,
+ IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE()), 0 ) AS age,
+ CASE WHEN eu.DEPT_ID IS NOT NULL AND eu.DEPT_ID <> 0 THEN eu.DEPT_ID ELSE '' END AS GRID_ID
FROM
- (
- SELECT
- eu.ID,
- eu.PARTY_FLAG,
- IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
- CASE
-
- WHEN eu.DEPT_ID IS NOT NULL
- AND eu.DEPT_ID <> 0 THEN
- eu.DEPT_ID ELSE (
- SELECT
- eugr.GRID_ID
- FROM
- meta_epdc_user_grid_relation eugr
- WHERE
- eugr.DEL_FLAG = '0'
- AND eugr.USER_ID = eu.ID
- ORDER BY
- CREATED_TIME
- LIMIT 1
- )
- END AS GRID_ID
- FROM
- meta_epdc_user eu
- WHERE
- eu.DEL_FLAG = '0'
- ) t
- where t.grid_id != ''
- GROUP BY t.GRID_ID
- ) t1
-UNION ALL
- select DEPT_ID AS GRID_ID,
- 0 AS USER_TOTAL,
- 0 AS RESIDENTS_TOTAL,
- 0 AS PARTY_TOTAL,
- 0 AS OVER_FIFTY_PARTY_TOTAL,
- 0 AS UNDER_FIFTY_PARTY_TOTAL,
- COUNT(ID) AS COMPANY_REPRESENT_TOTAL
- FROM meta_epdc_enterprise_info
- WHERE DEL_FLAG=0
- GROUP BY DEPT_ID)total
- group by total.GRID_ID
+ meta_epdc_user eu
+ WHERE
+ eu.DEL_FLAG = '0'
+ ) t
+ WHERE t.grid_id != ''
+ GROUP BY t.GRID_ID
+ ) t1 UNION ALL
+ SELECT
+ DEPT_ID AS GRID_ID, 0 AS USER_TOTAL, 0 AS RESIDENTS_TOTAL, 0 AS PARTY_TOTAL,
+ 0 AS OVER_FIFTY_PARTY_TOTAL, 0 AS UNDER_FIFTY_PARTY_TOTAL, COUNT( ID ) AS COMPANY_REPRESENT_TOTAL
+ FROM
+ meta_epdc_enterprise_info
+ WHERE DEL_FLAG = 0
+ GROUP BY DEPT_ID
+ ) total
+GROUP BY
+ total.GRID_ID
0
N
@@ -646,14 +712,14 @@ UNION ALL
N
- Integer
+ String
normal
GRID_ID
- 15
- 0
+ 20
+ -1
表输入
GRID_ID
- ####0;-####0
+
.
,
diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueItemCategoryServiceImpl.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueItemCategoryServiceImpl.java
index 7e92e45..3313ba3 100644
--- a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueItemCategoryServiceImpl.java
+++ b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueItemCategoryServiceImpl.java
@@ -110,26 +110,7 @@ public class IssueItemCategoryServiceImpl extends BaseServiceImpl>().ok(new AnalysisData(new ArrayList<>(), deadLine));
}
formDto.setDeptIdList(userDetail.getDeptIdList());
-// formDto.setDeptIdList(null);
List data = baseDao.selectCountIssueCatehory(formDto);
-// if ("2".equals(formDto.getCotegoryType())){ //进行类目名称截取
-// for (StatisticsByCategoryDTO a : data) {
-// String str = a.getCotegoryName();
-// int index = str.indexOf("-");
-// String newStr = str.substring(index + 1);
-// a.setCotegoryName(newStr);
-// }
-// }else if ("3".equals(formDto.getCotegoryType())){
-// for (StatisticsByCategoryDTO a : data) {
-// String str = a.getCotegoryName();
-// int index = str.indexOf("-");
-// String newStr = str.substring(index + 1);
-// System.out.println(newStr);
-// int index1 = newStr.indexOf("-");
-// String newStr1 = newStr.substring(index1 + 1);
-// a.setCotegoryName(newStr1);
-// }
-// }
return new Result> ().ok(new AnalysisData(data, deadLine));
}
diff --git a/epdc-cloud-analysis/src/main/resources/mapper/issue/IssueItemCategoryDao.xml b/epdc-cloud-analysis/src/main/resources/mapper/issue/IssueItemCategoryDao.xml
index dc76da6..75586c2 100644
--- a/epdc-cloud-analysis/src/main/resources/mapper/issue/IssueItemCategoryDao.xml
+++ b/epdc-cloud-analysis/src/main/resources/mapper/issue/IssueItemCategoryDao.xml
@@ -21,7 +21,6 @@