From c311d07e817545a3b4029dea205fa0eef331e683 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 28 Oct 2020 15:11:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/OrgResponseTimeResultDTO.java      | 25 --------
 .../FactOriginProjectOrgPeriodDailyDao.java   | 29 ---------
 .../FactOriginProjectOrgPeriodDailyDao.xml    | 62 -------------------
 3 files changed, 116 deletions(-)
 delete mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgResponseTimeResultDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgResponseTimeResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgResponseTimeResultDTO.java
deleted file mode 100644
index 88735859d3..0000000000
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgResponseTimeResultDTO.java
+++ /dev/null
@@ -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;
-}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java
index 8f29bf5ec9..d107e0e2fe 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java
+++ b/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
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml
index d0b868f62f..a01747d444 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml
@@ -119,69 +119,7 @@
         </foreach>
     </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,

From 331f921b00b21dcfde4cd6cb8f58c99d211b13e9 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 29 Oct 2020 13:38:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E9=9A=BE=E7=82=B9=E8=B5=8C=E7=82=B9=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=20=E4=BD=BF=E7=94=A8=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/project/dto/form/DifficultyRankFormDTO.java     | 4 ++++
 .../datareport/service/project/impl/ProjectServiceImpl.java   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java
index b59289fdf3..d043180705 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java
+++ b/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;
 }
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
index 71b36fac4f..9c2336d992 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
+++ b/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  ;

From a0a5607b5eb66c0a5516410dd35a92b95a5c86af Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 29 Oct 2020 14:08:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E8=B5=8C=E7=82=B9sql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/project/ProjectDao.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index 663c893a98..8e5bace8d8 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/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>
 
     <!-- 查询难点赌点-耗时最长|涉及部门最多|处理次数 -->