todo

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<ScreenCustomerGridDTO> getSubAllGridByAgencyPath(@Param("fullAgencyPath") String fullAgencyPath);
+
+    GridLivelyResultDTO streetGridList(GridLivelyFormDTO formDTO);
 }

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<GridDateIdResultDTO> getGridProejctToProjectMain(GridLivelyFormDTO formDTO);
+
+    GridLivelyResultDTO streetGridList(GridLivelyFormDTO formDTO);
 }

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

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

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -236,4 +236,13 @@
         order by parentAgencyId,gridName
     </select>
 
+    <select id="streetGridList" resultType="com.epmet.dataaggre.dto.govorg.result.GridLivelyResultDTO">
+        SELECT
+            COUNT(id) gridSumNum
+        FROM
+            grid_info_pingyin
+        WHERE
+            pids LIKE CONCAT('%', #{agencyId}, '%')
+    </select>
+
 </mapper>

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

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

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<ScreenPyHistoryScoreEntity> {
 
     List<HistoryScoreListResultDTO> selectHistoryScoreList(HistoryScoreListFormDTO formDTO);
+
+    HistoryScoreSjffResultDTO sumEventScore(HistoryScoreComputeFormDTO formDTO);
+
+    HistoryScoreSjffResultDTO sumProjectScore(HistoryScoreComputeFormDTO formDTO);
+
+    HistoryScoreSjffResultDTO sumGridNum(HistoryScoreComputeFormDTO formDTO);
 }

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

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
     </select>
 
+    <select id="sumEventScore" resultType="com.epmet.dto.indexcollect.result.HistoryScoreSjffResultDTO">
+        SELECT
+            SUM(b.score) 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 DATE_FORMAT(a.event_create_time, "%Y-%m-%d") >= #{startTime}
+        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
+        FROM
+            screen_py_event_data a
+        LEFT JOIN customer_project_category_dict b ON b.CUSTOMER_ID = #{customerId}
+        AND b.is_disable = 'enable'
+        AND a.category_code = b.category_code
+        WHERE
+            a.event_type = 'project'
+        AND 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") <![CDATA[ <= ]]> #{endTime}
+    </select>
+
+    <select id="sumGridNum" resultType="com.epmet.dto.indexcollect.result.HistoryScoreSjffResultDTO">
+        SELECT
+            COUNT(id) gridStaffNum
+        FROM
+            screen_py_grid_staff
+        WHERE
+            del_flag = '0'
+        AND is_leave = 'N'
+        AND pids LIKE CONCAT('%', #{agencyId}, '%')
+    </select>
+
 
 </mapper>