Merge branch 'develop' into release_temp

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/LatestListFormDTO.java

@@ -37,5 +37,7 @@ public class LatestListFormDTO implements Serializable {
      */
     private Integer pageSize = 3;
 
+    private Integer num = 0;
+
 }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -1014,7 +1014,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 **/
 	@Override
 	public List<LatestListResultDTO> getClosedProjectList(LatestListFormDTO formDTO) {
-
+		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+		formDTO.setNum(pageIndex);
 		return baseDao.selectClosedProjectList(formDTO);
 	}
 

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

@@ -167,7 +167,8 @@
         AND p.customer_id = #{customerId}
         AND p.`status` = 'closed'
         AND pro.operation = 'close'
-        ORDER BY p.created_time DESC
+        ORDER BY pro.created_time DESC
+        LIMIT #{num}, #{pageSize}
     </select>
 
     <select id="selectProjectList" resultType="com.epmet.dto.ProjectDTO">