计算能力得分预留方法

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);
     }
 
 }

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<HistoryScoreComputeResultDTO>().ok(screenPyHistoryScoreService.computeScore(formDTO));
     }
 
+    @PostMapping("nldfscore")
+    public Result<HistoryScoreComputeResultDTO> nldfScore(@RequestBody HistoryScoreFormDTO.Detail dto) {
+        return new Result<HistoryScoreComputeResultDTO>().ok(screenPyHistoryScoreService.nldfScore(dto));
+    }
+
 }

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);
 }

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;
+    }
+
 
 }