elink-star
/
epdc-cloud-analysis-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改kettl作业；其他

feature/yujt_analysisHomeChange
yujt 5 years ago
parent
5bca7e4f40
commit
90f01b73a5
3 changed files with 135 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 204
      epdc-cloud-analysis/doc/kettle/analysis-yushan/analysis_extracting/epdc_user_statistics_extracting.ktr
  2. 19
      epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueItemCategoryServiceImpl.java
  3. 4
      epdc-cloud-analysis/src/main/resources/mapper/issue/IssueItemCategoryDao.xml

204
epdc-cloud-analysis/doc/kettle/analysis-yushan/analysis_extracting/epdc_user_statistics_extracting.ktr
View File

@ -435,6 +435,95 @@
<is_key_private>N</is_key_private>
</info>
<notepads>
<notepad>
<note>榆山居民数，不计入未认证数。
若计入未认证居民数，请使用原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 &lt;&gt; 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</note>
<xloc>327</xloc>
<yloc>339</yloc>
<width>670</width>
<heigth>1115</heigth>
<fontname>Microsoft YaHei UI</fontname>
<fontsize>9</fontsize>
<fontbold>N</fontbold>
<fontitalic>N</fontitalic>
<fontcolorred>0</fontcolorred>
<fontcolorgreen>0</fontcolorgreen>
<fontcolorblue>0</fontcolorblue>
<backgroundcolorred>255</backgroundcolorred>
<backgroundcolorgreen>205</backgroundcolorgreen>
<backgroundcolorblue>112</backgroundcolorblue>
<bordercolorred>100</bordercolorred>
<bordercolorgreen>100</bordercolorgreen>
<bordercolorblue>100</bordercolorblue>
<drawshadow>Y</drawshadow>
</notepad>
</notepads>
<connection>
<name>esua_epdc_analysis</name>
@ -571,73 +660,50 @@
<schema_name/>
</partitioning>
<connection>esua_epdc_analysis</connection>
<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
(
<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
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 &lt;&gt; 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 &lt;&gt; 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</sql>
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</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
@ -646,14 +712,14 @@ UNION ALL
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta>
<value-meta>
<type>Integer</type>
<type>String</type>
<storagetype>normal</storagetype>
<name>GRID_ID</name>
<length>15</length>
<precision>0</precision>
<length>20</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>GRID_ID</comments>
<conversion_Mask>####0;-####0</conversion_Mask>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>

19
epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueItemCategoryServiceImpl.java
View File

@ -110,26 +110,7 @@ public class IssueItemCategoryServiceImpl extends BaseServiceImpl<IssueItemCateg
new Result<AnalysisData<StatisticsByCategoryDTO>>().ok(new AnalysisData(new ArrayList<>(), deadLine));
}
formDto.setDeptIdList(userDetail.getDeptIdList());
// formDto.setDeptIdList(null);
List<StatisticsByCategoryDTO> 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<AnalysisData<StatisticsByCategoryDTO>> ().ok(new AnalysisData(data, deadLine));
}

4
epdc-cloud-analysis/src/main/resources/mapper/issue/IssueItemCategoryDao.xml
View File

@ -21,7 +21,6 @@
<select id="selectCountIssueCatehory" parameterType="com.elink.esua.epdc.dto.issue.form.StatisCategoryFormDTO"
resultMap="issueItemCategoryMap1">
SELECT
-- a.CATEGORY_NAME,
replace(a.CATEGORY_NAME,'市北区党委-', '') as CATEGORY_NAME,
sum( a.ISSUE_TOTLE ) as ISSUE_TOTLE
FROM
@ -35,9 +34,6 @@
#{deptId}
</foreach>
</if>
<!--<if test="deptId != null and deptId != ''">-->
<!--AND GRID_ID = #{deptId}-->
<!--</if>-->
<if test='deptId!=null and deptId!=""'>
AND find_in_set(#{deptId},dept.allDeptIds)
</if>

Write Preview
Loading…
Cancel
Save