参与活动记录

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ParticipatedActRecordFormDTO.java

@@ -1,36 +0,0 @@
-package com.elink.esua.epdc.activity.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 参与的活动记录 入参
- * @author zy
- */
-@Data
-public class ParticipatedActRecordFormDTO implements Serializable {
-    private static final long serialVersionUID = 5597918895256848428L;
-
-    /**
-     * 用户ID
-     */
-    @NotBlank(message = "用户ID不能为空")
-    private String userId;
-
-    /**
-     * 页码
-     */
-    @Min(value = 1, message = "页码必须大于0")
-    private Integer pageIndex;
-
-    /**
-     * 页容量
-     */
-    @Min(value = 1, message = "页容量必须大于0")
-    private Integer pageSize;
-}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActPeriodUserController.java

@@ -18,22 +18,18 @@
 package com.elink.esua.epdc.modules.activity.controller;
 
 import com.elink.esua.epdc.activity.ActPeriodUserDTO;
-import com.elink.esua.epdc.activity.form.ParticipatedActRecordFormDTO;
 import com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.modules.activity.service.ActPeriodUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 
@@ -89,13 +85,14 @@ public class ActPeriodUserController {
     /**
      * 查询用户参与的活动记录（不包含：已取消、未通过的活动）
      *
-     * @param formDTO
+     * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO>>
      * @Author zhangyong
-     * @Date 15:57 2021-09-24
+     * @Date 09:25 2021-09-26
      **/
     @GetMapping("getParticipatedActRecordByUserId")
-    public Result<List<ParticipatedActRecordResultDTO>> getParticipatedActRecordByUserId(@RequestParam ParticipatedActRecordFormDTO formDTO) {
+    public Result<PageData<ParticipatedActRecordResultDTO>> getParticipatedActRecordByUserId(@RequestParam Map<String, Object> params) {
-        return actPeriodUserService.getParticipatedActRecordByUserId(formDTO);
+        PageData<ParticipatedActRecordResultDTO> page = actPeriodUserService.getParticipatedActRecordByUserId(params);
+        return new Result<PageData<ParticipatedActRecordResultDTO>>().ok(page);
     }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodUserDao.java

@@ -19,7 +19,6 @@ package com.elink.esua.epdc.modules.activity.dao;
 
 import com.elink.esua.epdc.activity.ActPeriodDTO;
 import com.elink.esua.epdc.activity.ActPeriodUserDTO;
-import com.elink.esua.epdc.activity.form.ParticipatedActRecordFormDTO;
 import com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.activity.entity.ActPeriodUserEntity;
@@ -27,6 +26,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 活动详细时间段用户关系表
@@ -89,10 +89,10 @@ public interface ActPeriodUserDao extends BaseDao<ActPeriodUserEntity> {
     /**
      * 查询用户参与的活动记录（不包含：已取消、未通过的活动）
      *
-     * @param formDTO
+     * @param params
      * @return java.util.List<com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO>
      * @Author zhangyong
      * @Date 16:03 2021-09-24
      **/
-    List<ParticipatedActRecordResultDTO> selectListParticipatedActRecordByUserId(ParticipatedActRecordFormDTO formDTO);
+    List<ParticipatedActRecordResultDTO> selectListParticipatedActRecordByUserId(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodUserService.java

@@ -19,11 +19,9 @@ package com.elink.esua.epdc.modules.activity.service;
 
 import com.elink.esua.epdc.activity.ActPeriodDTO;
 import com.elink.esua.epdc.activity.ActPeriodUserDTO;
-import com.elink.esua.epdc.activity.form.ParticipatedActRecordFormDTO;
 import com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.activity.entity.ActPeriodUserEntity;
 
 import java.util.List;
@@ -149,10 +147,10 @@ public interface ActPeriodUserService extends BaseService<ActPeriodUserEntity> {
     /**
      * 查询用户参与的活动记录（不包含：已取消、未通过的活动）
      *
-     * @param formDTO
+     * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO>
      * @Author zhangyong
      * @Date 15:57 2021-09-24
      **/
-    Result<List<ParticipatedActRecordResultDTO>> getParticipatedActRecordByUserId(ParticipatedActRecordFormDTO formDTO);
+    PageData<ParticipatedActRecordResultDTO> getParticipatedActRecordByUserId(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodUserServiceImpl.java

@@ -21,20 +21,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.activity.ActPeriodDTO;
 import com.elink.esua.epdc.activity.ActPeriodUserDTO;
-import com.elink.esua.epdc.activity.form.ParticipatedActRecordFormDTO;
 import com.elink.esua.epdc.activity.result.ParticipatedActRecordResultDTO;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.activity.dao.ActPeriodUserDao;
 import com.elink.esua.epdc.modules.activity.entity.ActPeriodUserEntity;
 import com.elink.esua.epdc.modules.activity.service.ActPeriodUserService;
-import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -130,10 +125,9 @@ public class ActPeriodUserServiceImpl extends BaseServiceImpl<ActPeriodUserDao,
     }
 
     @Override
-    public Result<List<ParticipatedActRecordResultDTO>> getParticipatedActRecordByUserId(ParticipatedActRecordFormDTO formDTO) {
+    public PageData<ParticipatedActRecordResultDTO> getParticipatedActRecordByUserId(Map<String, Object> params) {
-        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        IPage<ParticipatedActRecordResultDTO> page = getPage(params);
-        formDTO.setPageIndex(pageIndex);
+        List<ParticipatedActRecordResultDTO> list = baseDao.selectListParticipatedActRecordByUserId(params);
-        List<ParticipatedActRecordResultDTO> result = baseDao.selectListParticipatedActRecordByUserId(formDTO);
+        return new PageData<>(list, page.getTotal());
-        return new Result<List<ParticipatedActRecordResultDTO>>().ok(result);
     }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodUserDao.xml

@@ -119,11 +119,13 @@
             WHERE ai.DEL_FLAG = '0'
             AND ur.`STATUS` NOT IN ('3', '4')
             AND USER_ID = #{userId}
+            <if test="title != null and title.trim() != ''">
+                AND ai.TITLE like concat('%', #{title}, '%')
+            </if>
         ) t
         LEFT JOIN epdc_act_period_user pu ON pu.ACT_USER_RELATION_ID = t.actUserRelationId AND pu.DEL_FLAG = '0'
         LEFT JOIN epdc_act_period p ON p.ID = pu.ACT_PERIOD_ID AND p.DEL_FLAG = '0'
         WHERE IFNULL(pu.PERIOD_STATUS , '0') NOT IN ('3','4')
         ORDER BY actPeriodStartTime DESC
-        LIMIT #{pageIndex},#{pageSize}
     </select>
 </mapper>