From 429c677f65770fd58958297032ef8ff0a37496c5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 18 May 2022 15:39:16 +0800
Subject: [PATCH] =?UTF-8?q?xiangmu=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ProjectManageListResultDTO.java      |  4 ++--
 .../com/epmet/service/impl/ProjectServiceImpl.java  | 13 ++++++-------
 .../src/main/resources/mapper/ProjectDao.xml        |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java
index c0bce880b1..4cb79ebdf7 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java
@@ -53,7 +53,7 @@ public class ProjectManageListResultDTO implements Serializable {
     /**
      * 滞留天数
      */
-    private Integer detentionDays;
+    private String detentionDays;
 
     /**
      * 状态
@@ -77,7 +77,7 @@ public class ProjectManageListResultDTO implements Serializable {
         this.shiftProjectTime = "";
         this.projectScheme = "";
         this.internalRemark = "";
-        this.detentionDays = NumConstant.ZERO;
+        this.detentionDays = NumConstant.ZERO_STR;
         this.status = "";
         this.departmentNameList = new ArrayList<>();
         this.projectId = "";
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 6214f00200..76a3149704 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -3191,9 +3191,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		formDTO.setAgencyId(staffInfo.getAgencyId());
 		PageData<ProjectManageListResultDTO> result = new PageData<>(new ArrayList<>(),NumConstant.ZERO);
-		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
-		formDTO.setPageNo(pageIndex);
-		List<ProjectManageListResultDTO> projectManageList = baseDao.getProjectManageList(formDTO);
+		PageInfo<ProjectManageListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getProjectManageList(formDTO));
+		List<ProjectManageListResultDTO> projectManageList = pageInfo.getList();
 		if (CollectionUtils.isNotEmpty(projectManageList)){
 			// 获取滞留天数
 			Integer days = getDays(ConvertUtils.sourceToTarget(formDTO, ProjectListFromDTO.class));
@@ -3210,23 +3209,23 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				List<String> departmentNameList = new ArrayList<>();
 				if (ProjectConstant.CLOSED.equals(p.getStatus())) {
 					p.setDepartmentNameList(departmentNameList);
-					p.setDetentionDays(NumConstant.ZERO);
+					p.setDetentionDays(NumConstant.ZERO_STR);
 				} else {
 					ProjectDTO projectDTO = ConvertUtils.sourceToTarget(p, ProjectDTO.class);
 					projectDTO.setId(p.getProjectId());
 					if (p.getIsHandle().equals("unhandled")){
 						String detentionDays = getDetentionDays(projectDTO);
 						if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > days) {
-							p.setDetentionDays(Integer.valueOf(detentionDays));
+							p.setDetentionDays(detentionDays);
 						} else {
-							p.setDetentionDays(Integer.valueOf(detentionDays));
+							p.setDetentionDays(detentionDays);
 						}
 					}
 					departmentNameList = baseDao.selectDepartmentNameList(projectDTO);
 					p.setDepartmentNameList(departmentNameList);
 				}
 			});
-			result.setTotal(projectManageList.size());
+			result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
 			result.setList(projectManageList);
 		}
 		return result;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index f453fa9fd9..e01a45275c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -603,6 +603,5 @@
             </if>
         GROUP BY t.PROJECT_ID
         ORDER BY p.CREATED_TIME DESC
-        LIMIT #{pageNo}, #{pageSize}
     </select>
 </mapper>
\ No newline at end of file