增加有关志愿者标识的获取方式。

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java

@@ -125,4 +125,18 @@ public class AppActInfoController {
         return this.actInfoService.getCancelDetailByApp(id);
     }
 
+    /**
+     * 功能描述: 获取志愿者标识
+     *
+     * @param actId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.activity.ActInfoDTO>
+     * @author zhy
+     * @date 2020/6/28 17:01
+     */
+    @GetMapping("getVolunteerFlag/{actId}")
+    public Result<ActInfoDTO> getVolunteerFlag(@PathVariable String actId) {
+        ActInfoDTO data = actInfoService.getVolunteerFlag(actId);
+        return new Result<ActInfoDTO>().ok(data);
+    }
+
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.activity.result.ActInfoResultDTO;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,7 @@ import java.util.Map;
 public interface ActInfoDao extends BaseDao<ActInfoEntity> {
     /**
      * 活动列表
+     *
      * @Params: [params]
      * @Return: java.util.List<com.elink.esua.epdc.dto.heart.ActInfoDTO>
      * @Author: liuchuang
@@ -49,14 +51,17 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
 
     /**
      * 移动端-活动列表
+     *
      * @Params: [formDto]
      * @Return: java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>
      * @Author: liuchuang
      * @Date: 2019/9/9 16:50
      */
     List<ActInfoAppResultDTO> listItemsByApp(ActInfoAppFormDTO formDto);
+
     /**
      * 移动端-活动列表（已报名）
+     *
      * @Params: [formDto]
      * @Return: java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>
      * @Author: liuchuang
@@ -66,6 +71,7 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
 
     /**
      * 工作端-项目详情
+     *
      * @Params: [formDto]
      * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO
      * @Author: lipengfei
@@ -104,6 +110,15 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      **/
     void addClockNum(String actId);
 
+    /**
+     * 功能描述: 查询活动的志愿者标志
+     *
+     * @param actId
+     * @return ActInfoEntity
+     * @author zhy
+     * @date 2020/6/28 16:55
+     */
+    ActInfoEntity selectActVolunteerFlag(@Param("actId") String actId);
 
     /***
      * 报名审核不通过 活动报名数-1

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java

@@ -33,7 +33,7 @@ import java.util.Date;
  * @since v1.0.0 2019-12-11
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("epdc_act_info")
 public class ActInfoEntity extends BaseEpdcEntity {
 
@@ -202,4 +202,9 @@ public class ActInfoEntity extends BaseEpdcEntity {
      */
     private Integer actQuotaCategory;
 
+    /**
+     * 是否只允许志愿者参加  0否  1是
+     */
+    private String volunteerFlag;
+
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java

@@ -71,18 +71,31 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      */
     ActInfoDTO get(String id);
 
+    /**
+     * 查询活动的志愿者标志
+     *
+     * @param actId
+     * @return ActInfoDTO
+     * @author zhy
+     * @date 2020-6-28
+     */
+    ActInfoDTO getVolunteerFlag(String actId);
+
     /**
      * 活动列表-移动app端用
+     *
      * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
      * @Author: lipengfei
      * @Date: 2019/10/19 16:47
      */
     Result<List<ActInfoAppResultDTO>> listItemsByApp(ActInfoAppFormDTO formDto);
+
     /**
      * 活动列表(已报名)-移动app端用
+     *
      * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
      * @Author: lipengfei
      * @Date: 2019/10/19 16:47
      */
@@ -120,6 +133,7 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
 
     /**
      * 移动端-项目详情
+     *
      * @Params: [formDto]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
      * @Author: liuchuang
@@ -148,11 +162,10 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
     void update(ActInfoDTO dto);
 
     /**
-     *
      * 取消活动
      *
-     * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
      * @author liuchuang
      * @since 2020/2/6 21:18
      */

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java

@@ -123,6 +123,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         return ConvertUtils.sourceToTarget(entity, ActInfoDTO.class);
     }
 
+    @Override
+    public ActInfoDTO getVolunteerFlag(String id) {
+        ActInfoEntity entity = baseDao.selectActVolunteerFlag(id);
+        return ConvertUtils.sourceToTarget(entity, ActInfoDTO.class);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result save(ActInfoDTO dto) {

epdc-cloud-heart/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -40,6 +40,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="volunteerFlag" column="VOLUNTEER_FLAG"/>
         <result property="actUserDefaultState" column="ACT_USER_DEFAULT_STATE"/>
     </resultMap>
     <resultMap type="com.elink.esua.epdc.activity.result.ActInfoResultDTO" id="actResultMap">
@@ -469,7 +470,14 @@
             id = #{actId}
             AND DEL_FLAG = 0
     </select>
-
+    <!-- 活动详情   -->
+    <select id="selectActVolunteerFlag" resultType="com.elink.esua.epdc.modules.activity.entity.ActInfoEntity">
+        select eai.ID,
+        eai.VOLUNTEER_FLAG
+        from epdc_act_info eai
+        where eai.DEL_FLAG='0'
+        and eai.id=#{actId}
+    </select>
 
     <!-- 活动详情   -->
     <select id="selectActInfoDetailResultDTO" parameterType="java.lang.String"