From 21b954ab752f81101fd5709b43d3fbb3c122db43 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 29 Jul 2020 17:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9B=9E=E9=A1=BE=E7=A8=BF?= =?UTF-8?q?=20-=20=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/resi/ResiActContentFormDTO.java | 12 ------------ .../epmet/service/impl/ActSummaryServiceImpl.java | 2 -- .../src/main/resources/mapper/ActSummaryDao.xml | 1 - 3 files changed, 15 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java index 29ccd9fd98..1297ccb96c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java @@ -31,16 +31,4 @@ public class ResiActContentFormDTO implements Serializable { */ @NotBlank(message = "活动Id不能为空", groups = { AddUserInternalGroup.class }) private String actId; - - /** - * 页码，从1开始 - */ - @Min(value = 1, message = "页码必须大于0", groups = { AddUserInternalGroup.class }) - private Integer pageNo; - - /** - * 页容量，默认20页 - */ - @Min(value = 1, message = "每页条数必须大于必须大于0", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class }) - private Integer pageSize; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java index d3f9087afc..e3331cf7a1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java @@ -107,8 +107,6 @@ public class ActSummaryServiceImpl extends BaseServiceImpl summaryList(ResiActContentFormDTO formDto) { - int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setPageNo(pageIndex); return new Result().ok(baseDao.selectListSummary(formDto)); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml index 6ff1b956d0..ff8b70f796 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml @@ -29,6 +29,5 @@ WHERE s.DEL_FLAG = '0' AND s.ACT_ID = #{actId} ORDER BY s.ORDER_NUM ASC - LIMIT #{pageNo}, #{pageSize}