diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java
index cb152614..7abcbc73 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
@@ -109,7 +110,7 @@ public class ApiAppActInfoController {
     }
 
     @GetMapping("banner/list")
-    public Result<List<ActBannerDTO>> bannerList() {
-        return actInfoService.getBannerList();
+    public Result<List<ActBannerDTO>> bannerList(EpdcAppBannerFormDTO dto) {
+        return actInfoService.getBannerList(dto);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiDicController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiDicController.java
new file mode 100644
index 00000000..2a609f03
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiDicController.java
@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.service.AdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 字典
+ * @Auther: zhangyong
+ * @Date: 2020-06-02 11:05
+ */
+@RestController
+@RequestMapping("dic")
+public class ApiDicController {
+
+    @Autowired
+    private AdminService adminService;
+
+    /*
+     * 获取默认网格信息
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @Author zhangyong
+     * @Date 11:07 2020-06-02
+     **/
+    @GetMapping("/getDefaultGridInfo")
+    public Result<String> getDefaultGridInfo() {
+        String dicType = "default_grid";
+        return adminService.getDefaultGridInfo(dicType);
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java
index 95fd6e0e..0eb24268 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
@@ -61,7 +62,7 @@ public interface ActInfoFeignClient {
     Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);
 
     @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ActBannerDTO>> getBannerList();
+    Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto);
 
 
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index 93a7813b..bdcc6693 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -98,4 +98,15 @@ public interface AdminFeignClient {
      **/
     @GetMapping("sys/dict/listSimple/{dictType}")
     Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(@PathVariable("dictType") String dictType);
+
+    /**
+     * 根据数据字典类型获取 获取默认网格信息
+     *
+     * @param dictType 数据字典类型
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @Author zhangyong
+     * @Date 18:40 2020-06-02
+     */
+    @GetMapping("/sys/dict/listSimple/{dictType}")
+    Result<List<SysSimpleDictDTO>> getDefaultGridInfoByDicType(@PathVariable("dictType") String dictType);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java
index 0dc8b66e..0f2d1a98 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
@@ -42,8 +43,8 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getCancelDetail", id);
     }
     @Override
-    public Result<List<ActBannerDTO>> getBannerList() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList");
+    public Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList", dto);
     }
 
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index d3f757a0..8601787d 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -53,4 +53,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", dictType);
     }
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> getDefaultGridInfoByDicType(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDefaultGridInfoByDicType", dictType);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java
index f8119a6e..28d7417c 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -45,7 +46,7 @@ public interface ActInfoService {
 
     Result<ActInfoDetailAppResultDTO> getCancelDetail(String itemId);
 
-    Result<List<ActBannerDTO>> getBannerList();
+    Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto);
 
 
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
index 55e06883..ef819781 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
@@ -20,4 +20,13 @@ public interface AdminService {
      * @date 2019/9/11 09:46
      */
     Result<String> getCompleteDeptName(Long gridId);
+
+    /*
+     * 根据字典类型 获取网格信息
+     * @param dicType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @Author zhangyong
+     * @Date 11:08 2020-06-02
+     **/
+    Result<String> getDefaultGridInfo(String dicType);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java
index 654ffff5..b84de781 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -47,7 +48,7 @@ public class ActInfoServiceImpl implements ActInfoService {
         return actInfoFeignClient.getCancelDetail(itemId);
     }
     @Override
-    public Result<List<ActBannerDTO>> getBannerList() {
-        return actInfoFeignClient.getBannerList();
+    public Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto) {
+        return actInfoFeignClient.getBannerList(dto);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
index c5f79982..4b9e7860 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
@@ -2,11 +2,14 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.AdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author yujintao
  * @email yujintao@elink-cn.com
@@ -33,4 +36,14 @@ public class AdminServiceImpl implements AdminService {
                 .concat(completeDept.getGrid());
         return new Result().ok(deptName);
     }
+
+    @Override
+    public Result<String> getDefaultGridInfo(String dicType) {
+        Result<List<SysSimpleDictDTO>> listResult = adminFeignClient.getDefaultGridInfoByDicType(dicType);
+        if (!listResult.success() || null == listResult) {
+            return new Result().error("查询默认网格信息失败");
+        }
+        String defaultGrid = listResult.getData().get(0).getDictValue();
+        return new Result<String>().ok(defaultGrid);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
index b3b13d60..ffa87aa5 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
@@ -215,5 +215,8 @@ public class ActInfoDTO implements Serializable {
      */
     private String bannerUrl;
 
-
-}
\ No newline at end of file
+    /**
+     * 活动新闻稿
+     */
+    private String actNewsContent;
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java
new file mode 100644
index 00000000..7d38b5ea
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java
@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.activity.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * banner列表入参
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-06-02
+ */
+@Data
+public class EpdcAppBannerFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * banner类型:0-(活动/志愿者banner)， 2-志愿者证书
+     */
+    private String bannerType;
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java
index d03cd1f6..8e057e37 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java
@@ -224,4 +224,8 @@ public class ActInfoDetailAppResultDTO implements Serializable {
 
 	private String failureReason;
 
+	/**
+	 * 活动新闻稿
+	 */
+	private String actNewsContent;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java
index 6c65730b..a5bc0959 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java
@@ -120,4 +120,9 @@ public class ActInfoDetailResultDTO implements Serializable {
 	 * 打卡截止时间
 	 */
 	private Date signinEndTime;
+
+	/**
+	 * 活动新闻稿
+	 */
+	private String actNewsContent;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java
index 09d78d87..6b8279ae 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java
@@ -88,4 +88,8 @@ public class ActUserClockLogResultDTO implements Serializable {
     private String[] clockPic;
     private String clockPics;
 
-}
\ No newline at end of file
+    /**
+     * 屏蔽标识 0：未屏蔽，1：已屏蔽
+     */
+    private String shieldFlag;
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java
index 40d0d321..f23dcd05 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.activity.controller;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 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;
@@ -26,6 +27,7 @@ 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.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.modules.activity.excel.ActBannerExcel;
 import com.elink.esua.epdc.modules.activity.service.ActBannerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,9 +69,12 @@ public class ActBannerController {
     }
 
     @GetMapping("bannerlist")
-    public Result<List<ActBannerDTO>> getBannerList(){
+    public Result<List<ActBannerDTO>> getBannerList(@RequestBody EpdcAppBannerFormDTO dto){
         Map<String, Object> params =new HashMap<String, Object>();
         params.put("status","1");
+        if (null != dto.getBannerType()) {
+            params.put("bannerType", dto.getBannerType());
+        }
         List<ActBannerDTO> data = actBannerService.list(params);
         return new Result<List<ActBannerDTO>>().ok(data);
     }
@@ -103,4 +108,16 @@ public class ActBannerController {
         ExcelUtils.exportExcelToTarget(response, null, list, ActBannerExcel.class);
     }
 
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
+     * @Author zhangyong
+     * @Date 15:13 2020-06-02
+     **/
+    @GetMapping("getBannerType/{dictType}")
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType){
+        return actBannerService.getListSimpleDictInfo(dictType);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java
index c0ca5423..35fc3326 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java
@@ -50,7 +50,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("actuserclocklog")
 public class ActUserClockLogController {
-    
+
     @Autowired
     private ActUserClockLogService actUserClockLogService;
 
@@ -60,7 +60,6 @@ public class ActUserClockLogController {
     @GetMapping("page")
     public Result<PageData<ActUserClockLogResultDTO>> page(@RequestParam Map<String, Object> params){
         PageData<ActUserClockLogResultDTO> page = actUserClockLogService.getActUserClockLogFromPC(params);
-        System.out.println(page);
         return new Result<PageData<ActUserClockLogResultDTO>>().ok(page);
     }
 
@@ -118,4 +117,18 @@ public class ActUserClockLogController {
         ExcelUtils.exportExcelToTarget(response, null, list, ActUserClockLogExcel.class);
     }
 
-}
\ No newline at end of file
+    /**
+     * 屏蔽 用户打卡日志 信息
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 15:56 2020-06-03
+     **/
+    @PostMapping("updateShieldFlag")
+    public Result updateShieldFlag(@RequestBody ActUserClockLogResultDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        actUserClockLogService.modifyShieldFlag(dto);
+        return new Result();
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java
index 275f386a..411229e5 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java
@@ -35,5 +35,13 @@ import java.util.Map;
 public interface ActUserClockLogDao extends BaseDao<ActUserClockLogEntity> {
 
     List<ActUserClockLogResultDTO> getActUserClockLogFromPC(Map<String, Object> params);
-	
-}
\ No newline at end of file
+
+    /**
+     * 屏蔽 用户打卡日志 信息
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 15:56 2020-06-03
+     **/
+    void updateShieldFlag(ActUserClockLogResultDTO dto);
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
index 874b2cfa..1a19f9f3 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
@@ -201,4 +201,8 @@ public class ActInfoEntity extends BaseEpdcEntity {
 	 */
 	private Integer actQuotaCategory;
 
+	/**
+	 * 活动新闻稿
+	 */
+	private String actNewsContent;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java
index 198b021e..5c1bff12 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java
@@ -78,4 +78,8 @@ public class ActUserClockLogEntity extends BaseEpdcEntity {
 	 */
 	private String effectiveFlag;
 
-}
\ No newline at end of file
+    /**
+     * 屏蔽标识 0：未屏蔽，1：已屏蔽
+     */
+	private String shieldFlag;
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java
index b9180038..a87cdfbf 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java
@@ -23,6 +23,7 @@ import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO;
 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.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
 
 import java.util.List;
@@ -142,4 +143,14 @@ public interface ActBannerService extends BaseService<ActBannerEntity> {
      * @Date 18:27 2020-05-25
      **/
     Result<List<EpdcAppActBannerResultDTO>> getBannerList(EpdcAppActBannerFormDTO formDto);
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
+     * @Author zhangyong
+     * @Date 15:13 2020-06-02
+     **/
+    Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType);
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java
index 5fa481ba..df96b42f 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java
@@ -111,5 +111,12 @@ public interface ActUserClockLogService extends BaseService<ActUserClockLogEntit
      */
     Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO);
 
-
-}
\ No newline at end of file
+    /**
+     * 屏蔽 用户打卡日志 信息
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 15:56 2020-06-03
+     **/
+    void modifyShieldFlag(ActUserClockLogResultDTO dto);
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
index 6476371d..6decb5b2 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
@@ -29,10 +29,12 @@ 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.ActStateConstant;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActBannerDao;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
 import com.elink.esua.epdc.modules.activity.redis.ActBannerRedis;
 import com.elink.esua.epdc.modules.activity.service.ActBannerService;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,6 +57,9 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
     @Autowired
     private ActBannerRedis actBannerRedis;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Override
     public PageData<ActBannerDTO> page(Map<String, Object> params) {
         IPage<ActBannerEntity> page = baseDao.selectPage(
@@ -172,4 +177,8 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
         return new Result().ok(data);
     }
 
+    @Override
+    public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
+        return adminFeignClient.getListSimpleDictInfo(dictType);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index 97eb5491..7d356857 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -353,4 +353,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         return new Result();
     }
 
+    @Override
+    public void modifyShieldFlag(ActUserClockLogResultDTO dto) {
+        baseDao.updateShieldFlag(dto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java
new file mode 100644
index 00000000..c03ee400
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java
@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.modules.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.modules.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+/**
+ * @author zhangyong
+ * @date 15:13 2020-06-02
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
+     * @Author zhangyong
+     * @Date 15:27 2020-05-27
+     **/
+    @GetMapping("sys/dict/listSimple/{dictType}")
+    Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(@PathVariable("dictType") String dictType);
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java
new file mode 100644
index 00000000..da30ee20
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java
@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.modules.feign.fallback;
+
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhangyong
+ * @date 15:13 2020-06-02
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", dictType);
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml
index 75ae833d..72b8f255 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml
@@ -107,7 +107,11 @@
         <if test="status != null and status != ''">
             AND banner.STATUS = #{status}
         </if>
+        <if test="bannerType != null and bannerType != ''">
+            AND banner.BANNER_TYPE = #{bannerType}
+        </if>
         ORDER BY
+        banner.SORT,
         banner.CREATED_TIME DESC
     </select>
 
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index 946d836e..53886f82 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -41,6 +41,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="actUserDefaultState" column="ACT_USER_DEFAULT_STATE"/>
+        <result property="actNewsContent" column="ACT_NEWS_CONTENT"/>
     </resultMap>
     <resultMap type="com.elink.esua.epdc.activity.result.ActInfoResultDTO" id="actResultMap">
         <result property="id" column="ID"/>
@@ -170,18 +171,15 @@
         and relation.USER_ID = #{userId}
         and relation.STATUS not in ('3','4')
         and actInfo.ID = relation.ACT_ID
-        WHERE actInfo.DEL_FLAG = '0' and actInfo.ACT_STATUS = '1'
+        WHERE actInfo.DEL_FLAG = '0'  and actInfo.ACT_STATUS = '1'
         <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         <if test='actId != null and actId != "" '>
             AND actInfo.ID = #{actId}
         </if>
-        <if test='actType != null and actType != "" and actType == "0"'>
-            <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
-        </if>
         <if test='actType != null and actType != "" and actType == "1"'>
-            <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+            <![CDATA[ AND DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         ) temp
         ORDER BY temp.actCurrentState ASC
@@ -489,7 +487,8 @@
         eai.REWARD,
         eai.PUNISHMENT_POINTS as punishmentPoints,
         eai.REQUIREMENT as requirement,
-        eai.ACT_CONTENT as actContent
+        eai.ACT_CONTENT as actContent,
+        ACT_NEWS_CONTENT as actNewsContent
         from epdc_act_info eai
         where eai.DEL_FLAG='0'
         and eai.id=#{actId}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserClockLogDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserClockLogDao.xml
index b871e882..d35b857e 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserClockLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserClockLogDao.xml
@@ -10,6 +10,7 @@
         <result property="clockLatitude" column="CLOCK_LATITUDE"/>
         <result property="clockAddress" column="CLOCK_ADDRESS"/>
         <result property="clockDesc" column="CLOCK_DESC"/>
+        <result property="shieldFlag" column="SHIELD_FLAG"/>
     </resultMap>
     <resultMap type="com.elink.esua.epdc.activity.result.ActUserClockLogResultDTO" id="actUserClockLogResultMap">
         <result property="id" column="ID"/>
@@ -23,6 +24,7 @@
         <result property="age" column="AGE"/>
         <result property="mobile" column="MOBILE"/>
         <result property="clockPics" column="CLOCK_PIC"/>
+        <result property="shieldFlag" column="SHIELD_FLAG"/>
     </resultMap>
     <select id="getActUserClockLogFromPC" resultMap="actUserClockLogResultMap">
        SELECT
@@ -36,7 +38,8 @@
         a.SEX,
         a.AGE,
         a.MOBILE,
-		GROUP_CONCAT(a.CLOCK_PIC SEPARATOR ',') CLOCK_PIC
+		GROUP_CONCAT(a.CLOCK_PIC SEPARATOR ',') CLOCK_PIC,
+        a.SHIELD_FLAG
     FROM (
     SELECT
         log.ID,
@@ -50,7 +53,8 @@
         relation.AGE,
         relation.MOBILE,
         pic.CLOCK_PIC,
-        log.CREATED_TIME
+        log.CREATED_TIME,
+        log.SHIELD_FLAG
         FROM
         epdc_act_user_clock_log log
         LEFT JOIN epdc_act_user_relation relation ON log.ACT_USER_ID = relation.ID
@@ -64,4 +68,13 @@
         </if>
 		) a GROUP BY a.ID ORDER BY a.CREATED_TIME DESC
     </select>
-</mapper>
\ No newline at end of file
+
+    <update id="updateShieldFlag" parameterType="com.elink.esua.epdc.activity.result.ActUserClockLogResultDTO">
+        UPDATE epdc_act_user_clock_log
+            SET
+            <if test="shieldFlag != null and shieldFlag != '' ">
+                SHIELD_FLAG = #{shieldFlag}
+            </if>
+        where id = #{id}
+    </update>
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
index 05f72d90..5aae7748 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
@@ -224,7 +224,7 @@
             auc.ID id
         from epdc_act_user_relation aur
 		left join epdc_act_user_clock_log auc on aur.ID = auc.ACT_USER_ID
-        where aur.DEL_FLAG = '0' and auc.DEL_FLAG = '0'
+        where aur.DEL_FLAG = '0' and auc.DEL_FLAG = '0' and auc.SHIELD_FLAG = '0'
 		and aur.ACT_ID = #{actId}
         order by auc.CLOCK_TIME desc
     </select>