共建联盟活动 PC端

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartImageConstant.java

@@ -0,0 +1,15 @@
+package com.elink.esua.epdc.constant;
+
+/**
+ * 活动模块图片常量
+ *
+ * @author zy
+ * @since 2020/10/22 17:51
+ */
+public interface HeartImageConstant {
+
+    /**
+     * 共建联盟活动 - 精彩瞬间
+     */
+    String IMAGE_TYPE_VOLUNTEER_UNION_ACT = "volunteer_union_act";
+}

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

@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.volunteer;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 图片表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Data
+public class MutualityImgDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 引用ID
+     */
+	private String referenceId;
+
+    /**
+     * 图片地址
+     */
+	private String imgUrl;
+
+    /**
+     * 图片类型
+     */
+	private String imgType;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 删除标识 0：未删除，1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,119 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.volunteer;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import lombok.Data;
+
+
+/**
+ * 共建联盟活动
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Data
+public class VolunteerUnionActDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 共建联盟名称
+     */
+    private String unionName;
+
+    /**
+     * 共建联盟id
+     */
+	private String unionId;
+
+    /**
+     * 活动名称
+     */
+	private String title;
+
+    /**
+     * 活动开始时间
+     */
+	private Date actStartTime;
+
+    /**
+     * 活动结束时间
+     */
+	private Date actEndTime;
+
+    /**
+     * 简介
+     */
+	private String content;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * [0] 活动开始时间
+     * [1] 活动结束时间
+     */
+    private Date[] actTime;
+
+    /**
+     * 精彩瞬间照片
+     */
+    private List<VolunteerUnionActImagesDTO> images;
+}

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

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 图片详情
+ **/
+@Data
+public class VolunteerUnionActImagesDTO implements Serializable {
+
+    private String name;
+
+    private String url;
+
+    /**
+     * 图片上传顺序
+     **/
+    private Integer imgSort;
+}

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

@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.controller;
+
+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.modules.volunteer.excel.VolunteerUnionActExcel;
+import com.elink.esua.epdc.modules.volunteer.service.VolunteerUnionActService;
+import com.elink.esua.epdc.volunteer.VolunteerUnionActDTO;
+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;
+
+
+/**
+ * 共建联盟活动
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@RestController
+@RequestMapping("volunteerunionact")
+public class VolunteerUnionActController {
+
+    @Autowired
+    private VolunteerUnionActService volunteerUnionActService;
+
+    @GetMapping("page")
+    public Result<PageData<VolunteerUnionActDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<VolunteerUnionActDTO> page = volunteerUnionActService.page(params);
+        return new Result<PageData<VolunteerUnionActDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<VolunteerUnionActDTO> get(@PathVariable("id") String id){
+        VolunteerUnionActDTO data = volunteerUnionActService.get(id);
+        return new Result<VolunteerUnionActDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody VolunteerUnionActDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        volunteerUnionActService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody VolunteerUnionActDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        volunteerUnionActService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        volunteerUnionActService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<VolunteerUnionActDTO> list = volunteerUnionActService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, VolunteerUnionActExcel.class);
+    }
+
+}

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

@@ -116,4 +116,16 @@ public class VolunteerUnionController {
         return volunteerUnionService.getVolunteerUnionDetail(dto);
     }
 
+    /**
+     * 共建联盟 下拉列表
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 15:03 2021-11-30
+     **/
+    @GetMapping("optionVolunteerUnion")
+    public Result optionVolunteerUnion() {
+        return volunteerUnionService.optionVolunteerUnion();
+    }
 }

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

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.volunteer.entity.MutualityImgEntity;
+import com.elink.esua.epdc.volunteer.VolunteerUnionActImagesDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 图片表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Mapper
+public interface MutualityImgDao extends BaseDao<MutualityImgEntity> {
+
+    /**
+     * 删除照片
+     *
+     * @param referenceId
+     * @param imgType
+     * @return void
+     * @author zy
+     * @since 2021/9/3 18:30
+     */
+    void modifyImagesByReferenceIdAndImgType(@Param("referenceId") String referenceId, @Param("imgType") String imgType);
+
+    /**
+     * 照片列表查询
+     *
+     * @param referenceId
+     * @param imgType
+     * @return java.util.List<com.elink.esua.epdc.volunteer.VolunteerUnionActImagesDTO>
+     * @Author zhangyong
+     * @Date 16:28 2021-11-30
+     **/
+    List<VolunteerUnionActImagesDTO> selectListImagesByReferenceIdAndImgType(@Param("referenceId") String referenceId, @Param("imgType") String imgType);
+}

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

