diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java index 87cd7c6879..f09091487f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java @@ -56,12 +56,12 @@ public interface StatsIssueDao extends BaseDao { List selectAgencyClosedIssueInc(@Param("customerId") String customerId, @Param("date") String date); /** - * @param customerId + * @param issueEntity * @return * @Author sun * @Description 根据客户Id查询议题库已转项目的网格项目关系数据 **/ - List selectGridProjectList(@Param("customerId") String customerId); + List selectGridProjectList(IssueEntity issueEntity); /** * 获取当前日期网格下议题统计结果 * diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java index 4ffeb599c9..d2a9ef721a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java @@ -54,12 +54,12 @@ public interface IssueService { List getAgencyClosedIssueInc(String customerId, String date); /** - * @param customerId + * @param issueEntity * @return * @Author sun * @Description 根据客户Id查询议题库已转项目的网格项目关系数据 **/ - List getGridProjectList(String customerId); + List getGridProjectList(IssueEntity issueEntity); /** * 获取以网格为单位议题统计结果 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java index 443c9ddc41..1757166dba 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java @@ -66,14 +66,14 @@ public class IssueServiceImpl implements IssueService { } /** - * @param customerId + * @param issueEntity * @return * @Author sun * @Description 根据客户Id查询议题库已转项目的网格项目关系数据 **/ @Override - public List getGridProjectList(String customerId) { - return statsIssueDao.selectGridProjectList(customerId); + public List getGridProjectList(IssueEntity issueEntity) { + return statsIssueDao.selectGridProjectList(issueEntity); } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 75748d696b..aded6e95d3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -323,7 +323,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { monthlyEntity.setResolvedRatio(entity.getResolvedRatio()); monthlyEntity.setUnresolvedTotal(entity.getUnresolvedTotal()); monthlyEntity.setUnresolvedRatio(entity.getUnresolvedRatio()); - monthlyEntity.setProjectIncr(pendingIncr + closedIncr); + monthlyEntity.setProjectIncr(pendingIncr); monthlyEntity.setPendingIncr(pendingIncr); monthlyEntity.setClosedIncr(closedIncr); monthlyEntity.setResolvedIncr(resolvedIncr); @@ -440,7 +440,10 @@ public class StatsProjectServiceImpl implements StatsProjectService { numberFormat.setMaximumFractionDigits(6); //1:根据客户Id查询议题库已转项目的网格项目关系数据 - List gridProjectList = issueService.getGridProjectList(customerId); + IssueEntity issueEntity = new IssueEntity(); + issueEntity.setCustomerId(customerId); + issueEntity.setCreatedTime(date); + List gridProjectList = issueService.getGridProjectList(issueEntity); //2:遍历网格维度数据,统计每个网格各项指标数据 for (DimGridEntity grid : dimGridList) { @@ -616,7 +619,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { monthlyEntity.setResolvedRatio(entity.getResolvedRatio()); monthlyEntity.setUnresolvedTotal(entity.getUnresolvedTotal()); monthlyEntity.setUnresolvedRatio(entity.getUnresolvedRatio()); - monthlyEntity.setProjectIncr(pendingIncr + closedIncr); + monthlyEntity.setProjectIncr(pendingIncr); monthlyEntity.setPendingIncr(pendingIncr); monthlyEntity.setClosedIncr(closedIncr); monthlyEntity.setResolvedIncr(resolvedIncr); 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 2f6545f289..a96cc346f8 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 @@ -179,6 +179,7 @@ i.del_flag = '0' AND ipr.del_flag = '0' AND i.customer_id = #{customerId} + \ No newline at end of file