Merge branch 'dev_screen_data_2.0' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -38,6 +38,7 @@ public interface NumConstant {
     int FIFTY_ONE = 51;
     int SIXTY = 60;
     int ONE_HUNDRED = 100;
+    BigDecimal ONE_HUNDRED_DECIMAL = new BigDecimal(100);
     int ONE_THOUSAND = 1000;
     int MAX = 99999999;
     int EIGHTY_EIGHT = 88;

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

@@ -380,7 +380,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
             NumberFormat numberFormat = NumberFormat.getInstance();
             numberFormat.setMaximumFractionDigits(NumConstant.SIX);
             String topicToIssueRatioStr = numberFormat.format((float) projectTotal / issueTotal);
-            BigDecimal topicToIssueRatio = new BigDecimal(topicToIssueRatioStr);
+            BigDecimal topicToIssueRatio = new BigDecimal(topicToIssueRatioStr).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
             map.put(partyMember.getUserId(), topicToIssueRatio);
         }
         return map;

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

@@ -282,7 +282,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
             notReturnProjectList.forEach(not -> {
                 gridIssueShiftProjectRatio.forEach(total -> {
                     if (not.getGridId().equals(total.getGridId())){
-                        not.setTransferRightRatio(getRound(new BigDecimal(not.getNotReturnProject()/total.getProjectTotal())));
+                        not.setTransferRightRatio(getRound(new BigDecimal(not.getNotReturnProject()/total.getProjectTotal()).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
                     }
                 });
             });
@@ -319,7 +319,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                 scoreMap.forEach((k,v) -> {
                     allScore.set(++v);
                 });
-                resultSatisfactionScore.put(gridId,getRound(new BigDecimal(allScore.get()/scoreMap.size())));
+                resultSatisfactionScore.put(gridId,getRound(new BigDecimal(allScore.get()/scoreMap.size()).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
             });
         }
         String quarterId = DateUtils.getQuarterId(monthId);
@@ -432,7 +432,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                     int regUserTotal=regUserIds.size();
                     String volunteerRatioStr = numberFormat.format((float) volunteerTotal / regUserTotal);
                     BigDecimal volunteerRatio = new BigDecimal(volunteerRatioStr);
-                    entity.setVolunteerRatio(volunteerRatio);
+                    entity.setVolunteerRatio(volunteerRatio.multiply(new BigDecimal(NumConstant.ONE_HUNDRED)));
                 }
             }
             //网格党员志愿者率 :  所有志愿者中，同时是党员的占比
@@ -449,7 +449,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                     int partyUserCount=paryUserIds.size();
                     String partyVolunteerRatioStr = numberFormat.format((float) partyUserCount / volunteerCount);
                     BigDecimal partyVolunteerRatio = new BigDecimal(partyVolunteerRatioStr);
-                    entity.setPartyVolunteerRatio(partyVolunteerRatio);
+                    entity.setPartyVolunteerRatio(partyVolunteerRatio.multiply(new BigDecimal(NumConstant.ONE_HUNDRED)));
                 }
             }
 