@@ -0,0 +1,57 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.volunteer.entity.VolunteerUnionActEntity;
+import com.elink.esua.epdc.volunteer.VolunteerUnionActDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 共建联盟活动
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Mapper
+public interface VolunteerUnionActDao extends BaseDao<VolunteerUnionActEntity> {
+
+    /**
+     * PC 列表
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.volunteer.VolunteerUnionActDTO>
+     * @Author zhangyong
+     * @Date 15:21 2021-11-30
+     **/
+    List<VolunteerUnionActDTO> getPageList(Map<String, Object> params);
+
+    /**
+     * 详情查看
+     *
+     * @param id
+     * @return com.elink.esua.epdc.volunteer.VolunteerUnionActDTO
+     * @Author zhangyong
+     * @Date 17:14 2021-11-30
+     **/
+    VolunteerUnionActDTO selectVolunteerUnionActDetailById(@Param("id") String id);
+}

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

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.dto.VolunteerUnionFormDTO;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerUnionEntity;
 import com.elink.esua.epdc.volunteer.VolunteerUnionDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -46,4 +47,14 @@ public interface VolunteerUnionDao extends BaseDao<VolunteerUnionEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     List<VolunteerUnionEntity> getVolunteerPioneerList(VolunteerUnionFormDTO formDto);
+
+    /**
+     * 共建联盟 下拉列表
+     *
+     * @param
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.String>>
+     * @Author zhangyong
+     * @Date 15:02 2021-11-30
+     **/
+    List<Map<String, String>> optionVolunteerUnion();
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/MutualityImgEntity.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 图片表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_mutuality_img")
+public class MutualityImgEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 引用ID
+     */
+	private String referenceId;
+
+    /**
+     * 图片地址
+     */
+	private String imgUrl;
+
+    /**
+     * 图片类型
+     */
+	private String imgType;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerUnionActEntity.java

@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 共建联盟活动
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_volunteer_union_act")
+public class VolunteerUnionActEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 共建联盟id
+     */
+	private String unionId;
+
+    /**
+     * 活动名称
+     */
+	private String title;
+
+    /**
+     * 活动开始时间
+     */
+	private Date actStartTime;
+
+    /**
+     * 活动结束时间
+     */
+	private Date actEndTime;
+
+    /**
+     * 简介
+     */
+	private String content;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerUnionActExcel.java

@@ -0,0 +1,74 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 共建联盟活动
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Data
+public class VolunteerUnionActExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "共建联盟id")
+    private String unionId;
+
+    @Excel(name = "活动名称")
+    private String title;
+
+    @Excel(name = "活动开始时间")
+    private Date actStartTime;
+
+    @Excel(name = "活动结束时间")
+    private Date actEndTime;
+
+    @Excel(name = "简介")
+    private String content;
+
+    @Excel(name = "排序")
+    private Integer sort;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/redis/MutualityImgRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 图片表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Component
+public class MutualityImgRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/redis/VolunteerUnionActRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 共建联盟活动
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Component
+public class VolunteerUnionActRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

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

