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

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

@@ -26,15 +26,15 @@ public class GrassRootsGovernRankResultDTO implements Serializable {
 	/**
 	 * 响应度
 	 */
-	private Integer projectResponseRatio;
+	private String projectResponseRatio;
 	/**
 	 * 满意度
 	 */
-	private Integer projectSatisRatio;
+	private String projectSatisRatio;
 	/**
 	 * 办结率 当前界面在社区时才显示
 	 */
-	private Integer closedProjectRatio;
+	private String closedProjectRatio;
 	/**
 	 * 组织名称
 	 */

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

@@ -26,13 +26,13 @@ public class GrassRootsGovernResultDTO implements Serializable {
 	/**
 	 * 项目响应度
 	 */
-	private Integer projectResponseRatio;
+	private String projectResponseRatio;
 	/**
 	 * 项目满意率
 	 */
-	private Integer projectSatisRatio;
+	private String projectSatisRatio;
 	/**
 	 * 办结率（当前界面是社区时显示）
 	 */
-	private Integer closedProjectRatio;
+	private String closedProjectRatio;
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author zhaoqifeng
@@ -29,13 +30,13 @@ public class GrassRootsGovernTrendDTO implements Serializable {
 	/**
 	 * 项目响应度
 	 */
-	private Integer projectResponseRatio;
+	private BigDecimal projectResponseRatio;
 	/**
 	 * 项目满意率
 	 */
-	private Integer projectSatisRatio;
+	private BigDecimal projectSatisRatio;
 	/**
 	 * 办结率（当前界面是社区时显示）
 	 */
-	private Integer closedProjectRatio;
+	private BigDecimal closedProjectRatio;
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -31,13 +32,13 @@ public class GrassRootsGovernTrendResultDTO implements Serializable {
 	/**
 	 * 项目响应度
 	 */
-	private List<Integer> projectResponseRatioList;
+	private List<BigDecimal> projectResponseRatioList;
 	/**
 	 * 项目满意率
 	 */
-	private List<Integer> projectSatisRatioList;
+	private List<BigDecimal> projectSatisRatioList;
 	/**
 	 * 办结率（当前界面是社区时显示）
 	 */
-	private List<Integer> closedProjectRatioList;
+	private List<BigDecimal> closedProjectRatioList;
 }

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

@@ -13,6 +13,7 @@ import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -168,9 +169,9 @@ public class AnScreenServiceImpl implements AnScreenService {
 		List<String> xAxis = list.stream().map(item -> getMonth(item.getMonthId())).collect(Collectors.toList());
 		List<Integer> partiProjectTotalList = list.stream().map(GrassRootsGovernTrendDTO::getPartiProjectTotal).collect(Collectors.toList());
 		List<Integer> closedProjectTotalList = list.stream().map(GrassRootsGovernTrendDTO::getClosedProjectTotal).collect(Collectors.toList());
-		List<Integer> projectResponseRatioList = list.stream().map(GrassRootsGovernTrendDTO::getProjectResponseRatio).collect(Collectors.toList());
+		List<BigDecimal> projectResponseRatioList = list.stream().map(GrassRootsGovernTrendDTO::getProjectResponseRatio).collect(Collectors.toList());
-		List<Integer> projectSatisRatioList = list.stream().map(GrassRootsGovernTrendDTO::getProjectSatisRatio).collect(Collectors.toList());
+		List<BigDecimal> projectSatisRatioList = list.stream().map(GrassRootsGovernTrendDTO::getProjectSatisRatio).collect(Collectors.toList());
-		List<Integer> closedProjectRatioList = list.stream().map(GrassRootsGovernTrendDTO::getClosedProjectRatio).collect(Collectors.toList());
+		List<BigDecimal> closedProjectRatioList = list.stream().map(GrassRootsGovernTrendDTO::getClosedProjectRatio).collect(Collectors.toList());
 		resultDTO.setXAxis(xAxis);
 		resultDTO.setPartiProjectTotalList(partiProjectTotalList);
 		resultDTO.setClosedProjectTotalList(closedProjectTotalList);

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml

@@ -7,9 +7,9 @@
     <select id="selectGrassRootsGovern" resultType="com.epmet.evaluationindex.screen.dto.result.GrassRootsGovernResultDTO">
         SELECT PARTI_PROJECT_TOTAL,
                CLOSED_PROJECT_TOTAL,
-               CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "PROJECT_RESPONSE_RATIO",
+               CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "projectResponseRatio",
-               CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "PROJECT_SATIS_RATIO",
+               CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "CLOSED_PROJECT_RATIO"
+               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio"
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
         AND ORG_ID = #{agencyId}
@@ -19,21 +19,21 @@
         SELECT MONTH_ID,
                PARTI_PROJECT_TOTAL,
                CLOSED_PROJECT_TOTAL,
-               CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "PROJECT_RESPONSE_RATIO",
+               0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ) AS "projectResponseRatio",
-               CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "PROJECT_SATIS_RATIO",
+               0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "CLOSED_PROJECT_RATIO"
+               0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ) AS "closedProjectRatio"
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
           AND ORG_ID = #{agencyId}
-          AND MONTH_ID = #{yearId}
+          AND YEAR_ID = #{yearId}
     </select>
     <select id="selectGrassRootsGovernRank" resultType="com.epmet.evaluationindex.screen.dto.result.GrassRootsGovernRankResultDTO">
         SELECT ORG_NAME,
                PARTI_PROJECT_TOTAL,
                CLOSED_PROJECT_TOTAL,
-               CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "PROJECT_RESPONSE_RATIO",
+               CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "projectResponseRatio",
-               CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "PROJECT_SATIS_RATIO",
+               CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "CLOSED_PROJECT_RATIO"
+               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio"
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml

@@ -24,7 +24,7 @@
           AND YEAR_ID = #{yearId}
     </select>
     <select id="selectGrassRootsOrgRank" resultType="com.epmet.evaluationindex.screen.dto.result.GrassRootsOrgRankResultDTO">
-        SELECT ORG_NAME，
+        SELECT ORG_NAME,
                GROUP_TOTAL,
                ISSUE_TOTAL,
                PROJECT_TOTAL

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

@@ -65,7 +65,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
                 affectRows = communityProjectProfileDao.deleteBatch(customerId);
             }
         }
-        Lists.partition(formDTO.getDataList(),NumConstant.ONE_THOUSAND).forEach(list -> {
+        Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
             communityProjectProfileDao.insertBatch(list,customerId);
         });
 
@@ -90,7 +90,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
                 affectRows = pmRankDao.deleteBatch(customerId);
             }
         }
-        Lists.partition(formDTO.getDataList(),NumConstant.ONE_THOUSAND).forEach(list -> {
+        Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
             pmRankDao.insertBatch(list,customerId);
         });
     }
@@ -117,7 +117,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
         }
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
-        Lists.partition(formDTO.getDataList(),NumConstant.ONE_THOUSAND).forEach(list -> {
+        Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
             pmTotalMonthlyDao.insertBatch(list,
                     customerId,
                     formDTO.getMonthId(),
@@ -148,7 +148,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
         }
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
-        Lists.partition(formDTO.getDataList(),NumConstant.ONE_THOUSAND).forEach(list -> {
+        Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
             orgMonthlyDao.insertBatch(list,
                     customerId,
                     formDTO.getMonthId(),
@@ -179,7 +179,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
         }
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
-        Lists.partition(formDTO.getDataList(),NumConstant.ONE_THOUSAND).forEach(list -> {
+        Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {
             governMonthlyDao.insertBatch(list,
                     customerId,
                     formDTO.getMonthId(),