From 41a7cc3681eb26eed8c4ad30358dd055d758c940 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 15 Dec 2022 16:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=83=BD=E5=8A=9B=E5=BE=97?= =?UTF-8?q?=E5=88=86=E9=A2=84=E7=95=99=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/HistoryScoreFormDTO.java | 26 +++++++++---------- .../ScreenPyHistoryScoreController.java | 5 ++++ .../ScreenPyHistoryScoreService.java | 2 ++ .../impl/ScreenPyHistoryScoreServiceImpl.java | 19 ++++++++++++++ 4 files changed, 39 insertions(+), 13 deletions(-) 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 7d337143c1..dc52a7bc9e 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 @@ -70,57 +70,57 @@ public class HistoryScoreFormDTO implements Serializable { /** * 网格活跃度 */ - private BigDecimal wghyd; + private BigDecimal wghyd = new BigDecimal(0); /** * 事件赋分 */ - private BigDecimal sjff; + private BigDecimal sjff = new BigDecimal(0); /** * 接入率 */ - private BigDecimal jrl; + private BigDecimal jrl = new BigDecimal(0); /** * 在线率 */ - private BigDecimal zxl; + private BigDecimal zxl = new BigDecimal(0); /** * 出图率 */ - private BigDecimal ctl; + private BigDecimal ctl = new BigDecimal(0); /** * 雪亮工程 */ - private BigDecimal xlgc; + private BigDecimal xlgc = new BigDecimal(0); /** * 完成进度 */ - private BigDecimal wcjd; + private BigDecimal wcjd = new BigDecimal(0); /** * 未补检 */ - private BigDecimal wbj; + private BigDecimal wbj = new BigDecimal(0); /** * 反馈抽检 */ - private BigDecimal fkcj; + private BigDecimal fkcj = new BigDecimal(0); /** * 日核周调 */ - private BigDecimal rhzt; + private BigDecimal rhzt = new BigDecimal(0); /** * 亮点工作 */ - private BigDecimal ldgz; + private BigDecimal ldgz = new BigDecimal(0); /** * 亮点工作备注 @@ -130,7 +130,7 @@ public class HistoryScoreFormDTO implements Serializable { /** * 其他工作 */ - private BigDecimal qtgz; + private BigDecimal qtgz = new BigDecimal(0); /** * 其他工作备注 @@ -140,7 +140,7 @@ public class HistoryScoreFormDTO implements Serializable { /** * 能力得分 */ - private BigDecimal nldf; + private BigDecimal nldf = new BigDecimal(0); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenPyHistoryScoreController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenPyHistoryScoreController.java index 8c3e16bae9..72a1321300 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenPyHistoryScoreController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenPyHistoryScoreController.java @@ -151,4 +151,9 @@ public class ScreenPyHistoryScoreController { return new Result().ok(screenPyHistoryScoreService.computeScore(formDTO)); } + @PostMapping("nldfscore") + public Result nldfScore(@RequestBody HistoryScoreFormDTO.Detail dto) { + return new Result().ok(screenPyHistoryScoreService.nldfScore(dto)); + } + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenPyHistoryScoreService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenPyHistoryScoreService.java index c92ba2cfaa..8f716045dd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenPyHistoryScoreService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenPyHistoryScoreService.java @@ -27,4 +27,6 @@ public interface ScreenPyHistoryScoreService { HistoryScoreDetailResultDTO detail(HistoryScoreFormDTO formDTO); HistoryScoreComputeResultDTO computeScore(HistoryScoreComputeFormDTO formDTO); + + HistoryScoreComputeResultDTO nldfScore(HistoryScoreFormDTO.Detail dto); } 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 89598e91bd..17073bfde2 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 @@ -202,5 +202,24 @@ public class ScreenPyHistoryScoreServiceImpl implements ScreenPyHistoryScoreServ return resultDTO; } + /** + * 政法能力-历史得分-填完六个数后计算能力得分使用 + * @param dto + * @return + */ + @Override + public HistoryScoreComputeResultDTO nldfScore(HistoryScoreFormDTO.Detail dto) { + HistoryScoreComputeResultDTO resultDTO = new HistoryScoreComputeResultDTO(); + resultDTO.setAgencyId(dto.getAgencyId()); + ScreenPyWeightConfigurationDTO wcDTO = screenPyWeightConfigurationDao.selectOneDTO(); + if (null != wcDTO) { + BigDecimal nldf = dto.getWghyd().multiply(wcDTO.getWghyd()).add(dto.getWghyd().multiply(wcDTO.getWghyd())) + .add(dto.getWghyd().multiply(wcDTO.getWghyd())).add(dto.getWghyd().multiply(wcDTO.getWghyd())) + .add(dto.getWghyd().multiply(wcDTO.getWghyd())).add(dto.getWghyd().multiply(wcDTO.getWghyd())); + resultDTO.setScore(nldf.toString()); + } + return resultDTO; + } + }