From 9bcde7cfcdc8e1f422be3a48bb1bf08107b0764b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 14:33:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E8=AE=B0=E5=BD=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/PartyActSignFormDTO.java | 23 +++++++++++++++++++ .../IcPartyActSignInRecordController.java | 13 +++++++---- .../dao/IcPartyActSignInRecordDao.java | 8 ++++++- .../IcPartyActSignInRecordService.java | 18 +++------------ .../IcPartyActSignInRecordServiceImpl.java | 22 ++++++++---------- .../partyOrg/IcPartyActSignInRecordDao.xml | 18 +++++++++++++++ 6 files changed, 70 insertions(+), 32 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java new file mode 100644 index 0000000000..4677442fef --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class PartyActSignFormDTO implements Serializable { + /** + * 活动Id + */ + @NotBlank(message = "活动Id不能为空",groups = {AddGroup.class}) + private String icPartyActId; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java index bb4ad0acf5..de93f1d2c3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java @@ -1,15 +1,20 @@ package com.epmet.modules.partyOrg.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,10 +34,10 @@ public class IcPartyActSignInRecordController { @Autowired private IcPartyActSignInRecordService icPartyActSignInRecordService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPartyActSignInRecordService.page(params); - return new Result>().ok(page); + @RequestMapping("list") + public Result> list(@RequestBody PartyActSignFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + return new Result>().ok(icPartyActSignInRecordService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java index fe8308ca62..72e00ccdc1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java @@ -2,7 +2,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 党组织活动签到记录表 @@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyActSignInRecordDao extends BaseDao { - + + List selectSignList(@Param("icPartyActId") String icPartyActId); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java index 6cb940b2cc..413be5fd54 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -4,9 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; - -import java.util.List; -import java.util.Map; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; /** * 党组织活动签到记录表 @@ -16,25 +14,15 @@ import java.util.Map; */ public interface IcPartyActSignInRecordService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 - */ - PageData page(Map params); - /** * 默认查询 * - * @param params + * @param formDTO * @return java.util.List * @author generator * @date 2022-08-18 */ - List list(Map params); + PageData list(PartyActSignFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 841550fb35..12adb63035 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -7,10 +7,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.modules.partyOrg.dao.IcPartyActSignInRecordDao; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,20 +33,13 @@ import java.util.Map; @Service public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl implements IcPartyActSignInRecordService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcPartyActSignInRecordDTO.class); - } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcPartyActSignInRecordDTO.class); + public PageData list(PartyActSignFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectSignList(formDTO.getIcPartyActId()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } private QueryWrapper getWrapper(Map params){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml index 559157a57e..b5fc4d414b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml @@ -3,4 +3,22 @@ + + \ No newline at end of file