Merge branch 'master' into pingyin_master

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<GridLivelyResultDTO> grdiLively(GridLivelyFormDTO formDTO) {
         //1.查询当前组织的直属下级组织列表及组织下的网格总数
         LinkedList<GridLivelyResultDTO> 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 {

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 ldgzbz;
+
     /**
      * 其他工作
      */
     private BigDecimal qtgz;
 
+    /**
+     * 其他工作备注
+     */
+    private String qtgzbz;
+
     /**
      * 能力得分
      */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/HistoryScoreFormDTO.java

@@ -70,37 +70,77 @@ 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 = new BigDecimal(0);
+
+        /**
+         * 在线率
+         */
+        private BigDecimal zxl = new BigDecimal(0);
+
+        /**
+         * 出图率
+         */
+        private BigDecimal ctl = new BigDecimal(0);
 
         /**
          * 雪亮工程
          */
-        private BigDecimal xlgc;
+        private BigDecimal xlgc = new BigDecimal(0);
+
+        /**
+         * 完成进度
+         */
+        private BigDecimal wcjd = new BigDecimal(0);
+
+        /**
+         * 未补检
+         */
+        private BigDecimal wbj = new BigDecimal(0);
+
+        /**
+         * 反馈抽检
+         */
+        private BigDecimal fkcj = new BigDecimal(0);
 
         /**
          * 日核周调
          */
-        private BigDecimal rhzt;
+        private BigDecimal rhzt = new BigDecimal(0);
 
         /**
          * 亮点工作
          */
-        private BigDecimal ldgz;
+        private BigDecimal ldgz = new BigDecimal(0);
+
+        /**
+         * 亮点工作备注
+         */
+        private String ldgzbz;
 
         /**
          * 其他工作
          */
-        private BigDecimal qtgz;
+        private BigDecimal qtgz = new BigDecimal(0);
+
+        /**
+         * 其他工作备注
+         */
+        private String qtgzbz;
 
         /**
          * 能力得分
          */
-        private BigDecimal nldf;
+        private BigDecimal nldf = new BigDecimal(0);
     }
 
 }

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 ldgzbz;
+
         /**
          * 其他工作
          */
         private BigDecimal qtgz;
 
+        /**
+         * 其他工作备注
+         */
+        private String qtgzbz;
+
         /**
          * 能力得分
          */

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

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/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 ldgzbz;
+
 	/**
 	 * 其他工作
 	 */
 	private BigDecimal qtgz;
 
+	/**
+	 * 其他工作备注
+	 */
+	private String qtgzbz;
+
 	/**
 	 * 能力得分
 	 */

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

@@ -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;
@@ -135,7 +136,7 @@ public class ScreenPyHistoryScoreServiceImpl implements ScreenPyHistoryScoreServ
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到相关信息", "未查到相关信息");
         }
         entity.setDelFlag("1");
-        screenPyHistoryScoreDao.updateById(entity);
+        screenPyHistoryScoreDao.deleteById(entity);
         screenPyHistoryScoreDetailDao.delByHistoryScoreId(formDTO.getId(), formDTO.getUserId());
     }
 
@@ -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);
+            if (!CollectionUtils.isEmpty(result.getData())) {
-            String score = (gridLively.getGridSumNum() <= 0) ? "0" : numberFormat.format(((float) gridLively.getGridLivelyNum() / (float) gridLively.getGridSumNum()) * 100 + (gridLively.getGridOrdinaryNum() / gridLively.getGridSumNum()) * 80);
+                GridLivelyResultDTO gridLively = result.getData().get(NumConstant.ZERO);
-            resultDTO.setScore(score);
+                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())) {
             /**
              * 事件赋分= 街道下末级网格上报事件数量乘以对应的每项事件分值的累加和除以街道下有效未离职状态的网格员总数
@@ -199,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;
+    }
+
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenPyWeightConfigurationServiceImpl.java

@@ -67,7 +67,7 @@ public class ScreenPyWeightConfigurationServiceImpl extends BaseServiceImpl<Scre
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到相关信息", "未查到相关信息");
         }
         entity.setDelFlag("1");
-        baseDao.updateById(entity);
+        baseDao.deleteById(entity);
     }
 
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml

@@ -31,21 +31,21 @@
 
     <select id="sumEventScore" resultType="com.epmet.dto.indexcollect.result.HistoryScoreSjffResultDTO">
         SELECT
-            SUM(b.score) eventScore
+            IFNULL(SUM(b.score), 0) eventScore
         FROM
             screen_py_event_data a
         LEFT JOIN customer_patrol_work_type_dict b ON b.is_disable = 'enable'
         AND a.category_code = b.category_code
         WHERE
             a.event_type = 'work'
-        AND PIDS LIKE CONCAT('%', #{agencyId}, '%'))
+        AND a.pids LIKE CONCAT('%', #{agencyId}, '%')
-        AND DATE_FORMAT(a.event_create_time, "%Y-%m-%d") >= #{startTime}
+        AND DATE_FORMAT(a.event_create_time, "%Y%m%d") >= #{startTime}
-        AND DATE_FORMAT(a.event_create_time, "%Y-%m-%d") <![CDATA[ <= ]]> #{endTime}
+        AND DATE_FORMAT(a.event_create_time, "%Y%m%d") <![CDATA[ <= ]]> #{endTime}
     </select>
 
     <select id="sumProjectScore" resultType="com.epmet.dto.indexcollect.result.HistoryScoreSjffResultDTO">
         SELECT
-            SUM(b.score) projectScore
+            IFNULL(SUM(b.score), 0) projectScore
         FROM
             screen_py_event_data a
         LEFT JOIN customer_project_category_dict b ON b.CUSTOMER_ID = #{customerId}
@@ -53,9 +53,9 @@
         AND a.category_code = b.category_code
         WHERE
             a.event_type = 'project'
-        AND PIDS LIKE CONCAT('%', #{agencyId}, '%')
+        AND a.pids LIKE CONCAT('%', #{agencyId}, '%')
-        AND DATE_FORMAT(a.event_create_time, "%Y-%m-%d") >= #{startTime}
+        AND DATE_FORMAT(a.event_create_time, "%Y%m%d") >= #{startTime}
-        AND DATE_FORMAT(a.event_create_time, "%Y-%m-%d") <![CDATA[ <= ]]> #{endTime}
+        AND DATE_FORMAT(a.event_create_time, "%Y%m%d") <![CDATA[ <= ]]> #{endTime}
     </select>
 
     <select id="sumGridNum" resultType="com.epmet.dto.indexcollect.result.HistoryScoreSjffResultDTO">