From abe70e390677133e36f86f947142f778b6ddd005 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 16:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8D=A1=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E3=80=91-=E3=80=90=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E5=B1=8F=E8=94=BD=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=20=E6=89=93=E5=8D=A1=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=20=E9=99=90=E5=88=B6=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ActUserClockLogResultDTO.java | 6 +++++- .../controller/ActUserClockLogController.java | 19 ++++++++++++++++--- .../activity/dao/ActUserClockLogDao.java | 12 ++++++++++-- .../entity/ActUserClockLogEntity.java | 6 +++++- .../service/ActUserClockLogService.java | 11 +++++++++-- .../impl/ActUserClockLogServiceImpl.java | 4 ++++ .../mapper/activity/ActUserClockLogDao.xml | 19 ++++++++++++++++--- .../mapper/activity/ActUserRelationDao.xml | 2 +- 8 files changed, 66 insertions(+), 13 deletions(-) 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/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> page(@RequestParam Map params){ PageData page = actUserClockLogService.getActUserClockLogFromPC(params); - System.out.println(page); return new Result>().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 { List getActUserClockLogFromPC(Map 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/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/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 + @@ -23,6 +24,7 @@ + - \ No newline at end of file + + + UPDATE epdc_act_user_clock_log + SET + + SHIELD_FLAG = #{shieldFlag} + + where id = #{id} + + 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