共建联盟活动接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java

@@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppVolunteerRankDTO;
 import com.elink.esua.epdc.service.AppVolunteerRankService;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -92,6 +93,32 @@ public class ApiVolunteerRankController {
         return appVolunteerRankService.getVolunteerUnionDetail(dto);
     }
 
+    /**
+     * 小程序-共建联盟下属活动-列表
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:57 2021-12-01
+     **/
+    @GetMapping("getVolunteerUnionActList")
+    public Result getVolunteerUnionActList(EpdcUnionActFormDTO dto){
+        return appVolunteerRankService.getVolunteerUnionActList(dto);
+    }
+
+    /**
+     * 小程序-共建联盟活动-详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:57 2021-12-01
+     **/
+    @GetMapping("getVolunteerUnionActDetail/{id}")
+    public Result getVolunteerUnionActDetail(@PathVariable("id") String id){
+        return appVolunteerRankService.getVolunteerUnionActDetail(id);
+    }
+
     /**
      * @describe: 小程序-查询所有志愿团队类别
      * @author wangtong

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java

@@ -9,6 +9,7 @@ import com.elink.esua.epdc.config.FeignRequestInterceptor;
 import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.dto.VolunteerUnionFormDTO;
 import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,7 +61,7 @@ public interface ActInfoFeignClient {
     Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
 
     @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);
+    Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable("id") String id);
 
     @GetMapping(value = "heart/epdc-app/actbanner/list", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto);
@@ -162,6 +163,28 @@ public interface ActInfoFeignClient {
     @GetMapping(value ="heart/volunteerunion/getVolunteerUnionDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result getVolunteerUnionDetail(VolunteerUnionFormDTO formDto);
 
+    /**
+     * 小程序-共建联盟下属活动-列表
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:57 2021-12-01
+     **/
+    @GetMapping(value ="heart/volunteerunionact/getVolunteerUnionActList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getVolunteerUnionActList(EpdcUnionActFormDTO dto);
+
+    /**
+     * 小程序-共建联盟活动-详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:57 2021-12-01
+     **/
+    @GetMapping(value ="heart/volunteerunionact/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getVolunteerUnionActDetail(@PathVariable("id") String id);
+
     /**
      * @describe: 查询所有志愿团队类别
      * @author wangtong

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -167,7 +167,7 @@ public interface AdminFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      **/
     @PostMapping(value = "sys/user/getScripBySysUserId/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<String> getScripBySysUserId(@PathVariable Long id);
+    Result<String> getScripBySysUserId(@PathVariable("id") Long id);
 
 
     /**
@@ -190,7 +190,7 @@ public interface AdminFeignClient {
      * @since 2021/1/20 9:58
      */
     @GetMapping("sys/dept/getdeptinfo/{typeKey}")
-    Result<List<SysDeptDTO>> getDeptInfoByTypeKey(@PathVariable String typeKey);
+    Result<List<SysDeptDTO>> getDeptInfoByTypeKey(@PathVariable("typeKey") String typeKey);
 
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java

@@ -60,5 +60,5 @@ public interface AppVolunteerRankFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.activity.result.ActApplyDetailResultDTO>
      **/
     @GetMapping("heart/actapplyinfo/applyActDetail/{id}")
-    Result<ActApplyDetailResultDTO> applyActDetail(@PathVariable String id);
+    Result<ActApplyDetailResultDTO> applyActDetail(@PathVariable("id") String id);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@@ -105,7 +105,7 @@ public interface CustomFeignClient {
      * @Param [suId]
      **/
     @PostMapping(value = "custom/epdcScreenSpecialUser/selectSpecialUserDetail/{suId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<SpecialUserResultDTO> selectSpecialUserDetail(@PathVariable String suId);
+    Result<SpecialUserResultDTO> selectSpecialUserDetail(@PathVariable("suId") String suId);
 
     /**
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SpecialUserDisabilityTypeResultDTO>
@@ -217,7 +217,7 @@ public interface CustomFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     @GetMapping(value = "custom/epdc-app/groupBuy/delete/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result deleteGroupBuy(@PathVariable String id);
+    Result deleteGroupBuy(@PathVariable("id") String id);
     /**
      * @Description  打电话计算次数
      * @Author songyunpeng
@@ -226,7 +226,7 @@ public interface CustomFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     @GetMapping(value = "custom/epdc-app/groupBuy/callMobile/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result callGroupBuyMobile(@PathVariable String id);
+    Result callGroupBuyMobile(@PathVariable("id") String id);
     /**
      * @Description  报名/取消报名
      * @Author songyunpeng
@@ -303,7 +303,7 @@ public interface CustomFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectSdsDetailResultDTO>
      **/
     @GetMapping(value = "custom/epdc-app/sds/getSdsDetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EpdcSelectSdsInfoDetailResultDTO> getSdsDetail(@PathVariable String id);
+    Result<EpdcSelectSdsInfoDetailResultDTO> getSdsDetail(@PathVariable("id") String id);
 
     /**
      * @Description  发布或更新
@@ -323,7 +323,7 @@ public interface CustomFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     @GetMapping(value = "custom/epdc-app/sds/delete/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result deleteSds(@PathVariable String id);
+    Result deleteSds(@PathVariable("id") String id);
     /**
      * @Description  打电话计算次数
      * @Author songyunpeng
@@ -332,7 +332,7 @@ public interface CustomFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     @GetMapping(value = "custom/epdc-app/sds/callMobile/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result callSdsMobile(@PathVariable String id);
+    Result callSdsMobile(@PathVariable("id") String id);
 
 
     /**
@@ -387,7 +387,7 @@ public interface CustomFeignClient {
      **/
     @GetMapping(value = "custom/enterprisereport/getEnterpriseReportDetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
 
-    Result<EnterpriseReportDTO> getEnterpriseReportList(@PathVariable String id);
+    Result<EnterpriseReportDTO> getEnterpriseReportList(@PathVariable("id") String id);
     /**
      * @Description  新增企业上报
      * @Author songyunpeng
@@ -440,6 +440,6 @@ public interface CustomFeignClient {
      * @since 2021/11/5 14:15
      */
     @GetMapping(value = "custom/epdc-app/voter/registration/detail/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<VoterRegistrationDetailResultDTO> registrationDetail(@PathVariable String userId);
+    Result<VoterRegistrationDetailResultDTO> registrationDetail(@PathVariable("userId") String userId);
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java

@@ -81,7 +81,7 @@ public interface IssueFeignClient {
      * @Date: 2019/9/9 13:31
      */
     @GetMapping(value = "events/epdc-app/issue/progress/{issueId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<IssueHandleProgressResultDTO>> issueHandleProgress(@PathVariable String issueId);
+    Result<List<IssueHandleProgressResultDTO>> issueHandleProgress(@PathVariable("issueId") String issueId);
 
     /**
      * 我的议题和事件列表
@@ -101,7 +101,7 @@ public interface IssueFeignClient {
      * @Date: 2019/9/17 17:38
      */
     @GetMapping(value = "events/epdc-app/issue/eventDetail/{eventId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EventAppDetailResultDTO> eventDetail(@PathVariable String eventId);
+    Result<EventAppDetailResultDTO> eventDetail(@PathVariable("eventId") String eventId);
 
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java

@@ -66,7 +66,7 @@ public interface ItemFeignClient {
      * @Date: 2019/9/17 11:11
      */
     @GetMapping(value = "events/epdc-app/item/progress/{itemId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ItemHandleProgressResultDTO>> itemHandleProgress(@PathVariable String itemId);
+    Result<List<ItemHandleProgressResultDTO>> itemHandleProgress(@PathVariable("itemId") String itemId);
 
     /**
      * 我的项目列表
@@ -88,7 +88,7 @@ public interface ItemFeignClient {
      * @since 2019/12/24 9:19
      */
     @GetMapping(value = "events/epdc-app/item/v2/progress/{itemId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ItemHandleProgressResultDTO>> itemHandleV2Progress(@PathVariable String itemId);
+    Result<List<ItemHandleProgressResultDTO>> itemHandleV2Progress(@PathVariable("itemId") String itemId);
 
     /**
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java

@@ -42,7 +42,7 @@ public interface NewsFeignClient {
      * @date 2019/9/6 14:55
      */
     @GetMapping("news/epdc-app/notice/getDetail/{noticeId}")
-    Result<EpdcNoticeDetailResultDTO> getNoticeDetail(@PathVariable String noticeId);
+    Result<EpdcNoticeDetailResultDTO> getNoticeDetail(@PathVariable("noticeId") String noticeId);
 
     /**
      * 用户浏览量增加
@@ -155,7 +155,7 @@ public interface NewsFeignClient {
      * @date 2019/9/11 19:20
      */
     @PostMapping(value = "news/epdc-app/information/first/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EpdcInformationFristResultDTO> selectOneFristByUserId(@PathVariable String userId);
+    Result<EpdcInformationFristResultDTO> selectOneFristByUserId(@PathVariable("userId") String userId);
 
     /**
      * 移动端通知列表接口 - v2

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -581,7 +581,7 @@ public interface UserFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAppUserPointsResultDTO>
      **/
     @GetMapping(value = "app-user/epdc-app/user/getPointsByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EpdcAppUserPointsResultDTO> getPointsByUserId(@PathVariable String userId);
+    Result<EpdcAppUserPointsResultDTO> getPointsByUserId(@PathVariable("userId") String userId);
     /**
      * @Description  获取用户认证的网格接口
      * @Author songyunpeng
@@ -590,7 +590,7 @@ public interface UserFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAppUserPointsResultDTO>
      **/
     @GetMapping(value = "app-user/epdc-app/user/getUserGridIdByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<Long> getUserGridIdByUserId(@PathVariable String userId);
+    Result<Long> getUserGridIdByUserId(@PathVariable("userId") String userId);
 
     /**
      * 获取积分核销兑换码
@@ -601,7 +601,7 @@ public interface UserFeignClient {
      * @since 2021/1/19 15:08
      */
     @GetMapping(value = "app-user/epdc-app/verificationqrcode/getqrcode/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<UserPointsVerificationResultDTO> getQRCode(@PathVariable String userId);
+    Result<UserPointsVerificationResultDTO> getQRCode(@PathVariable("userId") String userId);
 
     /**
      * 扫描兑换码获取用户信息接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java

@@ -51,7 +51,7 @@ public interface WorkItemFeignClient {
      * @Date: 2019/11/19 16:42
      */
     @GetMapping(value = "events/work/item/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ItemDetailResultDTO> getItemDetail(@PathVariable String id);
+    Result<ItemDetailResultDTO> getItemDetail(@PathVariable("id") String id);
 
     /**
      * 获取满意度评价结果

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java

@@ -9,6 +9,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.dto.VolunteerUnionFormDTO;
 import com.elink.esua.epdc.feign.ActInfoFeignClient;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 
@@ -92,6 +93,16 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getVolunteerUnionDetail", formDto);
     }
 
+    @Override
+    public Result getVolunteerUnionActList(EpdcUnionActFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getVolunteerUnionActList", dto);
+    }
+
+    @Override
+    public Result getVolunteerUnionActDetail(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getVolunteerUnionActDetail", id);
+    }
+
     @Override
     public Result getTeamTypeList(VolunteerTeamFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getTeamTypeList",formDto);

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java

@@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.dto.VolunteerUnionFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
 
 import java.util.List;
 
@@ -131,4 +132,24 @@ public interface AppVolunteerRankService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result joinTeam(VolunteerTeamFormDTO dto);
+
+    /**
+     * 小程序-共建联盟下属活动-列表
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:57 2021-12-01
+     **/
+    Result getVolunteerUnionActList(EpdcUnionActFormDTO dto);
+
+    /**
+     * 小程序-共建联盟活动-详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:57 2021-12-01
+     **/
+    Result getVolunteerUnionActDetail(String id);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java

@@ -14,6 +14,7 @@ import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.AppVolunteerRankService;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -140,4 +141,13 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
         return userFeignClient.joinTeam(dto);
     }
 
+    @Override
+    public Result getVolunteerUnionActList(EpdcUnionActFormDTO dto) {
+        return actInfoFeignClient.getVolunteerUnionActList(dto);
+    }
+
+    @Override
+    public Result getVolunteerUnionActDetail(String id) {
+        return actInfoFeignClient.getVolunteerUnionActDetail(id);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/form/EpdcUnionActFormDTO.java

@@ -0,0 +1,36 @@
+package com.elink.esua.epdc.volunteer.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 共建联盟下属活动 入参
+ */
+@Data
+public class EpdcUnionActFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 页码
+     */
+    @Min(value = 0, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 0, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 共建联盟id
+     */
+    @NotBlank(message = "共建联盟id不能为空")
+    private String unionActId;
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/result/EpdcUnionActListResultDTO.java

@@ -0,0 +1,47 @@
+package com.elink.esua.epdc.volunteer.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 共建联盟下属活动列表 反参
+ */
+@Data
+public class EpdcUnionActListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 共建联盟id
+     */
+    private String unionId;
+
+    /**
+     * 活动名称
+     */
+    private String title;
+
+    /**
+     * 活动开始时间
+     */
+    private Date actStartTime;
+
+    /**
+     * 活动结束时间
+     */
+    private Date actEndTime;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerUnionActController.java

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.modules.volunteer.excel.VolunteerUnionActExcel;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerUnionActService;
 import com.elink.esua.epdc.volunteer.VolunteerUnionActDTO;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -91,4 +92,16 @@ public class VolunteerUnionActController {
         ExcelUtils.exportExcelToTarget(response, null, list, VolunteerUnionActExcel.class);
     }
 
+    /**
+     * 小程序-共建联盟下属活动-列表
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:57 2021-12-01
+     **/
+    @GetMapping("getVolunteerUnionActList")
+    public Result getVolunteerUnionActList(@RequestBody EpdcUnionActFormDTO dto){
+        return volunteerUnionActService.getVolunteerUnionActList(dto);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerUnionActDao.java

@@ -18,8 +18,11 @@
 package com.elink.esua.epdc.modules.volunteer.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerUnionActEntity;
 import com.elink.esua.epdc.volunteer.VolunteerUnionActDTO;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
+import com.elink.esua.epdc.volunteer.result.EpdcUnionActListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -64,4 +67,14 @@ public interface VolunteerUnionActDao extends BaseDao<VolunteerUnionActEntity> {
      * @Date 09:30 2021-12-01
      **/
     String[] getUnionActIds(@Param("ids") String[] ids);
+
+    /**
+     * 小程序-共建联盟下属活动-列表
+     *
+     * @param dto
+     * @return java.util.List<com.elink.esua.epdc.volunteer.result.EpdcUnionActListResultDTO>
+     * @Author zhangyong
+     * @Date 10:27 2021-12-01
+     **/
+    List<EpdcUnionActListResultDTO> selectListVolunteerUnionActList(EpdcUnionActFormDTO dto);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerUnionActService.java

@@ -21,8 +21,10 @@ package com.elink.esua.epdc.modules.volunteer.service;
 
 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.volunteer.entity.VolunteerUnionActEntity;
 import com.elink.esua.epdc.volunteer.VolunteerUnionActDTO;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -104,4 +106,14 @@ public interface VolunteerUnionActService extends BaseService<VolunteerUnionActE
      * @Date 09:30 2021-12-01
      **/
     String[] getUnionActIds(String[] ids);
+
+    /**
+     * 小程序-共建联盟下属活动-列表
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:57 2021-12-01
+     **/
+    Result getVolunteerUnionActList(EpdcUnionActFormDTO dto);
 }

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

@@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 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.utils.Result;
 import com.elink.esua.epdc.constant.HeartImageConstant;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerUnionActDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerUnionActEntity;
@@ -31,6 +32,8 @@ import com.elink.esua.epdc.modules.volunteer.redis.VolunteerUnionActRedis;
 import com.elink.esua.epdc.modules.volunteer.service.MutualityImgService;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerUnionActService;
 import com.elink.esua.epdc.volunteer.VolunteerUnionActDTO;
+import com.elink.esua.epdc.volunteer.form.EpdcUnionActFormDTO;
+import com.elink.esua.epdc.volunteer.result.EpdcUnionActListResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -137,4 +140,12 @@ public class VolunteerUnionActServiceImpl extends BaseServiceImpl<VolunteerUnion
     public String[] getUnionActIds(String[] ids) {
         return baseDao.getUnionActIds(ids);
     }
+
+    @Override
+    public Result getVolunteerUnionActList(EpdcUnionActFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageIndex(pageIndex);
+        List<EpdcUnionActListResultDTO> result = baseDao.selectListVolunteerUnionActList(formDTO);
+        return new Result().ok(result);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionActDao.xml

@@ -38,7 +38,7 @@
         <if test="title != null and title != ''">
             AND TITLE like concat('%', #{title}, '%')
         </if>
-        ORDER BY a.SORT
+        ORDER BY a.SORT, a.ACT_START_TIME
     </select>
 
     <select id="selectVolunteerUnionActDetailById" resultType="com.elink.esua.epdc.volunteer.VolunteerUnionActDTO">
@@ -67,4 +67,19 @@
             #{id}
         </foreach>
     </select>
+
+    <select id="selectListVolunteerUnionActList" resultType="com.elink.esua.epdc.volunteer.result.EpdcUnionActListResultDTO">
+         SELECT
+            ID,
+            UNION_ID,
+            TITLE,
+            ACT_START_TIME,
+            ACT_END_TIME,
+            SORT
+        FROM epdc_volunteer_union_act
+        WHERE DEL_FLAG = '0'
+        AND UNION_ID = #{unionActId, jdbcType=VARCHAR}
+        ORDER BY SORT, ACT_START_TIME
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 </mapper>