Merge remote-tracking branch 'origin/dev_temp' into dev_temp

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.project.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
@@ -31,4 +32,7 @@ public class DifficultyRankFormDTO implements Serializable {
      * 获取数据个数 默认前10
      */
     private Integer topNum = 10;
+
+    @Min(value = 1, groups = {DifficultyRankInternalGroup.class})
+    private Integer pageNo;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -26,6 +26,7 @@ import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
 import com.epmet.project.dto.result.ProjectDetailResultDTO;
 import com.epmet.project.dto.result.*;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -311,6 +312,7 @@ public class ProjectServiceImpl implements ProjectService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     public List<ProjectDifficultRankResultDTO> getDifficultyRank(DifficultyRankFormDTO param) {
+        PageHelper.startPage(null == param.getPageNo() ? NumConstant.ONE:param.getPageNo(),param.getTopNum());
         List<ProjectDifficultRankResultDTO> result = projectDao.difficultyRank(param);
         for (int i = 0; i < result.size(); i++) {
             List<String> imgUrlList;

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -257,7 +257,7 @@
          CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME
                        WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT
                        ELSE diff.EVENT_RE_ORG  END
-         DESC LIMIT #{topNum}
+         DESC
     </select>
 
     <!-- 查询难点赌点-耗时最长|涉及部门最多|处理次数 -->

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

@@ -1,25 +0,0 @@
-package com.epmet.dto.extract.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Description 各机关响应时间
- * @ClassName OrgResponseTimeResultDTO
- * @Auth wangc
- * @Date 2020-09-21 02:03
- */
-@Data
-public class OrgResponseTimeResultDTO implements Serializable {
-    private static final long serialVersionUID = 6017440139236985959L;
-
-    private String agencyId;
-
-    private BigDecimal responseTime;
-
-    private BigDecimal projectTotal;
-
-    private BigDecimal distinctProjectTotal;
-}

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

@@ -18,12 +18,10 @@
 package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.extract.result.OrgResponseTimeResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
@@ -45,15 +43,6 @@ public interface FactOriginProjectOrgPeriodDailyDao extends BaseDao<FactOriginPr
     **/
     int selectIfExisted(@Param("customerId") String customerId);
 
-    /**
-     * @Description 在插入之前，先删除所有与这个项目相关的历时信息
-     * @param projectId
-     * @return
-     * @author wangc
-     * @date 2020.09.17 14:43
-    **/
-    void deleteByProjectId(@Param("projectId") String projectId);
-
     /**
      * 获取项目响应度
      * @author zhaoqifeng
@@ -85,24 +74,6 @@ public interface FactOriginProjectOrgPeriodDailyDao extends BaseDao<FactOriginPr
     **/
     void insertBatch(@Param("list") List<FactOriginProjectOrgPeriodDailyEntity> list);
 
-    /**
-     * @Description 查找网格、部门对项目的办结系数
-     * @param customerId
-     * @return
-     * @author wangc
-     * @date 2020.09.21 02:13
-    **/
-    List<OrgResponseTimeResultDTO> selectSubOrgResponseCoefficient(@Param("customerId") String customerId,@Param("dimId") String dimId, @Param("dateType") String dateType);
-
-    /**
-     * @Description 查找机关对项目的办结系数
-     * @param customerId
-     * @return
-     * @author wangc
-     * @date 2020.09.21 02:13
-     **/
-    List<OrgResponseTimeResultDTO> selectAgencyResponseCoefficient(@Param("customerId") String customerId,@Param("dimId") String dimId, @Param("dateType") String dateType);
-
     /**
      * 部门处理效率统计
      * @author zhaoqifeng

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

@@ -120,68 +120,6 @@
     </insert>
     
 
-    <!-- 查找网格、部门对项目的办结系数 -->
-    <select id="selectSubOrgResponseCoefficient" resultType="com.epmet.dto.extract.result.OrgResponseTimeResultDTO">
-	            SELECT
-				PID AS agencyId,
-				SUM(timestampdiff(MINUTE , INFORMED_DATE ,IFNULL(HANDLED_DATE,NOW()))) AS responseTime,
-				COUNT(ID) projectTotal,
-				COUNT(DISTINCT PROJECT_ID) distinctProjectTotal
-
-				FROM
-				fact_origin_project_org_period_daily
-				WHERE
-				DEL_FLAG = '0'
-				AND
-				CUSTOMER_ID = #{customerId}
-				AND
-				(ORG_TYPE = 'grid' OR ORG_TYPE = 'dept')
-				AND
-				IS_RESOLVED = 'resolved'
-                <if test='null != dimId and "" != dimId'>
-                    <choose>
-                        <when test='"month" == dateType'>
-                            AND  DATE_FORMAT(IFNULL(HANDLED_DATE,NOW()),'%Y%m') = #{dimId}
-                        </when>
-                        <otherwise>
-                            AND  DATE_FORMAT(IFNULL(HANDLED_DATE,NOW()),'%Y%m%d') = #{dimId}
-                        </otherwise>
-                    </choose>
-                </if>
-				GROUP BY PID
-    </select>
-
-    <!-- 查找机关对项目的办结系数 -->
-    <select id="selectAgencyResponseCoefficient" resultType="com.epmet.dto.extract.result.OrgResponseTimeResultDTO">
-        		SELECT
-				ORG_ID AS agencyId,
-				SUM(timestampdiff(MINUTE , INFORMED_DATE ,IFNULL(HANDLED_DATE,NOW()))) AS responseTime,
-				COUNT(ID) projectTotal,
-				COUNT(PROJECT_ID) distinctProjectTotal
-
-				FROM
-				fact_origin_project_org_period_daily
-				WHERE
-				DEL_FLAG = '0'
-				AND
-				CUSTOMER_ID = #{customerId}
-				AND
-				ORG_TYPE = 'agency'
-				AND
-				IS_RESOLVED = 'resolved'
-				<if test='null != dimId and "" != dimId'>
-                    <choose>
-                        <when test='"month" == dateType'>
-                          AND  DATE_FORMAT(IFNULL(HANDLED_DATE,NOW()),'%Y%m') = #{dimId}
-                        </when>
-                        <otherwise>
-                          AND  DATE_FORMAT(IFNULL(HANDLED_DATE,NOW()),'%Y%m%d') = #{dimId}
-                        </otherwise>
-                    </choose>
-                </if>
-				GROUP BY ORG_ID
-
-    </select>
     <select id="selectDeptHandle" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
             fp.ORG_ID,