xiangmu列表

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 = "";

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;

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>