From 41cd752143d36b063a6d78160961af758f7c922a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Sep 2020 16:20:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=20=E6=B2=BB=E7=90=86?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=20=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/NumConstant.java | 1 + .../com/epmet/constant/ExtractConstant.java | 12 ++ .../constant/ProjectEvaluateConstant.java | 19 +++ .../result/CalSatisfactionResultDTO.java | 16 +++ .../GridProjectClosedTotalResultDTO.java | 25 ++++ .../result/NotReturnProjectResultDTO.java | 32 +++++ .../result/ProjectEvaluateResultDTO.java | 37 ++++++ .../extract/FactOriginProjectLogDailyDao.java | 24 +++- .../FactOriginProjectMainDailyDao.java | 11 ++ .../FactOriginProjectLogDailyService.java | 20 +++ .../FactOriginProjectMainDailyService.java | 11 ++ .../extract/impl/CalGridIndexServiceImpl.java | 120 ++++++++++++++---- .../FactOriginProjectLogDailyServiceImpl.java | 26 ++++ ...FactOriginProjectMainDailyServiceImpl.java | 14 ++ .../extract/FactOriginProjectLogDailyDao.xml | 50 +++++--- .../extract/FactOriginProjectMainDailyDao.xml | 15 +++ 16 files changed, 384 insertions(+), 49 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ProjectEvaluateConstant.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/CalSatisfactionResultDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridProjectClosedTotalResultDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/NotReturnProjectResultDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ProjectEvaluateResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java index e906535166..1d727fb297 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java @@ -38,6 +38,7 @@ public interface NumConstant { int ONE_THOUSAND = 1000; int MAX = 99999999; int EIGHTY_EIGHT = 88; + int EIGHTY = 80; double ZERO_DOT_ZERO = 0.0; diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ExtractConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ExtractConstant.java index 8e01f5ee46..b8ee4f09ee 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ExtractConstant.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ExtractConstant.java @@ -20,4 +20,16 @@ public interface ExtractConstant { String SHIFT_PROJECT = "shift_project"; + String CLOSED = "closed"; + + String GRID_ORG_TYPE = "grid"; + + String RETURN_ACTION_CODE = "return"; + + String EVALUATE_BAD = "bad"; + + String EVALUATE_GOOD = "good"; + + String EVALUATE_PERFECT = "perfect"; + } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ProjectEvaluateConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ProjectEvaluateConstant.java new file mode 100644 index 0000000000..a2c15b100e --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ProjectEvaluateConstant.java @@ -0,0 +1,19 @@ +package com.epmet.constant; + +import com.epmet.commons.tools.constant.NumConstant; + +/** + * @Author zxc + * @DateTime 2020/9/18 3:49 下午 + */ +public interface ProjectEvaluateConstant { + +// BigDecimal BAD = new BigDecimal(NumConstant.SIXTY); +// BigDecimal GOOD = new BigDecimal(NumConstant.EIGHTY); +// BigDecimal PERFECT = new BigDecimal(NumConstant.ONE_HUNDRED); + + Integer BAD = NumConstant.SIXTY; + Integer GOOD = NumConstant.EIGHTY; + Integer PERFECT = NumConstant.ONE_HUNDRED; + +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/CalSatisfactionResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/CalSatisfactionResultDTO.java new file mode 100644 index 0000000000..811f33c30b --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/CalSatisfactionResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.extract.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/9/18 4:01 下午 + */ +@Data +public class CalSatisfactionResultDTO implements Serializable { + + private static final long serialVersionUID = -7514945819312915670L; + +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridProjectClosedTotalResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridProjectClosedTotalResultDTO.java new file mode 100644 index 0000000000..512e594ad2 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridProjectClosedTotalResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.extract.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/9/18 2:02 下午 + */ +@Data +public class GridProjectClosedTotalResultDTO implements Serializable { + + private static final long serialVersionUID = 5144371528837124674L; + + /** + * 网格ID + */ + private String gridId; + + /** + * 网格办结项目数 + */ + private Integer resolveProjectCount; +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/NotReturnProjectResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/NotReturnProjectResultDTO.java new file mode 100644 index 0000000000..70f0efd484 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/NotReturnProjectResultDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.extract.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Author zxc + * @DateTime 2020/9/18 2:46 下午 + */ +@Data +public class NotReturnProjectResultDTO implements Serializable { + + private static final long serialVersionUID = -2931817313224740122L; + + /** + * 网格ID + */ + private String gridId; + + /** + * 未被退回的项目 + */ + private Integer notReturnProject = NumConstant.ZERO; + + /** + * 网格吹哨部门准确率 + */ + private BigDecimal transferRightRatio = new BigDecimal(NumConstant.ZERO); +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ProjectEvaluateResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ProjectEvaluateResultDTO.java new file mode 100644 index 0000000000..1e9c927663 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ProjectEvaluateResultDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.extract.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Author zxc + * @DateTime 2020/9/18 3:23 下午 + */ +@Data +public class ProjectEvaluateResultDTO implements Serializable { + + private static final long serialVersionUID = 6042094904405338630L; + + /** + * 动作code + */ + private String actionCode; + + /** + * 网格ID + */ + private String gridId; + + /** + * 满意度评价对应的分数 + */ + private Integer score = NumConstant.ZERO; + + /** + * 项目ID + */ + private String projectId; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java index a4729ec8ec..48f3a546a4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java @@ -18,8 +18,13 @@ package com.epmet.dao.evaluationindex.extract; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.extract.result.NotReturnProjectResultDTO; +import com.epmet.dto.extract.result.ProjectEvaluateResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 项目明细_日统计 @@ -29,5 +34,22 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface FactOriginProjectLogDailyDao extends BaseDao { - + + /** + * @Description 查询未被退回的项目数 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/18 2:50 下午 + */ + List selectNotReturnProject(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("actionCode") String actionCode,@Param("orgType") String orgType); + + /** + * @Description 查询项目评价信息 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/18 3:28 下午 + */ + List selectProjectEvaluate(@Param("customerId") String customerId,@Param("monthId") String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java index 1fc4f9b9a9..2b2e581698 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java @@ -19,6 +19,7 @@ package com.epmet.dao.evaluationindex.extract; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.extract.FactOriginProjectMainDailyDTO; +import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -51,4 +52,14 @@ public interface FactOriginProjectMainDailyDao extends BaseDao */ List getPendingList(@Param("customerId") String customerId); + + /** + * @Description 网格办结项目数 + * @param customerId + * @param monthId + * @param status + * @author zxc + * @date 2020/9/18 2:06 下午 + */ + List selectGridClosedProject(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("status") String status); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java index 8099ef503b..9a5975aa90 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java @@ -20,6 +20,8 @@ package com.epmet.service.evaluationindex.extract; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.extract.FactOriginProjectLogDailyDTO; +import com.epmet.dto.extract.result.NotReturnProjectResultDTO; +import com.epmet.dto.extract.result.ProjectEvaluateResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity; import java.util.List; @@ -92,4 +94,22 @@ public interface FactOriginProjectLogDailyService extends BaseService selectNotReturnProject(String customerId,String monthId,String actionCode,String orgType); + + /** + * @Description 查询项目评价信息 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/18 3:28 下午 + */ + List selectProjectEvaluate(String customerId,String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java index 749fdc4897..8b6c93d719 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java @@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.extract; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.extract.FactOriginProjectMainDailyDTO; +import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity; import java.util.List; @@ -110,4 +111,14 @@ public interface FactOriginProjectMainDailyService extends BaseService */ List getPendingList(String customerId); + + /** + * @Description 网格办结项目数 + * @param customerId + * @param monthId + * @param status + * @author zxc + * @date 2020/9/18 2:06 下午 + */ + List selectGridClosedProject(String customerId,String monthId,String status); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java index 4ab4360397..9fca7973bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java @@ -5,11 +5,17 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.constant.DataSourceConstant; import com.epmet.constant.ExtractConstant; +import com.epmet.constant.ProjectEvaluateConstant; import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao; import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO; import com.epmet.dto.extract.form.GridIssueCountResultDTO; +import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO; import com.epmet.dto.extract.result.GridProjectCountResultDTO; +import com.epmet.dto.extract.result.NotReturnProjectResultDTO; +import com.epmet.dto.extract.result.ProjectEvaluateResultDTO; import com.epmet.service.evaluationindex.extract.CalGridIndexService; +import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService; +import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService; import com.epmet.service.evaluationindex.extract.IssueExtractService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -18,7 +24,11 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; /** * @Author zxc @@ -33,6 +43,10 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { private IssueExtractService issueExtractService; @Autowired private FactIndexGovrnAblityGridMonthlyDao governAbilityDao; + @Autowired + private FactOriginProjectMainDailyService projectMainService; + @Autowired + private FactOriginProjectLogDailyService projectLogService; /** * @Description 计算网格指标党建能力 @@ -65,22 +79,63 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { //网格总项目数 List gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT); //网格议题转项目率 - gridProjectTotalList.forEach(project -> { - gridIssueTotalList.forEach(issue ->{ - if (project.getGridId().equals(issue.getGridId())){ - project.setIssueToProjectRatio(getRound(new BigDecimal(project.getProjectTotal()/issue.getIssueTotal()))); - } + if (!CollectionUtils.isEmpty(gridIssueTotalList) && !CollectionUtils.isEmpty(gridProjectTotalList)) { + gridProjectTotalList.forEach(project -> { + gridIssueTotalList.forEach(issue -> { + if (project.getGridId().equals(issue.getGridId())) { + project.setIssueToProjectRatio(getRound(new BigDecimal(project.getProjectTotal() / issue.getIssueTotal()))); + } + }); }); - }); - //网格自治项目数 + } + //网格自治项目数 从议题创建到项目关闭，包括处理人，自始至终没有出过议题所属网格 //网格办结项目数 - - //网格吹哨部门准确率 - + List gridProjectClosedTotalList = projectMainService.selectGridClosedProject(customerId, monthId, ExtractConstant.CLOSED); + //网格吹哨部门准确率 【没被退回的项目数/项目总数 】 + List notReturnProjectList = projectLogService.selectNotReturnProject(customerId, monthId, ExtractConstant.RETURN_ACTION_CODE, ExtractConstant.GRID_ORG_TYPE); + if (!CollectionUtils.isEmpty(gridProjectTotalList) && !CollectionUtils.isEmpty(notReturnProjectList)){ + notReturnProjectList.forEach(not -> { + gridProjectTotalList.forEach(total -> { + if (not.getGridId().equals(total.getGridId())){ + not.setTransferRightRatio(getRound(new BigDecimal(not.getNotReturnProject()/total.getProjectTotal()))); + } + }); + }); + } //网格内解决的项目的满意度 - - //组织内党员的参与议事能力考评分（平均值） + //项目评价（分值定义下非常满意100，满意80，不满意（一般）60）的人数的平均分（每个项目的参加人数的分数和/评论人数=一个项目的平均分）+其他项目得分/已关闭项目总数 + List projectEvaluateList = projectLogService.selectProjectEvaluate(customerId, monthId); + Map resultSatisfactionScore = new HashMap<>(16); + if (!CollectionUtils.isEmpty(projectEvaluateList)){ + Map> groupByGrid = projectEvaluateList.stream().collect(Collectors.groupingBy(ProjectEvaluateResultDTO::getGridId)); + groupByGrid.forEach((gridId,projectEvaluateInfoList) -> { + Map scoreMap = new HashMap<>(16); + Map> groupByProject = projectEvaluateInfoList.stream().collect(Collectors.groupingBy(ProjectEvaluateResultDTO::getProjectId)); + groupByProject.forEach((projectId,projectList) -> { + projectList.forEach(project -> { + switch (project.getActionCode()){ + case ExtractConstant.EVALUATE_BAD: + project.setScore(ProjectEvaluateConstant.BAD); + break; + case ExtractConstant.EVALUATE_GOOD: + project.setScore(ProjectEvaluateConstant.GOOD); + break; + case ExtractConstant.EVALUATE_PERFECT: + project.setScore(ProjectEvaluateConstant.PERFECT); + break; + } + }); + Integer projectAllScore = projectList.stream().collect(Collectors.summingInt(ProjectEvaluateResultDTO::getScore)); + scoreMap.put(projectId,projectAllScore/projectList.size()); + }); + AtomicReference allScore = new AtomicReference<>(0); + scoreMap.forEach((k,v) -> { + allScore.set(++v); + }); + resultSatisfactionScore.put(gridId,getRound(new BigDecimal(allScore.get()/scoreMap.size()))); + }); + } result.forEach(r -> { // 1. 网格总议题数目，网格人均议题数目 @@ -100,23 +155,32 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { } }); } + // 3. 网格办结项目数 + if (!CollectionUtils.isEmpty(gridProjectClosedTotalList)){ + gridProjectClosedTotalList.forEach(closed -> { + if (r.getGridId().equals(closed.getGridId())){ + r.setResolveProjectCount(closed.getResolveProjectCount()); + } + }); + } + // 4. 网格吹哨部门准确率 + if (!CollectionUtils.isEmpty(notReturnProjectList)){ + notReturnProjectList.forEach(not -> { + if (r.getGridId().equals(not.getGridId())){ + r.setTransferRightRatio(not.getTransferRightRatio()); + } + }); + } + // 5. 网格内解决的项目的满意度 + if (null != resultSatisfactionScore){ + resultSatisfactionScore.forEach((k,v) -> { + if (r.getGridId().equals(k)){ + r.setSatisfactionRatio(v); + } + }); + } + // 6. 网格自治项目数 }); - - - - - - // - - - - - - - - - - return true; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java index e0d99443f7..f51b327fe6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java @@ -25,6 +25,8 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.evaluationindex.extract.FactOriginProjectLogDailyDao; import com.epmet.dto.extract.FactOriginProjectLogDailyDTO; +import com.epmet.dto.extract.result.NotReturnProjectResultDTO; +import com.epmet.dto.extract.result.ProjectEvaluateResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity; import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService; import org.apache.commons.lang3.StringUtils; @@ -97,4 +99,28 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl selectNotReturnProject(String customerId, String monthId, String actionCode, String orgType) { + return baseDao.selectNotReturnProject(customerId, monthId, actionCode, orgType); + } + + /** + * @Description 查询项目评价信息 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/18 3:28 下午 + */ + @Override + public List selectProjectEvaluate(String customerId, String monthId) { + return baseDao.selectProjectEvaluate(customerId, monthId); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectMainDailyServiceImpl.java index 006476a093..5f6b1838e7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectMainDailyServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.evaluationindex.extract.FactOriginProjectMainDailyDao; import com.epmet.dto.extract.FactOriginProjectMainDailyDTO; +import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity; import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService; import org.apache.commons.lang3.StringUtils; @@ -106,4 +107,17 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl selectGridClosedProject(String customerId, String monthId, String status) { + return baseDao.selectGridClosedProject(customerId, monthId); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index 71f24fc66c..c812f10fc4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -3,26 +3,36 @@ - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index 58bdebeea2..14b6913884 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -45,5 +45,20 @@ AND PROJECT_STATUS = 'pending' + + + \ No newline at end of file