@@ -0,0 +1,127 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.modules.volunteer.entity.MutualityImgEntity;
+import com.elink.esua.epdc.volunteer.MutualityImgDTO;
+import com.elink.esua.epdc.volunteer.VolunteerUnionActImagesDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 图片表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+public interface MutualityImgService extends BaseService<MutualityImgEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<MutualityImgDTO>
+     * @author generator
+     * @date 2021-11-30
+     */
+    PageData<MutualityImgDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<MutualityImgDTO>
+     * @author generator
+     * @date 2021-11-30
+     */
+    List<MutualityImgDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return MutualityImgDTO
+     * @author generator
+     * @date 2021-11-30
+     */
+    MutualityImgDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-30
+     */
+    void save(MutualityImgDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-30
+     */
+    void update(MutualityImgDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-11-30
+     */
+    void delete(String[] ids);
+
+    /**
+     * 保存图片
+     * @Params: [images, eventId, imgType]
+     * @Return: boolean
+     * @Author: zy
+     * @Date: 2019/9/8 17:12
+     */
+    boolean saveImages(List<VolunteerUnionActImagesDTO> images, String referenceId, String imgType);
+
+    /**
+     * 删除照片
+     *
+     * @param referenceId
+     * @param imgType
+     * @return void
+     * @author zy
+     * @since 2021/9/3 18:29
+     */
+    void modifyImagesByReferenceIdAndImgType(String referenceId, String imgType);
+
+    /**
+     * 照片列表查询
+     *
+     * @param referenceId
+     * @param imgType
+     * @return java.util.List<com.elink.esua.epdc.volunteer.VolunteerUnionActImagesDTO>
+     * @Author zhangyong
+     * @Date 16:28 2021-11-30
+     **/
+    List<VolunteerUnionActImagesDTO> selectListImagesByReferenceIdAndImgType(String referenceId, String imgType);
+}

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

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.modules.volunteer.entity.VolunteerUnionActEntity;
+import com.elink.esua.epdc.volunteer.VolunteerUnionActDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 共建联盟活动
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+public interface VolunteerUnionActService extends BaseService<VolunteerUnionActEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<VolunteerUnionActDTO>
+     * @author generator
+     * @date 2021-11-30
+     */
+    PageData<VolunteerUnionActDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<VolunteerUnionActDTO>
+     * @author generator
+     * @date 2021-11-30
+     */
+    List<VolunteerUnionActDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return VolunteerUnionActDTO
+     * @author generator
+     * @date 2021-11-30
+     */
+    VolunteerUnionActDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-30
+     */
+    void save(VolunteerUnionActDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-30
+     */
+    void update(VolunteerUnionActDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-11-30
+     */
+    void delete(String[] ids);
+}

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

@@ -112,4 +112,13 @@ public interface VolunteerUnionService extends BaseService<VolunteerUnionEntity>
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getVolunteerUnionDetail(VolunteerUnionFormDTO dto);
+
+    /**
+     * 共建联盟 下拉列表
+     * @param unionName 共建联盟名称，模糊查询
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 15:03 2021-11-30
+     **/
+    Result optionVolunteerUnion();
 }

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

@@ -0,0 +1,135 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+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.modules.volunteer.dao.MutualityImgDao;
+import com.elink.esua.epdc.modules.volunteer.entity.MutualityImgEntity;
+import com.elink.esua.epdc.modules.volunteer.redis.MutualityImgRedis;
+import com.elink.esua.epdc.modules.volunteer.service.MutualityImgService;
+import com.elink.esua.epdc.volunteer.MutualityImgDTO;
+import com.elink.esua.epdc.volunteer.VolunteerUnionActImagesDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 图片表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Service
+public class MutualityImgServiceImpl extends BaseServiceImpl<MutualityImgDao, MutualityImgEntity> implements MutualityImgService {
+
+    @Autowired
+    private MutualityImgRedis mutualityImgRedis;
+
+    @Override
+    public PageData<MutualityImgDTO> page(Map<String, Object> params) {
+        IPage<MutualityImgEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, MutualityImgDTO.class);
+    }
+
+    @Override
+    public List<MutualityImgDTO> list(Map<String, Object> params) {
+        List<MutualityImgEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, MutualityImgDTO.class);
+    }
+
+    private QueryWrapper<MutualityImgEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<MutualityImgEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public MutualityImgDTO get(String id) {
+        MutualityImgEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, MutualityImgDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(MutualityImgDTO dto) {
+        MutualityImgEntity entity = ConvertUtils.sourceToTarget(dto, MutualityImgEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(MutualityImgDTO dto) {
+        MutualityImgEntity entity = ConvertUtils.sourceToTarget(dto, MutualityImgEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveImages(List<VolunteerUnionActImagesDTO> images, String referenceId, String imgType) {
+        if (null == images || images.isEmpty()) {
+            return true;
+        }
+        List<MutualityImgEntity> imgEntities = new ArrayList<>(images.size());
+        MutualityImgEntity entity = null;
+        for (int i = 0; i < images.size(); i++) {
+            entity = new MutualityImgEntity();
+            entity.setReferenceId(referenceId);
+            entity.setImgUrl(images.get(i).getUrl());
+            entity.setImgType(imgType);
+            entity.setSort(images.get(i).getImgSort());
+            imgEntities.add(entity);
+        }
+        return insertBatch(imgEntities);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyImagesByReferenceIdAndImgType(String referenceId, String imgType) {
+        baseDao.modifyImagesByReferenceIdAndImgType(referenceId, imgType);
+    }
+
+    @Override
+    public List<VolunteerUnionActImagesDTO> selectListImagesByReferenceIdAndImgType(String referenceId, String imgType) {
+        return baseDao.selectListImagesByReferenceIdAndImgType(referenceId, imgType);
+    }
+}

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

@@ -0,0 +1,131 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.volunteer.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+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.constant.HeartImageConstant;
+import com.elink.esua.epdc.modules.volunteer.dao.VolunteerUnionActDao;
+import com.elink.esua.epdc.modules.volunteer.entity.VolunteerUnionActEntity;
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 共建联盟活动
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-30
+ */
+@Service
+public class VolunteerUnionActServiceImpl extends BaseServiceImpl<VolunteerUnionActDao, VolunteerUnionActEntity> implements VolunteerUnionActService {
+
+    @Autowired
+    private VolunteerUnionActRedis volunteerUnionActRedis;
+    @Autowired
+    private MutualityImgService mutualityImgService;
+
+
+    @Override
+    public PageData<VolunteerUnionActDTO> page(Map<String, Object> params) {
+        IPage<VolunteerUnionActDTO> page = getPage(params);
+        List<VolunteerUnionActDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<VolunteerUnionActDTO> list(Map<String, Object> params) {
+        List<VolunteerUnionActEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, VolunteerUnionActDTO.class);
+    }
+
+    private QueryWrapper<VolunteerUnionActEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<VolunteerUnionActEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public VolunteerUnionActDTO get(String id) {
+        VolunteerUnionActDTO result = baseDao.selectVolunteerUnionActDetailById(id);
+        if (null != result.getActStartTime() && null != result.getActEndTime()) {
+            Date[] actTime = {result.getActStartTime(), result.getActEndTime()};
+            result.setActTime(actTime);
+        }
+        result.setImages(mutualityImgService.selectListImagesByReferenceIdAndImgType(result.getId(), HeartImageConstant.IMAGE_TYPE_VOLUNTEER_UNION_ACT));
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(VolunteerUnionActDTO dto) {
+        VolunteerUnionActEntity entity = ConvertUtils.sourceToTarget(dto, VolunteerUnionActEntity.class);
+        if (null != dto.getActTime() && NumConstant.TWO == dto.getActTime().length) {
+            entity.setActStartTime(dto.getActTime()[NumConstant.ZERO]);
+            entity.setActEndTime(dto.getActTime()[NumConstant.ONE]);
+        }
+        insert(entity);
+
+        // 新增图片
+        mutualityImgService.saveImages(dto.getImages(), entity.getId(), HeartImageConstant.IMAGE_TYPE_VOLUNTEER_UNION_ACT);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(VolunteerUnionActDTO dto) {
+        VolunteerUnionActEntity entity = ConvertUtils.sourceToTarget(dto, VolunteerUnionActEntity.class);
+        if (null != dto.getActTime() && NumConstant.TWO == dto.getActTime().length) {
+            entity.setActStartTime(dto.getActTime()[NumConstant.ZERO]);
+            entity.setActEndTime(dto.getActTime()[NumConstant.ONE]);
+        }
+
+        updateById(entity);
+
+        // 删除图片
+        mutualityImgService.modifyImagesByReferenceIdAndImgType(entity.getId(), HeartImageConstant.IMAGE_TYPE_VOLUNTEER_UNION_ACT);
+        // 新增图片
+        mutualityImgService.saveImages(dto.getImages(), entity.getId(), HeartImageConstant.IMAGE_TYPE_VOLUNTEER_UNION_ACT);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

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

@@ -121,4 +121,9 @@ public class VolunteerUnionServiceImpl extends BaseServiceImpl<VolunteerUnionDao
         return new Result().ok(entity);
     }
 
+    @Override
+    public Result optionVolunteerUnion() {
+        List<Map<String, String>> result = baseDao.optionVolunteerUnion();
+        return new Result().ok(result);
+    }
 }

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.volunteer.dao.MutualityImgDao">
+
+    <resultMap type="com.elink.esua.epdc.modules.volunteer.entity.MutualityImgEntity" id="mutualityImgMap">
+        <result property="id" column="ID"/>
+        <result property="referenceId" column="REFERENCE_ID"/>
+        <result property="imgUrl" column="IMG_URL"/>
+        <result property="imgType" column="IMG_TYPE"/>
+        <result property="sort" column="SORT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <update id="modifyImagesByReferenceIdAndImgType">
+        update epdc_mutuality_img set del_flag = '1' where REFERENCE_ID = #{referenceId} and IMG_TYPE = #{imgType}
+    </update>
+
+    <select id="selectListImagesByReferenceIdAndImgType" resultType="com.elink.esua.epdc.volunteer.VolunteerUnionActImagesDTO">
+        SELECT
+            IMG_URL url,
+            SORT imgSort
+        FROM epdc_mutuality_img
+        WHERE del_flag = '0'
+        AND REFERENCE_ID = #{referenceId}
+        AND IMG_TYPE = #{imgType}
+        ORDER BY SORT
+    </select>
+</mapper>

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.volunteer.dao.VolunteerUnionActDao">
+
+    <resultMap type="com.elink.esua.epdc.modules.volunteer.entity.VolunteerUnionActEntity" id="volunteerUnionActMap">
+        <result property="id" column="ID"/>
+        <result property="unionId" column="UNION_ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="actStartTime" column="ACT_START_TIME"/>
+        <result property="actEndTime" column="ACT_END_TIME"/>
+        <result property="content" column="CONTENT"/>
+        <result property="sort" column="SORT"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+    <select id="getPageList" resultType="com.elink.esua.epdc.volunteer.VolunteerUnionActDTO">
+        SELECT
+            a.ID,
+            a.UNION_ID,
+            a.TITLE,
+            a.ACT_START_TIME,
+            a.ACT_END_TIME,
+            a.CONTENT,
+            a.SORT,
+            u.UNION_NAME
+        FROM epdc_volunteer_union_act a
+        LEFT JOIN epdc_volunteer_union u ON a.UNION_ID = u.ID AND u.DEL_FLAG = '0'
+        WHERE a.DEL_FLAG = '0'
+        <if test="unionId != null and unionId != ''">
+            AND UNION_ID = #{unionId}
+        </if>
+        <if test="title != null and title != ''">
+            AND TITLE like concat('%', #{title}, '%')
+        </if>
+        ORDER BY a.SORT
+    </select>
+
+    <select id="selectVolunteerUnionActDetailById" resultType="com.elink.esua.epdc.volunteer.VolunteerUnionActDTO">
+        SELECT
+            a.ID,
+            a.UNION_ID,
+            a.TITLE,
+            a.ACT_START_TIME,
+            a.ACT_END_TIME,
+            a.CONTENT,
+            a.SORT,
+            u.UNION_NAME
+        FROM epdc_volunteer_union_act a
+        LEFT JOIN epdc_volunteer_union u ON a.UNION_ID = u.ID AND u.DEL_FLAG = '0'
+        WHERE a.DEL_FLAG = '0'
+        AND a.ID = #{id}
+    </select>
+</mapper>

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

@@ -41,5 +41,14 @@
 
     </select>
 
+    <select id="optionVolunteerUnion" resultType="java.util.Map">
+        SELECT
+            UNION_NAME label,
+            ID `value`
+        FROM epdc_volunteer_union
+        WHERE DEL_FLAG = '0'
+        ORDER BY SORT
+    </select>
+
 
 </mapper>