Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/TransferRightRatioResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.extract.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/10/19 2:00 下午
+ */
+@Data
+public class TransferRightRatioResultDTO implements Serializable {
+
+    private String projectId;
+
+    private String gridId;
+
+    private Boolean status;
+
+    private Integer notReturnProject;
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java

@@ -55,6 +55,8 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
      */
     List<NotReturnProjectResultDTO> selectNotReturnProject(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("actionCode") String actionCode,@Param("orgType") String orgType);
 
+	List<TransferRightRatioResultDTO> selectNotReturn(@Param("customerId")String customerId,@Param("monthId")String monthId);
+
     /**
      * @Description  查询项目评价信息
      * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.extract.result.TransferRightRatioResultDTO;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
@@ -77,6 +78,8 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	 */
 	List<GridProjectClosedTotalResultDTO> selectGridClosedProject(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("status") String status);
 
+	List<TransferRightRatioResultDTO> selectTransferRightRatio(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
 	/**
 	 * 根据日期删除数据
 	 * @author zhaoqifeng

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java

@@ -29,10 +29,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.text.NumberFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -277,16 +274,30 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         //网格办结项目数
         List<GridProjectClosedTotalResultDTO> gridProjectClosedTotalList = projectMainService.selectGridClosedProject(customerId, monthId, ExtractConstant.CLOSED);
         //网格吹哨部门准确率  【没被退回的项目数/项目总数 】
-        List<NotReturnProjectResultDTO> notReturnProjectList = projectLogService.selectNotReturnProject(customerId, monthId, ExtractConstant.RETURN_ACTION_CODE, ExtractConstant.GRID_ORG_TYPE);
+        List<TransferRightRatioResultDTO> transferRightRatioResultDTOS = projectMainService.selectTransferRightRatio(customerId, monthId);
-        if (!CollectionUtils.isEmpty(gridIssueShiftProjectRatio) && !CollectionUtils.isEmpty(notReturnProjectList)){
+        List<TransferRightRatioResultDTO> transferRightRatioResultDTOS1 = projectLogService.selectNotReturn(customerId, monthId);
-            notReturnProjectList.forEach(not -> {
+        if (!CollectionUtils.isEmpty(transferRightRatioResultDTOS1)){
-                gridIssueShiftProjectRatio.forEach(total -> {
+            transferRightRatioResultDTOS.forEach(r -> {
-                    if (not.getGridId().equals(total.getGridId())){
+                transferRightRatioResultDTOS1.forEach(t -> {
-                        not.setTransferRightRatio(getRound(new BigDecimal(not.getNotReturnProject()/total.getProjectTotal()).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
+                    r.setStatus(r.getProjectId().equals(t.getProjectId()) ? true : false);
-                    }
                 });
             });
+        }else {
+            transferRightRatioResultDTOS.forEach(r -> {
+                r.setStatus(false);
+            });
         }
+        Map<String, List<TransferRightRatioResultDTO>> groupByGridProject = transferRightRatioResultDTOS.stream().collect(Collectors.groupingBy(TransferRightRatioResultDTO::getGridId));
+        Map<String,BigDecimal> notReturnMap = new HashMap<>(16);
+        groupByGridProject.forEach((grid,project) -> {
+            AtomicReference<Integer> count = new AtomicReference<>(NumConstant.ZERO);
+            project.forEach(p -> {
+                if (p.getStatus().equals(false)){
+                    count.getAndSet(count.get() + NumConstant.ONE);
+                }
+            });
+            notReturnMap.put(grid,getRound(new BigDecimal(count.get()/project.size()).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
+        });
         //网格内解决的项目的满意度
         //项目评价（分值定义下非常满意100，满意80，不满意（一般）60）的人数的平均分（每个项目的参加人数的分数和/评论人数=一个项目的平均分）+其他项目得分/已关闭项目总数
         List<ProjectEvaluateResultDTO> projectEvaluateList = projectLogService.selectProjectEvaluate(customerId, monthId);
@@ -355,10 +366,10 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                 });
             }
             // 4. 网格吹哨部门准确率
-            if (!CollectionUtils.isEmpty(notReturnProjectList)) {
+            if(notReturnMap != null){
-                notReturnProjectList.forEach(not -> {
+                notReturnMap.forEach((grid,transferRightRatio) -> {
-                    if (r.getGridId().equals(not.getGridId())) {
+                    if (r.getGridId().equals(grid)){
-                        r.setTransferRightRatio(not.getTransferRightRatio());
+                        r.setTransferRightRatio(transferRightRatio);
                     }
                 });
             }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java

@@ -20,10 +20,7 @@ package com.epmet.service.evaluationindex.extract.todata;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
-import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.extract.result.*;
-import com.epmet.dto.extract.result.AutoNoMyResultDTO;
-import com.epmet.dto.extract.result.NotReturnProjectResultDTO;
-import com.epmet.dto.extract.result.ProjectEvaluateResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
 
 import java.math.BigDecimal;
@@ -118,6 +115,8 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      */
     List<NotReturnProjectResultDTO> selectNotReturnProject(String customerId,String monthId,String actionCode,String orgType);
 
+    List<TransferRightRatioResultDTO> selectNotReturn(String customerId,String monthId);
+
     /**
      * @Description  查询项目评价信息
      * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.extract.result.TransferRightRatioResultDTO;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
@@ -126,6 +127,8 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      */
     List<GridProjectClosedTotalResultDTO> selectGridClosedProject(String customerId,String monthId,String status);
 
+    List<TransferRightRatioResultDTO> selectTransferRightRatio(String customerId,String monthId);
+
     /**
      * 项目超期数
      * @author zhaoqifeng

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java

@@ -126,6 +126,11 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return baseDao.selectNotReturnProject(customerId, monthId, actionCode, orgType);
     }
 
+    @Override
+    public List<TransferRightRatioResultDTO> selectNotReturn(String customerId,String monthId){
+        return baseDao.selectNotReturn(customerId,monthId);
+    }
+
     /**
      * @Description  查询项目评价信息
      * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@@ -30,6 +30,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectMainDailyDao;
 import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.extract.result.TransferRightRatioResultDTO;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
@@ -134,6 +135,11 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
         return baseDao.selectGridClosedProject(customerId, monthId,status);
     }
 
+    @Override
+    public List<TransferRightRatioResultDTO> selectTransferRightRatio(String customerId, String monthId){
+        return baseDao.selectTransferRightRatio(customerId,monthId);
+    }
+
     @Override
     public void deleteByDate(String customerId, String date) {
         baseDao.deleteByDate(customerId, date);

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml

@@ -513,4 +513,16 @@
                AND fl.MONTH_ID = #{monthId}
              GROUP BY fl.ORG_ID) b ON a.ORG_ID = b.ORG_ID
     </select>
+
+    <select id="selectNotReturn" resultType="com.epmet.dto.extract.result.TransferRightRatioResultDTO">
+        SELECT
+            DISTINCT(PROJECT_ID) AS projectId
+        FROM
+            fact_origin_project_log_daily
+        WHERE
+            ORG_TYPE = 'grid'
+            AND ACTION_CODE != 'return'
+            AND CUSTOMER_ID = #{customerId}
+            AND MONTH_ID = #{monthId}
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -427,4 +427,15 @@
             </foreach>
         </if>
     </select>
+
+    <select id="selectTransferRightRatio" resultType="com.epmet.dto.extract.result.TransferRightRatioResultDTO">
+        SELECT
+            ID as projectId,
+            GRID_ID
+        FROM
+            fact_origin_project_main_daily
+        WHERE
+          CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+    </select>
 </mapper>