龙湾项目分布接口默认按照转项目时间降序返回前20

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectDistributionFormDTO.java

@@ -13,7 +13,20 @@ import java.io.Serializable;
  */
 @Data
 public class ProjectDistributionFormDTO implements Serializable {
+    /**
+     * 网格id不必填
+     */
     private String gridId;
     @NotBlank(message = "customerId不能为空")
     private String customerId;
+
+    /**
+     * 默认1
+     */
+    private Integer pageNo;
+
+    /**
+     * 默认20
+     */
+    private Integer pageSize;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java

@@ -44,5 +44,5 @@ public interface GovIssueService {
      **/
     List<ClosedIssueListResultDTO> closedIssueList(ClosedIssueListFormDTO fromDTO);
 
-    List<IssueInfoDTO> selectShiftProjectIssueList(String customerId,String gridId);
+    List<IssueInfoDTO> selectShiftProjectIssueList(String customerId,String gridId,Integer pageNo,Integer pageSize);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java

@@ -314,8 +314,13 @@ public class GovIssueServiceImpl implements GovIssueService {
     }
 
     @Override
-    public List<IssueInfoDTO> selectShiftProjectIssueList(String customerId,String gridId) {
+    public List<IssueInfoDTO> selectShiftProjectIssueList(String customerId, String gridId, Integer pageNo, Integer pageSize) {
-        return issueDao.selectShiftProjectIssueList(customerId,gridId);
+        if (pageNo != null && pageSize != null) {
+            PageHelper.startPage(pageNo, pageSize);
+        }else{
+            PageHelper.startPage(NumConstant.ONE, NumConstant.TWENTY);
+        }
+        return issueDao.selectShiftProjectIssueList(customerId, gridId);
     }
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -114,7 +114,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 	@Override
 	public List<ProjectDistributionResultDTO> queryProjectDistribution(ProjectDistributionFormDTO formDTO) {
 		List<ProjectDistributionResultDTO> resultDTOList = new ArrayList<>();
-		List<IssueInfoDTO> issueInfoDTOList = govIssueService.selectShiftProjectIssueList(formDTO.getCustomerId(), formDTO.getGridId());
+		List<IssueInfoDTO> issueInfoDTOList = govIssueService.selectShiftProjectIssueList(formDTO.getCustomerId(), formDTO.getGridId(),formDTO.getPageNo(),formDTO.getPageSize());
 		if (CollectionUtils.isNotEmpty(issueInfoDTOList)) {
 			List<String> topicIds = issueInfoDTOList.stream().map(data -> data.getTopicId()).collect(Collectors.toList());
 			// log.info("话题id集合:" + JSON.toJSONString(topicIds, true));

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml

@@ -122,6 +122,6 @@
             <if test="gridId != null and gridId.trim() != ''">
                 AND i.GRID_ID = #{gridId}
             </if>
-            order by i.SHIFTED_TIME desc limit 100
+            order by i.SHIFTED_TIME desc
     </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -140,6 +140,5 @@
             <foreach item="issueId" collection="list" separator="," open="(" close=")" index="">
                 #{issueId}
             </foreach>
-            order by CREATED_TIME desc limit 100
     </select>
 </mapper>