luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

满意率修改

master
zhaoqifeng 5 years ago
parent
1531d5aaff
commit
78bfa38836
6 changed files with 85 additions and 71 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. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java
  2. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictServiceImpl.java
  3. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java
  4. 11
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
  5. 125
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
  6. 14
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java
View File

@ -128,7 +128,7 @@ public class IndexCollCommunityServiceImpl implements IndexCollCommunityService
list.forEach(entity -> satisfaction.stream().filter(dto -> dto.getAgencyId().equals(entity.getAgencyId())).forEach(sa -> {
if (sa.getCount() != NumConstant.ZERO) {
BigDecimal count = new BigDecimal(sa.getCount());
BigDecimal sum = new BigDecimal(sa.getSum());
BigDecimal sum = sa.getRatio();
entity.setSatisfactionRatio(sum.divide(count, NumConstant.SIX, RoundingMode.HALF_UP));
}
}));

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictServiceImpl.java
View File

@ -122,7 +122,7 @@ public class IndexCollDistrictServiceImpl implements IndexCollDistrictService {
list.forEach(entity -> satisfaction.stream().filter(dto -> dto.getAgencyId().equals(entity.getAgencyId())).forEach(sa -> {
if (sa.getCount() != NumConstant.ZERO) {
BigDecimal count = new BigDecimal(sa.getCount());
BigDecimal sum = new BigDecimal(sa.getSum());
BigDecimal sum = sa.getRatio();
entity.setSatisfactionRatio(sum.divide(count, NumConstant.SIX, RoundingMode.HALF_UP));
}
}));

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java
View File

@ -120,7 +120,7 @@ public class IndexCollStreetServiceImpl implements IndexCollStreetService {
list.forEach(entity -> satisfaction.stream().filter(dto -> dto.getAgencyId().equals(entity.getAgencyId())).forEach(sa -> {
if (sa.getCount() != NumConstant.ZERO) {
BigDecimal count = new BigDecimal(sa.getCount());
BigDecimal sum = new BigDecimal(sa.getSum());
BigDecimal sum = sa.getRatio();
entity.setSatisfactionRatio(sum.divide(count, NumConstant.SIX, RoundingMode.HALF_UP));
}
}));

11
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
View File

@ -174,11 +174,18 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
}));
list.forEach(entity -> finishOrgList.stream().filter(finish -> entity.getId().equals(finish.getProjectId())).forEach(dto -> {
String[] orgIds = dto.getPIdPath().split(StrConstant.COLON);
String org = "";
if (orgIds.length > NumConstant.ONE) {
entity.setFinishOrgIds(orgIds[orgIds.length - 1]);
org = orgIds[orgIds.length - 1];
} else {
entity.setFinishOrgIds(orgIds[0]);
org = orgIds[0];
}
if (StringUtils.isNotEmpty(dto.getGridId())) {
org = org + StrConstant.COLON + dto.getGridId();
} else if (StringUtils.isNotEmpty(dto.getDepartmentId())) {
org = org + StrConstant.COLON + dto.getDepartmentId();
}
entity.setFinishOrgIds(org);
}));
//插入数据
if (!list.isEmpty()) {

125
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
View File

@ -90,7 +90,7 @@
SELECT
AGENCY_ID,
COUNT( ID ) AS "count",
SUM( IFNULL( b.score, 0 ) ) AS "sum"
SUM( IFNULL( b.score, 80 ) ) AS "ratio"
FROM
( SELECT f.ID, f.AGENCY_ID FROM fact_origin_project_main_daily f
INNER JOIN dim_agency da ON f.FINISH_ORG_IDS LIKE concat('%', da.ID, '%')
@ -102,7 +102,7 @@
LEFT JOIN (
SELECT
PROJECT_ID,
SUM( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
FROM
fact_origin_project_log_daily
WHERE
@ -110,6 +110,7 @@
OR ACTION_CODE = 'good'
OR ACTION_CODE = 'perfect')
AND CUSTOMER_ID = #{customerId}
AND MONTH_ID = #{monthId}
GROUP BY
PROJECT_ID
) b ON a.ID = b.PROJECT_ID
@ -254,70 +255,70 @@
</select>
<select id="selectGridSatisfaction" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
SELECT
a.ORG_ID,
a.sum,
IFNULL(b.count, 0) AS "count"
GRID_ID AS "orgId",
COUNT( score &gt;= 80 OR NULL ) AS 'count',
COUNT( ID ) AS 'sum'
FROM
(SELECT
ORG_ID,
COUNT( ID ) AS "sum"
FROM
fact_origin_project_log_daily
WHERE
1 = 1
AND ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
AND CUSTOMER_ID = #{customerId}
AND MONTH_ID = #{monthId}
GROUP BY
ORG_ID) a
LEFT JOIN
(SELECT
ORG_ID,
COUNT( ID ) AS "count"
FROM
fact_origin_project_log_daily
WHERE
1 = 1
AND ( ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
AND CUSTOMER_ID = #{customerId}
AND MONTH_ID = #{monthId}
GROUP BY
ORG_ID) b
ON a.ORG_ID = b.ORG_ID
(
SELECT
fm.GRID_ID,
fm.ID,
IFNULL( fl.score, 80 ) AS "score"
FROM
fact_origin_project_main_daily fm
LEFT JOIN (
SELECT
f.PROJECT_ID,
AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
FROM
fact_origin_project_log_daily f
WHERE
( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
AND f.CUSTOMER_ID = #{customerId}
AND f.MONTH_ID = #{monthId}
GROUP BY
PROJECT_ID
) fl ON fm.ID = fl.PROJECT_ID
WHERE fm.CUSTOMER_ID = #{customerId}
AND fm.MONTH_ID = #{monthId}
) a
GROUP BY
GRID_ID
</select>
<select id="selectOrgSatisfaction" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
SELECT
a.AGENCY_ID,
a.sum,
IFNULL(b.count, 0) AS "count"
AGENCY_ID,
COUNT( score &gt;= 80 OR NULL ) AS 'count',
COUNT( ID ) AS 'sum'
FROM
(SELECT
f.AGENCY_ID,
COUNT( f.ID ) AS "sum"
FROM
fact_origin_project_log_daily f
INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID AND da.`LEVEL` = #{level}
WHERE
1 = 1
AND ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
AND f.CUSTOMER_ID = #{customerId}
AND f.MONTH_ID = #{monthId}
GROUP BY
f.AGENCY_ID) a
LEFT JOIN
(SELECT
f.AGENCY_ID,
COUNT( f.ID ) AS "count"
FROM
fact_origin_project_log_daily f
INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID AND da.`LEVEL` = #{level}
WHERE
1 = 1
AND ( ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
AND f.CUSTOMER_ID = #{customerId}
AND f.MONTH_ID = #{monthId}
GROUP BY
f.AGENCY_ID) b
ON a.AGENCY_ID = b.AGENCY_ID
(
SELECT
fm.AGENCY_ID,
fm.ID,
IFNULL( fl.score, 80 ) AS "score"
FROM
fact_origin_project_main_daily fm
INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
AND da.`LEVEL` = #{level}
LEFT JOIN (
SELECT
f.PROJECT_ID,
AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
FROM
fact_origin_project_log_daily f
INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
AND da.`LEVEL` = #{level}
WHERE
( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
AND f.CUSTOMER_ID = #{customerId}
AND f.MONTH_ID = #{monthId}
GROUP BY
PROJECT_ID
) fl ON fm.ID = fl.PROJECT_ID
WHERE fm.CUSTOMER_ID = #{customerId}
AND fm.MONTH_ID = #{monthId}
) a
GROUP BY
AGENCY_ID
</select>
</mapper>

14
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
View File

@ -30,15 +30,17 @@
pp.STAFF_ID,
pp.CREATED_TIME
FROM project_process pp
LEFT JOIN project_staff staff ON pp.PROJECT_ID = staff.PROJECT_ID
INNER JOIN project p ON pp.PROJECT_ID = p.ID
INNER JOIN project_staff staff ON pp.PROJECT_ID = staff.PROJECT_ID
AND pp.DEPARTMENT_NAME = staff.DEPARTMENT_NAME
AND staff.IS_HANDLE = 'handle'
AND pp.STAFF_ID = staff.STAFF_ID
AND staff.DEL_FLAG = '0'
WHERE
pp.DEL_FLAG = '0'
AND
p.CUSTOMER_ID = #{customerId}
AND p.CUSTOMER_ID = #{customerId}
AND pp.OPERATION !='response'
AND pp.OPERATION !='created'
<if test="date != null and date.trim() != ''">
AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m%d') = #{date}
</if>
@ -161,6 +163,8 @@
</select>
<select id="selectFinishOrg" resultType="com.epmet.dto.project.FinishOrgDTO">
SELECT
a.GRID_ID,
a.DEPARTMENT_ID,
a.PROJECT_ID,
a.ORG_ID_PATH,
b.ORG_ID_PATH AS pIdPath
@ -168,7 +172,9 @@
(
SELECT
ps.PROJECT_ID,
ps.ORG_ID_PATH
ps.ORG_ID_PATH,
ps.GRID_ID,
ps.DEPARTMENT_ID
FROM
project_process pp
INNER JOIN project_staff ps ON pp.STAFF_ID = ps.STAFF_ID

Write Preview
Loading…
Cancel
Save