Merge branch 'dev'

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AblityListFormDTO.java

@@ -21,12 +21,12 @@ public class AblityListFormDTO implements Serializable {
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityListFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityListFormDTO.AddUserInternalGroup.class})
     private String orgType;
     public interface AddUserInternalGroup {}
     /**

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthAblityListFormDTO.java

@@ -21,12 +21,12 @@ public class MonthAblityListFormDTO implements Serializable {
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {MonthAblityListFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {MonthAblityListFormDTO.AddUserInternalGroup.class})
     private String orgType;
     public interface AddUserInternalGroup {}
     /**

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthScoreListFormDTO.java

@@ -17,7 +17,7 @@ public class MonthScoreListFormDTO implements Serializable {
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {MonthScoreListFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织Id
@@ -27,7 +27,7 @@ public class MonthScoreListFormDTO implements Serializable {
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {MonthScoreListFormDTO.AddUserInternalGroup.class})
     private String orgType;
     /**
      * 月份Id（格式：202009）

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java

@@ -19,15 +19,20 @@ public class PeerComparisonFormDTO implements Serializable {
      */
     @NotBlank(message = "客户ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String customerId;
+    /**
+     * 月份Id（格式：202009）
+     */
+    //@NotBlank(message = "月份ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
+    private String monthId;
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String orgType;
     public interface AddUserInternalGroup {}
     /**

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScoreListFormDTO.java

@@ -17,7 +17,7 @@ public class ScoreListFormDTO implements Serializable {
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {ScoreListFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织Id
@@ -27,7 +27,7 @@ public class ScoreListFormDTO implements Serializable {
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {ScoreListFormDTO.AddUserInternalGroup.class})
     private String orgType;
     /**
      * 月份Id（格式：202009）

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java

@@ -25,7 +25,7 @@ public class PublicPartiProfileResultDTO implements Serializable {
      * */
     private String monthTrend = "";
 
-    private Integer averageIssue = NumConstant.ZERO;
+    private BigDecimal averageIssue = new BigDecimal(NumConstant.ZERO);
 
     /**
      * 较上月百分比

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java

@@ -24,7 +24,7 @@ public class UserJoinIndicatorGrowthRateResultDTO implements Serializable {
      * */
     private String monthTrend;
 
-    private Integer averageIssue;
+    private BigDecimal averageIssue;
 
     /**
      * 较上月百分比

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -218,8 +218,7 @@ public class IndexServiceImpl implements IndexService {
         } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())) {
             // 月(上一个月) 指数排行
             if (StringUtils.isBlank(formDTO.getMonthId())) {
-                String monthId = com.epmet.commons.tools.utils.DateUtils.format(com.epmet.commons.tools.utils.DateUtils.addDateMonths(new Date(), -1), "yyyyMMdd");
+                formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
-                formDTO.setMonthId(monthId);
             }
             subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO);
             subAgencyIndexRankResultDTOS.forEach(rank -> {

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.datareport.service.fact.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.FactConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
@@ -456,7 +457,10 @@ public class FactIndexServiceImpl implements FactIndexService {
     @Override
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     public List<PeerComparisonResultDTO> peerComparison(PeerComparisonFormDTO formDTO) {
-        //1.根据组织或网格Id的上级组织Id查询同级组织或网格对应类型的得分排名（查询最近一个月数据）
+        //1.根据组织或网格Id的上级组织Id查询同级组织或网格对应类型的得分排名（按月查询）
+        if (null == formDTO.getMonthId() || "".equals(formDTO.getMonthId())) {
+            formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
+        }
         List<PeerComparisonResultDTO> resultList = screenIndexDataMonthlyDao.selectScoreList(formDTO);
         return resultList;
     }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -148,18 +148,7 @@
                 created_time desc
             limit 1
         )
-        AND MONTH_ID = (
+        AND month_id = #{monthId}
-            select
-                month_id
-            from
-                screen_index_data_monthly
-            where
-                del_flag = '0'
-            and customer_id = #{customerId}
-            order by
-                month_id desc
-            limit 1
-        )
         ORDER BY
         <if test="indexCode != null and indexCode != '' and indexCode == 'dangjiannengli'">
             (party_dev_ablity * party_dev_weight) DESC

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml

@@ -10,7 +10,7 @@
             ROUND( AVG_JOIN, 1 ) AS averageJoin,
             JOIN_TOTAL_UP_RATE AS monthIncr,
             JOIN_TOTAL_UP_FLAG AS monthTrend,
-            AVG_ISSUE AS averageIssue,
+            ROUND(AVG_ISSUE, 1) AS averageIssue,
             AVG_ISSUE_UP_RATE AS issueCompareLatestMonth,
             AVG_ISSUE_UP_FLAG AS issueCompareLatestTrend,
             AGVG_JOIN_UP_RATE AS joinCompareLatestMonth,

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

@@ -114,6 +114,18 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 * @date 2020.09.20 23:46
 	**/
 	List<ProjectParticipatedAgencyResultDTO> selectProjectParticipatedAgency(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
+
+	/***
+	 * @Description 评价周期内被吹哨次数
+	 * @param agencies
+	 * @param customerId
+	 * @param dimId
+	 * @return java.util.List<com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO>
+	 * @author wangc
+	 * @date 2020.10.15 11:20
+	*/
+	List<ProjectParticipatedAgencyResultDTO> selectAgencyWhistledCount(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
+
 	/***
 	 * @Description 查询机关办结次数
 	 * @param agencies

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

@@ -137,13 +137,13 @@ public class IndexCollCommunityServiceImpl implements IndexCollCommunityService
 		//办结数
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		Map<String,Integer> agencyParticipatedCount = factOriginProjectLogDailyService.getCountOfDealingAgency(agencies,customerId,dimId.getMonthId(),"month");
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(agencies,customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
 			BigDecimal element = new BigDecimal(entity.getClosedProjectCount());
 			//分母，即机关参与过的项目数（去重）
-			Integer denominator = agencyParticipatedCount.get(entity.getAgencyId());
+			//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
+			Integer denominator = entity.getTransferedCount();
 			if (null != denominator && denominator != NumConstant.ZERO) {
 				//办结率
 				entity.setClosedProjectRatio(

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

@@ -130,13 +130,14 @@ public class IndexCollDistrictServiceImpl implements IndexCollDistrictService {
 		//办结数
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		Map<String,Integer> agencyParticipatedCount = factOriginProjectLogDailyService.getCountOfDealingAgency(agencies,customerId,dimId.getMonthId(),"month");
+
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(agencies,customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
 			BigDecimal element = new BigDecimal(entity.getClosedProjectCount());
 			//分母，即机关参与过的项目数（去重）
-			Integer denominator = agencyParticipatedCount.get(entity.getAgencyId());
+			//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
+			Integer denominator = entity.getTransferedCount();
 			if (null != denominator && denominator != NumConstant.ZERO) {
 				//办结率
 				entity.setClosedProjectRatio(

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

@@ -128,15 +128,16 @@ public class IndexCollStreetServiceImpl implements IndexCollStreetService {
 		//办结数
 		List<String> agencies = agencyList.stream().map(DimAgencyDTO :: getId).distinct().collect(Collectors.toList());
 		Map<String, Integer> agencyHandleCount = factOriginProjectLogDailyService.getProjectHandledAgency(agencies,customerId,dimId.getMonthId(),"month");
-		Map<String,Integer> agencyParticipatedCount = factOriginProjectLogDailyService.getCountOfDealingAgency(agencies,customerId,dimId.getMonthId(),"month");
+
 		Map<String,BigDecimal> efficiencyMap = factOriginProjectLogDailyService.getAgencyWorkPieceRatio(agencies,customerId,dimId.getMonthId(),"month");
 		list.forEach(entity ->{
 			entity.setClosedProjectCount(agencyHandleCount.get(entity.getAgencyId()) == null? NumConstant.ZERO : agencyHandleCount.get(entity.getAgencyId()));
 			BigDecimal element = new BigDecimal(entity.getClosedProjectCount());
-			//分母，即机关参与过的项目数（去重）
+			//分母，吹哨次数
-			Integer denominator = agencyParticipatedCount.get(entity.getAgencyId());
+			Integer denominator = entity.getTransferedCount();
 			if (null != denominator && denominator != NumConstant.ZERO) {
 				//办结率
+				//“评价周期内被吹哨且办结的项目数”/“评价周期内被吹哨的所有项目数”
 				entity.setClosedProjectRatio(
 						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
 				);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@@ -500,7 +500,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         log.info("计算的结果(List)"+JSON.toJSONString(listTemp));*/
 
         HashMap<String, CalculateResult> resultMap = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
-        log.info("计算的结果{}", resultMap);
+        log.info("计算的结果{}", JSON.toJSONString(resultMap));
         return resultMap;
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreConstants.java

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
  */
 public class ScoreConstants {
 
-    public static final BigDecimal MIN_SCORE = new BigDecimal(0);
+    public static final BigDecimal MIN_SCORE = new BigDecimal(60);
     public static final BigDecimal MAX_SCORE = new BigDecimal(100);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java

@@ -1,5 +1,6 @@
 package com.epmet.support.normalizing.batch;
 
+import com.epmet.support.normalizing.Correlation;
 import com.epmet.support.normalizing.ScoreCalculator;
 
 import java.math.BigDecimal;
@@ -65,9 +66,21 @@ public class BatchScoreCalculator {
                     normalizeValue = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold));
                 }
                 //反正切函数 [-pi/2,pi/2]
-                if (idx.getScoreCalculator().getMaxValue().compareTo(idx.getScoreCalculator().getMinValue()) == 0) {
+                BigDecimal maxValue = idx.getScoreCalculator().getMaxValue();
-                    normalizeValue = new BigDecimal(Math.atan(new Double(vo.getSampleValue().toString())) / Math.PI * 100).setScale(6, RoundingMode.HALF_UP);
+                BigDecimal minValue = idx.getScoreCalculator().getMinValue();
+                if (maxValue.compareTo(minValue) == 0) {
+                    //*((max-min)/ (Math.PI/2))+min
+                    //Math.atan(new Double(vo.getSampleValue().toString()))*
+                    normalizeValue = new BigDecimal(Math.atan(new Double(getFinalSampleValue(vo.getSampleValue(), threshold).toString())))
+                            .multiply(
+                                    (maxValue.subtract(minValue).divide(new BigDecimal(Math.PI / 2), 10, RoundingMode.UNNECESSARY))).add(minValue).setScale(6, RoundingMode.HALF_UP);
+                    //
+                    if (scoreCalculator.getCorrelation().getCode().equals(Correlation.NEGATIVE)) {
+                        normalizeValue = maxValue.subtract(normalizeValue);
                     }
+
+                }
+
                 BigDecimal score = normalizeValue.multiply(weight).setScale(6, RoundingMode.HALF_UP);
                 CalculateResult result = scoreCountOfSamples.get(sampleId);
 
@@ -81,7 +94,7 @@ public class BatchScoreCalculator {
                 }
                 IndexScoreVo sampleScore = new IndexScoreVo(idx.getIndexId(), idx.getAllParentIndexCode(), String.valueOf(vo.getSampleValue()), normalizeValue, idx.getWeight());
                 result.getDetails().add(sampleScore);
-                result.setTotalScore(result.getTotalScore().add(score).setScale(6, RoundingMode.HALF_UP));
+                result.setTotalScore(result.getTotalScore().add(score));
             }
         }
 

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

@@ -160,6 +160,26 @@
         GROUP BY AGENCY_ID
     </select>
 
+    <!-- 评价周期内被吹哨次数 -->
+    <select id="selectAgencyWhistledCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) AS count
+        FROM
+        fact_origin_project_log_daily
+        WHERE DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+        AND IS_ACTIVE = '0'
+        <if test='null != dimId and "" != dimId.trim()'>
+           AND MONTH_ID = #{dimId}
+        </if>
+        <if test="agencies != null and agencies.size() > 0">
+            <foreach collection="agencies" item="agencyId" open="AND (" close=" )" separator=" OR ">
+                AGENCY_ID = #{agencyId}
+            </foreach>
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
     <!-- 查询机关办结次数 -->
     <select id="selectAgencyHandledProjectCount" resultType="com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO">
         	SELECT
@@ -177,7 +197,7 @@
                 </if>
 
                 <if test='null != dimId and "" != dimId.trim()'>
-                    AND ((log.ID IS NOT NULL AND log.MONTH_ID  <![CDATA[>=]]>  #{dimId}) OR log.ID IS NULL )
+                    AND log.ID IS NOT NULL AND log.MONTH_ID  =  #{dimId}
                 </if>
                 GROUP BY SUBSTRING_INDEX(main.FINISH_ORG_IDS,':',1)
     </select>

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/MathUtilTest.java

@@ -1,17 +1,30 @@
 package com.epmet.stats.test.normalizing;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
 public class MathUtilTest {
     public static void main(String[] args) {
+        //值 域：(-π/2,π/2)  ->(60,100)
         double tan = Math.atan(4);
         double tan2 = Math.atan(1);
         double tan3 = Math.atan(8);
-        double tan4 = Math.atan(3);
+        double tan4 = Math.atan(1000);
+        double min = 60;
+        double max = 100;
 
+        System.out.println(tan * ((max - min) / (Math.PI / 2)) + min);
+        System.out.println(tan2 * ((max - min) / (Math.PI / 2)) + min);
+        System.out.println(tan3 * ((max - min) / (Math.PI / 2)) + min);
+        System.out.println(tan4 * ((max - min) / (Math.PI / 2)) + min);
 
-        System.out.println((tan / Math.PI));
+        BigDecimal maxValue = new BigDecimal(100);
-        System.out.println((tan2 / Math.PI));
+        BigDecimal minValue = new BigDecimal(60);
-        System.out.println((tan3 / Math.PI));
+        BigDecimal normalizeValue = new BigDecimal(Math.atan(new Double("0")))
-        System.out.println((tan4 / Math.PI * 200));
+                .multiply(
+                        (maxValue.subtract(minValue).divide(new BigDecimal(Math.PI / 2), 10, RoundingMode.HALF_UP))).add(minValue).setScale(6, RoundingMode.HALF_UP);
+        System.out.println(normalizeValue);
+        //new BigDecimal(Math.atan(new Double(vo.getSampleValue().toString())) / Math.PI * 100).setScale(6, RoundingMode.HALF_UP);
     }
 
 }