From 3ee341474ee9745773b3443339326a0f3c22e423 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 14 Dec 2022 15:40:04 +0800 Subject: [PATCH] todo --- .../evaluationindex/EvaluationIndexDao.java | 3 ++ .../EvaluationIndexService.java | 3 ++ .../impl/EvaluationIndexServiceImpl.java | 8 ++++ .../govorg/impl/GovOrgServiceImpl.java | 3 +- .../evaluationindex/EvaluationIndexDao.xml | 9 +++++ .../result/HistoryScoreComputeResultDTO.java | 2 +- .../result/HistoryScoreSjffResultDTO.java | 25 ++++++++++++ .../indexcoll/ScreenPyHistoryScoreDao.java | 8 ++++ .../impl/ScreenPyHistoryScoreServiceImpl.java | 10 ++++- .../indexcoll/ScreenPyHistoryScoreDao.xml | 40 +++++++++++++++++++ 10 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreSjffResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java index ab22fe402c..703145272a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java @@ -23,6 +23,7 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; +import com.epmet.dataaggre.dto.govorg.result.GridLivelyResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -128,4 +129,6 @@ public interface EvaluationIndexDao { * @return */ List getSubAllGridByAgencyPath(@Param("fullAgencyPath") String fullAgencyPath); + + GridLivelyResultDTO streetGridList(GridLivelyFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java index a5260a60ba..8d67d2bcf8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java @@ -8,6 +8,7 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; +import com.epmet.dataaggre.dto.govorg.result.GridLivelyResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; @@ -103,4 +104,6 @@ public interface EvaluationIndexService { * @author sun */ List getGridProejctToProjectMain(GridLivelyFormDTO formDTO); + + GridLivelyResultDTO streetGridList(GridLivelyFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java index 7fa4518b2d..a74fc4ea86 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java @@ -13,6 +13,7 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; +import com.epmet.dataaggre.dto.govorg.result.GridLivelyResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; @@ -248,4 +249,11 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService { return evaluationIndexDao.getGridProejctToProjectMain(formDTO); } + @Override + public GridLivelyResultDTO streetGridList(GridLivelyFormDTO formDTO) { + GridLivelyResultDTO resultDTO = evaluationIndexDao.streetGridList(formDTO); + resultDTO.setAgencyId(formDTO.getAgencyId()); + return resultDTO; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 67fd1cd832..f8c5a28397 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -709,7 +709,8 @@ public class GovOrgServiceImpl implements GovOrgService { //1.查询当前组织的直属下级组织列表及组织下的网格总数 LinkedList subList = new LinkedList<>(); if(StringUtils.isNotBlank(formDTO.getType())&&"".equals(formDTO.getType())){ - //TODO + GridLivelyResultDTO dto = evaluationIndexService.streetGridList(formDTO); + subList.add(dto); }else { subList = customerAgencyDao.subAgencyListAndGridSumNum(formDTO.getAgencyId()); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml index 70c5f2d7d6..0b42e97357 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml @@ -236,4 +236,13 @@ order by parentAgencyId,gridName + + diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreComputeResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreComputeResultDTO.java index 79ec85658f..f89b49bfca 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreComputeResultDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreComputeResultDTO.java @@ -17,6 +17,6 @@ public class HistoryScoreComputeResultDTO implements Serializable { /** * 分数 */ - private String score; + private String score = "0"; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreSjffResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreSjffResultDTO.java new file mode 100644 index 0000000000..8efdff7216 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreSjffResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.indexcollect.result; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class HistoryScoreSjffResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 上报事件总得分 + */ + private Integer eventScore; + /** + * 例行工作总得分 + */ + private Integer projectScore; + /** + * 网格员总数 + */ + private Integer gridStaffNum; + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.java index cfe869723b..97d9cdc287 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.java @@ -17,8 +17,10 @@ package com.epmet.dao.evaluationindex.indexcoll; /** import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcollect.form.HistoryScoreComputeFormDTO; import com.epmet.dto.indexcollect.form.HistoryScoreListFormDTO; import com.epmet.dto.indexcollect.result.HistoryScoreListResultDTO; +import com.epmet.dto.indexcollect.result.HistoryScoreSjffResultDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenPyHistoryScoreEntity; import org.apache.ibatis.annotations.Mapper; @@ -33,4 +35,10 @@ import java.util.List; public interface ScreenPyHistoryScoreDao extends BaseDao { List selectHistoryScoreList(HistoryScoreListFormDTO formDTO); + + HistoryScoreSjffResultDTO sumEventScore(HistoryScoreComputeFormDTO formDTO); + + HistoryScoreSjffResultDTO sumProjectScore(HistoryScoreComputeFormDTO formDTO); + + HistoryScoreSjffResultDTO sumGridNum(HistoryScoreComputeFormDTO formDTO); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java index 4e6d4e4207..d5358f0f6d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyHistoryScoreServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.dto.indexcollect.form.HistoryScoreListFormDTO; import com.epmet.dto.indexcollect.result.HistoryScoreComputeResultDTO; import com.epmet.dto.indexcollect.result.HistoryScoreDetailResultDTO; import com.epmet.dto.indexcollect.result.HistoryScoreListResultDTO; +import com.epmet.dto.indexcollect.result.HistoryScoreSjffResultDTO; import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenPyHistoryScoreDetailEntity; import com.epmet.entity.evaluationindex.indexcoll.ScreenPyHistoryScoreEntity; @@ -183,7 +184,14 @@ public class ScreenPyHistoryScoreServiceImpl implements ScreenPyHistoryScoreServ * 事件赋分= 街道下末级网格上报事件数量乘以对应的每项事件分值的累加和除以街道下有效未离职状态的网格员总数 * 加上街道下末级网格例行工作数量乘以对应的每项事件分值的累加和除以街道下有效未离职状态的网格员总数 */ - //TODO + //查询街道下时间区间内事件总分 + HistoryScoreSjffResultDTO dto1 = screenPyHistoryScoreDao.sumEventScore(formDTO); + //查询街道下时间区间内例行工作总分 + HistoryScoreSjffResultDTO dto2 = screenPyHistoryScoreDao.sumProjectScore(formDTO); + //查询街道下有效网格员数 + HistoryScoreSjffResultDTO dto3 = screenPyHistoryScoreDao.sumGridNum(formDTO); + String score = numberFormat.format(((float) dto1.getEventScore() / (float) dto3.getGridStaffNum()) + (dto2.getProjectScore() / dto3.getGridStaffNum())); + resultDTO.setScore(score); } return resultDTO; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml index 1d1e0c7276..91374a561a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml @@ -29,5 +29,45 @@ ORDER BY a.start_time DESC + + + + + +