【打卡积分】-【查看页面】增加屏蔽功能，

打卡列表接口添加 限制条件

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;
 
-}
+    /**
+     * 屏蔽标识 0：未屏蔽，1：已屏蔽
+     */
+    private String shieldFlag;
+}

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);
     }
 
-}
+    /**
+     * 屏蔽 用户打卡日志 信息
+     * @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();
+    }
+}

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);
-	
-}
+
+    /**
+     * 屏蔽 用户打卡日志 信息
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 15:56 2020-06-03
+     **/
+    void updateShieldFlag(ActUserClockLogResultDTO dto);
+}

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;
 
-}
+    /**
+     * 屏蔽标识 0：未屏蔽，1：已屏蔽
+     */
+	private String shieldFlag;
+}

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);
 
-
-}
+    /**
+     * 屏蔽 用户打卡日志 信息
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 15:56 2020-06-03
+     **/
+    void modifyShieldFlag(ActUserClockLogResultDTO dto);
+}

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);
+    }
 }

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>
+
+    <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>

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>