From 34b000666dd51568a0aa18973bb07856a8e62c31 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 15 Dec 2022 16:03:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govorg/impl/GovOrgServiceImpl.java | 2 +- .../ScreenPyHistoryScoreDetailDTO.java | 40 +++++++++++++++++++ .../form/HistoryScoreFormDTO.java | 40 +++++++++++++++++++ .../result/HistoryScoreDetailResultDTO.java | 40 +++++++++++++++++++ .../result/HistoryScoreSjffResultDTO.java | 6 +-- .../ScreenPyHistoryScoreDetailEntity.java | 40 +++++++++++++++++++ .../impl/ScreenPyHistoryScoreServiceImpl.java | 9 +++-- .../indexcoll/ScreenPyHistoryScoreDao.xml | 16 ++++---- 8 files changed, 178 insertions(+), 15 deletions(-) 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 f8c5a28397..ab72e0992d 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 @@ -708,7 +708,7 @@ public class GovOrgServiceImpl implements GovOrgService { public List grdiLively(GridLivelyFormDTO formDTO) { //1.查询当前组织的直属下级组织列表及组织下的网格总数 LinkedList subList = new LinkedList<>(); - if(StringUtils.isNotBlank(formDTO.getType())&&"".equals(formDTO.getType())){ + if (StringUtils.isNotBlank(formDTO.getType()) && "historyScore".equals(formDTO.getType())) { GridLivelyResultDTO dto = evaluationIndexService.streetGridList(formDTO); subList.add(dto); }else { diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenPyHistoryScoreDetailDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenPyHistoryScoreDetailDTO.java index b8e0cf7132..06ea06cc13 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenPyHistoryScoreDetailDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenPyHistoryScoreDetailDTO.java @@ -68,11 +68,41 @@ public class ScreenPyHistoryScoreDetailDTO implements Serializable { */ private BigDecimal sjff; + /** + * 接入率 + */ + private BigDecimal jrl; + + /** + * 在线率 + */ + private BigDecimal zxl; + + /** + * 出图率 + */ + private BigDecimal ctl; + /** * 雪亮工程 */ private BigDecimal xlgc; + /** + * 完成进度 + */ + private BigDecimal wcjd; + + /** + * 未补检 + */ + private BigDecimal wbj; + + /** + * 反馈抽检 + */ + private BigDecimal fkcj; + /** * 日核周调 */ @@ -83,11 +113,21 @@ public class ScreenPyHistoryScoreDetailDTO implements Serializable { */ private BigDecimal ldgz; + /** + * 亮点工作备注 + */ + private String ldbz; + /** * 其他工作 */ private BigDecimal qtgz; + /** + * 其他工作备注 + */ + private String qtgzbz; + /** * 能力得分 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreFormDTO.java index f5e26d5101..7d337143c1 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreFormDTO.java @@ -77,11 +77,41 @@ public class HistoryScoreFormDTO implements Serializable { */ private BigDecimal sjff; + /** + * 接入率 + */ + private BigDecimal jrl; + + /** + * 在线率 + */ + private BigDecimal zxl; + + /** + * 出图率 + */ + private BigDecimal ctl; + /** * 雪亮工程 */ private BigDecimal xlgc; + /** + * 完成进度 + */ + private BigDecimal wcjd; + + /** + * 未补检 + */ + private BigDecimal wbj; + + /** + * 反馈抽检 + */ + private BigDecimal fkcj; + /** * 日核周调 */ @@ -92,11 +122,21 @@ public class HistoryScoreFormDTO implements Serializable { */ private BigDecimal ldgz; + /** + * 亮点工作备注 + */ + private String ldbz; + /** * 其他工作 */ private BigDecimal qtgz; + /** + * 其他工作备注 + */ + private String qtgzbz; + /** * 能力得分 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreDetailResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreDetailResultDTO.java index 546ac9c4e6..8ee0bb9ece 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreDetailResultDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/HistoryScoreDetailResultDTO.java @@ -91,11 +91,41 @@ public class HistoryScoreDetailResultDTO implements Serializable { */ private BigDecimal sjff; + /** + * 接入率 + */ + private BigDecimal jrl; + + /** + * 在线率 + */ + private BigDecimal zxl; + + /** + * 出图率 + */ + private BigDecimal ctl; + /** * 雪亮工程 */ private BigDecimal xlgc; + /** + * 完成进度 + */ + private BigDecimal wcjd; + + /** + * 未补检 + */ + private BigDecimal wbj; + + /** + * 反馈抽检 + */ + private BigDecimal fkcj; + /** * 日核周调 */ @@ -106,11 +136,21 @@ public class HistoryScoreDetailResultDTO implements Serializable { */ private BigDecimal ldgz; + /** + * 亮点工作备注 + */ + private String ldbz; + /** * 其他工作 */ private BigDecimal qtgz; + /** + * 其他工作备注 + */ + private String qtgzbz; + /** * 能力得分 */ 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 index 8efdff7216..a6a19a0ef9 100644 --- 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 @@ -12,14 +12,14 @@ public class HistoryScoreSjffResultDTO implements Serializable { /** * 上报事件总得分 */ - private Integer eventScore; + private Integer eventScore = 0; /** * 例行工作总得分 */ - private Integer projectScore; + private Integer projectScore = 0; /** * 网格员总数 */ - private Integer gridStaffNum; + private Integer gridStaffNum = 0; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenPyHistoryScoreDetailEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenPyHistoryScoreDetailEntity.java index 9d5b7b9851..29c2b4c8f9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenPyHistoryScoreDetailEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenPyHistoryScoreDetailEntity.java @@ -66,11 +66,41 @@ public class ScreenPyHistoryScoreDetailEntity extends BaseEpmetEntity { */ private BigDecimal sjff; + /** + * 接入率 + */ + private BigDecimal jrl; + + /** + * 在线率 + */ + private BigDecimal zxl; + + /** + * 出图率 + */ + private BigDecimal ctl; + /** * 雪亮工程 */ private BigDecimal xlgc; + /** + * 完成进度 + */ + private BigDecimal wcjd; + + /** + * 未补检 + */ + private BigDecimal wbj; + + /** + * 反馈抽检 + */ + private BigDecimal fkcj; + /** * 日核周调 */ @@ -81,11 +111,21 @@ public class ScreenPyHistoryScoreDetailEntity extends BaseEpmetEntity { */ private BigDecimal ldgz; + /** + * 亮点工作备注 + */ + private String ldbz; + /** * 其他工作 */ private BigDecimal qtgz; + /** + * 其他工作备注 + */ + private String qtgzbz; + /** * 能力得分 */ 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 cb41b6905b..89598e91bd 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 @@ -36,6 +36,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.text.NumberFormat; @@ -179,9 +180,11 @@ public class ScreenPyHistoryScoreServiceImpl implements ScreenPyHistoryScoreServ if (!result.success() || result.getData() == null) { throw new RenException("统计街道下网格活跃度数据失败"); } - GridLivelyResultDTO gridLively = result.getData().get(NumConstant.ZERO); - String score = (gridLively.getGridSumNum() <= 0) ? "0" : numberFormat.format(((float) gridLively.getGridLivelyNum() / (float) gridLively.getGridSumNum()) * 100 + (gridLively.getGridOrdinaryNum() / gridLively.getGridSumNum()) * 80); - resultDTO.setScore(score); + if (!CollectionUtils.isEmpty(result.getData())) { + GridLivelyResultDTO gridLively = result.getData().get(NumConstant.ZERO); + String score = (gridLively.getGridSumNum() <= 0) ? "0" : numberFormat.format(((float) gridLively.getGridLivelyNum() / (float) gridLively.getGridSumNum()) * 100 + (gridLively.getGridOrdinaryNum() / gridLively.getGridSumNum()) * 80); + resultDTO.setScore(score); + } } else if ("event".equals(formDTO.getType())) { /** * 事件赋分= 街道下末级网格上报事件数量乘以对应的每项事件分值的累加和除以街道下有效未离职状态的网格员总数 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 91374a561a..49806a901e 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 @@ -31,21 +31,21 @@