Browse Source

Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj

dev_shibei_match
zhaoqifeng 4 years ago
parent
commit
2f4d1f8993
  1. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
  2. 18
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

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

@ -88,7 +88,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
threadPool.submit(() -> {
try {
long startCpc = System.currentTimeMillis();
calCpcIndexService.calCpcPartyAbility(customerId, monthId);
//calCpcIndexService.calCpcPartyAbility(customerId, monthId);
log.error("党员相关-党建能力执行完毕======总耗时:{}ms,customerId:{}",System.currentTimeMillis()-startCpc, param.getCustomerId());
} catch (Exception e) {
log.error("抽取【党员相关数据】发生异常,参数:" + JSON.toJSONString(param), e);

18
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@ -167,13 +167,15 @@
<!-- 查询议题转项目总数 -->
<select id="selectIssueTotalShiftProject" resultType="com.epmet.dto.extract.form.GridIssueCountResultDTO">
SELECT
GRID_ID,
COUNT(ISSUE_ID) AS issueTotal
FROM fact_origin_issue_log_daily
WHERE DEL_FLAG = '0'
AND MONTH_ID = #{monthId}
AND CUSTOMER_ID = #{customerId}
AND ACTION_CODE = 'shift_project'
m.GRID_ID,
COUNT(m.ID) AS issueTotal
FROM
fact_origin_issue_main_daily m INNER JOIN
fact_origin_issue_log_daily l ON m.ID = l.ISSUE_ID
WHERE m.DEL_FLAG = '0'
AND m.MONTH_ID = #{monthId}
AND m.CUSTOMER_ID = #{customerId}
AND l.ACTION_CODE = 'shift_project'
GROUP BY GRID_ID
</select>
@ -376,4 +378,4 @@
GROUP BY
a.ID
</select>
</mapper>
</mapper>

Loading…
Cancel
Save