@@ -491,7 +491,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
             gridProjectTotalList.forEach(project -> {
                 gridIssueTotalList.forEach(issue -> {
                     if (project.getGridId().equals(issue.getGridId())) {
-                        project.setIssueToProjectRatio(getRound(new BigDecimal(project.getProjectTotal() / issue.getIssueTotal())));
+                        project.setIssueToProjectRatio(getRound(new BigDecimal(project.getProjectTotal() / issue.getIssueTotal()).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
                     }
                 });
             });

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

@@ -128,7 +128,7 @@ public class IndexCollCommunityServiceImpl implements IndexCollCommunityService
 			list.forEach(entity -> satisfaction.stream().filter(dto -> dto.getAgencyId().equals(entity.getAgencyId())).forEach(sa -> {
 				if (sa.getCount() != NumConstant.ZERO) {
 					BigDecimal count = new BigDecimal(sa.getCount());
-					BigDecimal sum = new BigDecimal(sa.getSum());
+					BigDecimal sum = sa.getRatio();
 					entity.setSatisfactionRatio(sum.divide(count, NumConstant.SIX, RoundingMode.HALF_UP));
 				}
 			}));

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

@@ -122,7 +122,7 @@ public class IndexCollDistrictServiceImpl implements IndexCollDistrictService {
 			list.forEach(entity -> satisfaction.stream().filter(dto -> dto.getAgencyId().equals(entity.getAgencyId())).forEach(sa -> {
 				if (sa.getCount() != NumConstant.ZERO) {
 					BigDecimal count = new BigDecimal(sa.getCount());
-					BigDecimal sum = new BigDecimal(sa.getSum());
+					BigDecimal sum = sa.getRatio();
 					entity.setSatisfactionRatio(sum.divide(count, NumConstant.SIX, RoundingMode.HALF_UP));
 				}
 			}));

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

@@ -120,7 +120,7 @@ public class IndexCollStreetServiceImpl implements IndexCollStreetService {
 			list.forEach(entity -> satisfaction.stream().filter(dto -> dto.getAgencyId().equals(entity.getAgencyId())).forEach(sa -> {
 				if (sa.getCount() != NumConstant.ZERO) {
 					BigDecimal count = new BigDecimal(sa.getCount());
-					BigDecimal sum = new BigDecimal(sa.getSum());
+					BigDecimal sum = sa.getRatio();
 					entity.setSatisfactionRatio(sum.divide(count, NumConstant.SIX, RoundingMode.HALF_UP));
 				}
 			}));

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

@@ -174,11 +174,18 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			}));
 			list.forEach(entity -> finishOrgList.stream().filter(finish -> entity.getId().equals(finish.getProjectId())).forEach(dto -> {
 				String[] orgIds = dto.getPIdPath().split(StrConstant.COLON);
+				String org = "";
 				if (orgIds.length > NumConstant.ONE) {
-					entity.setFinishOrgIds(orgIds[orgIds.length - 1]);
+					org = orgIds[orgIds.length - 1];
 				} else {
-					entity.setFinishOrgIds(orgIds[0]);
+					org = orgIds[0];
 				}
+				if (StringUtils.isNotEmpty(dto.getGridId())) {
+					org = org + StrConstant.COLON + dto.getGridId();
+				} else if (StringUtils.isNotEmpty(dto.getDepartmentId())) {
+					org = org + StrConstant.COLON + dto.getDepartmentId();
+				}
+				entity.setFinishOrgIds(org);
 			}));
 			//插入数据
 			if (!list.isEmpty()) {

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

@@ -71,7 +71,8 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             }else{
                 //2、党员参与议事占比
                 int issueTotal=calPartyPartiIssueTotal(customerId,gridId,null,null,null);
-                entity.setIssueRatio(new BigDecimal(entity.getIssueTotal()/issueTotal).setScale(NumConstant.SIX,RoundingMode.HALF_UP));
+                BigDecimal issueRatio=new BigDecimal(entity.getIssueTotal()/issueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                entity.setIssueRatio(issueRatio.setScale(NumConstant.SIX,RoundingMode.HALF_UP));
             }
 
             //3、党员发布话题:
@@ -82,7 +83,12 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             } else {
                 //当前网格内所有话题总数
                 int gridTopicTotal = getGridOrCommunityTopicTotal(customerId, gridId, null);
-                entity.setTopicRatio(gridTopicTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getTopicTotal() / gridTopicTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                if(gridTopicTotal == NumConstant.ZERO){
+                    entity.setTopicRatio(BigDecimal.ZERO);
+                }else{
+                    BigDecimal topicRatio=new BigDecimal(entity.getTopicTotal() / gridTopicTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    entity.setTopicRatio(topicRatio.setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                }
             }
 
             //当前网格内所有议题总数
@@ -93,13 +99,21 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
                 //6、党员发布议题占比 :  占网格内所有议题的比率
                 if (entity.getPublishIssueTotal() == NumConstant.ZERO) {
                     entity.setPublishIssueRatio(BigDecimal.ZERO);
+                }else{
+                    BigDecimal publishIssueRatio=new BigDecimal(entity.getPublishIssueTotal() / gridIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    entity.setPublishIssueRatio(publishIssueRatio.setScale(NumConstant.SIX, RoundingMode.HALF_UP));
                 }
-                entity.setPublishIssueRatio(gridIssueTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getPublishIssueTotal() / gridIssueTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
 
                 //7、议题转项目数
                 entity.setShiftProjectTotal(getGridOrCommunityShiftProjectTotal(customerId, gridId, null));
                 //8、议题转项目占比 : 占网格内议题总数的比率
-                entity.setShiftProjectRatio(entity.getShiftProjectTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getShiftProjectTotal() / gridIssueTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                if(entity.getShiftProjectTotal() == NumConstant.ZERO){
+                    entity.setShiftProjectRatio(BigDecimal.ZERO);
+                }else{
+                    BigDecimal shiftProjectRatio=new BigDecimal(entity.getShiftProjectTotal() / gridIssueTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    entity.setShiftProjectRatio(shiftProjectRatio.setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                }
+
             }else{
 //                log.info("当前网格内所有议题总数="+gridIssueTotal);
                 entity.setPublishIssueTotal(NumConstant.ZERO);
@@ -116,7 +130,12 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
             } else {
                 // 10、占总结项目
                 int closedProjectTotal = getGridOrCommunityClosedProjectTotal(customerId, gridId, null, null);
-                entity.setResolvedProjectRatio(closedProjectTotal == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(entity.getResolvedProjectTotal() / closedProjectTotal).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                if(closedProjectTotal == NumConstant.ZERO){
+                    entity.setResolvedProjectRatio(BigDecimal.ZERO);
+                }else {
+                    BigDecimal resolvedProjectRatio=new BigDecimal(entity.getResolvedProjectTotal() / closedProjectTotal).multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
+                    entity.setResolvedProjectRatio(resolvedProjectRatio.setScale(NumConstant.SIX, RoundingMode.HALF_UP));
+                }
             }
         });
         screenPioneerDataService.delAndSavePioneerData(customerId, OrgTypeConstant.GRID, IndexCalConstant.DELETE_SIZE, gridList);

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

@@ -204,6 +204,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         if (NumConstant.SIX != monthId.length()){
             throw new RuntimeException("入参monthId格式不正确：monthId =" + monthId);
         }
+        allParentIds.cleanUp();
         // 根据网格类型，删除 指数-指数数据(每月数值)表中 匹配的数据
         this.batchDelIndexDataMonthly(customerId, monthId, OrgTypeConstant.GRID);
         // 开始处理 网格相关分值表

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java

@@ -86,7 +86,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
             if (screenGrid != null) {
                 //说明之前已经插入了该数据
                 screenGrid.setParentAgencyId(grid.getPid());
-                screenGrid.setAllParentIds(grid.getPid());
+                screenGrid.setAllParentIds(grid.getPids());
                 screenGrid.setCustomerId(grid.getCustomerId());
                 screenGrid.setDataEndTime(dateStr);
                 screenGrid.setGridName(grid.getGridName());

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

@@ -90,7 +90,7 @@
         SELECT
             AGENCY_ID,
             COUNT( ID ) AS "count",
-            SUM( IFNULL( b.score, 0 ) ) AS "sum"
+            SUM( IFNULL( b.score, 80 ) ) AS "ratio"
         FROM
                 ( SELECT f.ID, f.AGENCY_ID FROM fact_origin_project_main_daily f
                 INNER JOIN dim_agency da ON f.FINISH_ORG_IDS LIKE concat('%', da.ID, '%')
@@ -102,7 +102,7 @@
                     LEFT JOIN (
                 SELECT
                     PROJECT_ID,
-                    SUM( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
+                    AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
                 FROM
                     fact_origin_project_log_daily
                 WHERE
@@ -110,6 +110,7 @@
                    OR ACTION_CODE = 'good'
                    OR ACTION_CODE = 'perfect')
                     AND CUSTOMER_ID = #{customerId}
+                    AND MONTH_ID = #{monthId}
                 GROUP BY
                     PROJECT_ID
             ) b ON a.ID = b.PROJECT_ID
@@ -254,70 +255,70 @@
     </select>
     <select id="selectGridSatisfaction" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            a.ORG_ID,
+            GRID_ID AS "orgId",
-            a.sum,
+            COUNT( score &gt;= 80 OR NULL ) AS 'count',
-            IFNULL(b.count, 0) AS "count"
+            COUNT( ID ) AS 'sum'
         FROM
-            (SELECT
+            (
-                 ORG_ID,
+                SELECT
-                 COUNT( ID ) AS "sum"
+                    fm.GRID_ID,
-             FROM
+                    fm.ID,
-                 fact_origin_project_log_daily
+                    IFNULL( fl.score, 80 ) AS "score"
-             WHERE
+                FROM
-                 1 = 1
+                    fact_origin_project_main_daily fm
-               AND ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
+                LEFT JOIN (
-               AND CUSTOMER_ID = #{customerId}
+                SELECT
-               AND MONTH_ID = #{monthId}
+                    f.PROJECT_ID,
-             GROUP BY
+                    AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
-                 ORG_ID) a
+                FROM
-                LEFT JOIN
+                    fact_origin_project_log_daily f
-            (SELECT
+                WHERE
-                 ORG_ID,
+                    ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
-                 COUNT( ID ) AS "count"
+                  AND f.CUSTOMER_ID = #{customerId}
-             FROM
+                  AND f.MONTH_ID = #{monthId}
-                 fact_origin_project_log_daily
+                GROUP BY
-             WHERE
+                    PROJECT_ID
-                 1 = 1
+            ) fl ON fm.ID = fl.PROJECT_ID
-               AND ( ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
+                WHERE  fm.CUSTOMER_ID = #{customerId}
-               AND CUSTOMER_ID = #{customerId}
+                  AND fm.MONTH_ID = #{monthId}
-               AND MONTH_ID = #{monthId}
+            ) a
-             GROUP BY
+        GROUP BY
-                 ORG_ID) b
+            GRID_ID
-            ON a.ORG_ID = b.ORG_ID
     </select>
     <select id="selectOrgSatisfaction" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            a.AGENCY_ID,
+            AGENCY_ID,
-            a.sum,
+            COUNT( score &gt;= 80 OR NULL ) AS 'count',
-            IFNULL(b.count, 0) AS "count"
+            COUNT( ID ) AS 'sum'
         FROM
-            (SELECT
+            (
-                 f.AGENCY_ID,
+                SELECT
-                 COUNT( f.ID ) AS "sum"
+                    fm.AGENCY_ID,
-             FROM
+                    fm.ID,
-                 fact_origin_project_log_daily f
+                    IFNULL( fl.score, 80 ) AS "score"
-             INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID AND da.`LEVEL` = #{level}
+                FROM
-             WHERE
+                    fact_origin_project_main_daily fm
-                 1 = 1
+                INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
-               AND ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
+                        AND da.`LEVEL` = #{level}
-               AND f.CUSTOMER_ID = #{customerId}
+                LEFT JOIN (
-               AND f.MONTH_ID = #{monthId}
+                SELECT
-             GROUP BY
+                    f.PROJECT_ID,
-                 f.AGENCY_ID) a
+                    AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
-                LEFT JOIN
+                FROM
-            (SELECT
+                    fact_origin_project_log_daily f
-                 f.AGENCY_ID,
+                        INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
-                 COUNT( f.ID ) AS "count"
+                        AND da.`LEVEL` = #{level}
-             FROM
+                WHERE
-                 fact_origin_project_log_daily f
+                    ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
-             INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID AND da.`LEVEL` = #{level}
+                  AND f.CUSTOMER_ID = #{customerId}
-             WHERE
+                  AND f.MONTH_ID = #{monthId}
-                 1 = 1
+                GROUP BY
-               AND ( ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
+                    PROJECT_ID
-               AND f.CUSTOMER_ID = #{customerId}
+            ) fl ON fm.ID = fl.PROJECT_ID
-               AND f.MONTH_ID = #{monthId}
+                WHERE  fm.CUSTOMER_ID = #{customerId}
-             GROUP BY
+                    AND fm.MONTH_ID = #{monthId}
-                 f.AGENCY_ID) b
+            ) a
-            ON a.AGENCY_ID = b.AGENCY_ID
+        GROUP BY
+            AGENCY_ID
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -30,15 +30,17 @@
             pp.STAFF_ID,
             pp.CREATED_TIME
         FROM project_process pp
-        LEFT JOIN project_staff staff ON pp.PROJECT_ID = staff.PROJECT_ID
+        INNER JOIN project p ON pp.PROJECT_ID = p.ID
+        INNER JOIN project_staff staff ON pp.PROJECT_ID = staff.PROJECT_ID
         AND pp.DEPARTMENT_NAME = staff.DEPARTMENT_NAME
         AND staff.IS_HANDLE = 'handle'
         AND pp.STAFF_ID = staff.STAFF_ID
         AND staff.DEL_FLAG = '0'
         WHERE
         pp.DEL_FLAG = '0'
-        AND
+        AND p.CUSTOMER_ID = #{customerId}
-        p.CUSTOMER_ID = #{customerId}
+        AND pp.OPERATION !='response'
+        AND pp.OPERATION !='created'
         <if test="date != null and date.trim() != ''">
             AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m%d') = #{date}
         </if>
@@ -161,6 +163,8 @@
     </select>
     <select id="selectFinishOrg" resultType="com.epmet.dto.project.FinishOrgDTO">
         SELECT
+            a.GRID_ID,
+            a.DEPARTMENT_ID,
             a.PROJECT_ID,
             a.ORG_ID_PATH,
             b.ORG_ID_PATH AS pIdPath
@@ -168,7 +172,9 @@
             (
                 SELECT
                     ps.PROJECT_ID,
-                    ps.ORG_ID_PATH
+                    ps.ORG_ID_PATH,
+                    ps.GRID_ID,
+                    ps.DEPARTMENT_ID
                 FROM
                     project_process pp
                         INNER JOIN project_staff ps ON pp.STAFF_ID = ps.STAFF_ID