From a73e5c6e54481eecf327d85c35972ec2c10a4168 Mon Sep 17 00:00:00 2001 From: lujiang Date: Wed, 28 Aug 2024 23:50:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RepairRemindController.java | 10 ++++ .../ics/admin/mapper/RepairRemindMapper.java | 8 +++ .../admin/service/IRepairRemindService.java | 7 +++ .../service/impl/RepairRemindServiceImpl.java | 14 +++++ .../com/ics/admin/vo/RepairFloorStatsVo.java | 54 +++++++++++++------ .../mapper/admin/RepairRemindMapper.xml | 7 +++ 6 files changed, 84 insertions(+), 16 deletions(-) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java index de9b4d3..bec7a24 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java @@ -80,4 +80,14 @@ public class RepairRemindController extends BaseController { Long userId = getLoginStaffId(); return toAjax(repairRemindService.deleteRepairRemindByUserId(userId)); } + + /** + * 删除工单提醒 + */ + @RequiresPermissions(value = {"repair:manage:operator", "member:center:view"}, logical = Logical.OR) + @PostMapping("batchRemove") + public R batchRemove(@RequestBody Map map) { + String ids = map.get("ids"); + return toAjax(repairRemindService.deleteRepairRemindByIds(ids)); + } } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java index d70ae90..b657ddc 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java @@ -85,4 +85,12 @@ public interface RepairRemindMapper { * @return 结果 */ int deleteRepairRemindByUserId(Long userId); + + /** + * 批量删除工单提醒 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairRemindByIds(String[] ids); } \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java index e76e50e..ebeb433 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java @@ -68,4 +68,11 @@ public interface IRepairRemindService { * @return 结果 */ int deleteRepairRemindById(Long id, Long userId); + /** + * 批量删除工单提醒 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairRemindByIds(String ids); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java index 140c949..f97d81c 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java @@ -1,5 +1,7 @@ package com.ics.admin.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.ics.admin.domain.RepairRemind; import com.ics.admin.mapper.RepairRemindMapper; import com.ics.admin.service.IRepairRemindService; @@ -97,4 +99,16 @@ public class RepairRemindServiceImpl implements IRepairRemindService { public int deleteRepairRemindById(Long id, Long userId) { return repairRemindMapper.deleteRepairRemindById(id, userId); } + + /** + * 删除工单提醒对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteRepairRemindByIds(String ids) { + String[] idsArray = StrUtil.split(ids,","); + return repairRemindMapper.deleteRepairRemindByIds(idsArray); + } } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairFloorStatsVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairFloorStatsVo.java index 80a20ff..b5a78a9 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairFloorStatsVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairFloorStatsVo.java @@ -19,36 +19,58 @@ public class RepairFloorStatsVo implements Serializable { * 用户id */ private Long id; - /** 姓名 */ + /** + * 姓名 + */ private String name; - /** 电话 */ + /** + * 电话 + */ private String mobile; - /** 所属楼层 */ + /** + * 所属楼层 + */ private String adr; - /** 工单总数 */ - private Long zs; + /** + * 工单总数 + */ + private Long zs = 0l; - /** 处理中 */ - private Long process; + /** + * 处理中 + */ + private Long process = 0l; - /** 已完成 */ - private Long closed; + /** + * 已完成 + */ + private Long closed = 0l; - /** 未解决 */ - private Long unresolved; + /** + * 未解决 + */ + private Long unresolved = 0l; - /** 评价总数 */ - private Long pj; + /** + * 评价总数 + */ + private Long pj = 0l; - /** 好评 */ + /** + * 好评 + */ private String h; - /** 中评 */ + /** + * 中评 + */ private String m; - /** 差评 */ + /** + * 差评 + */ private String l; } diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml index 159f5fd..d7fadf8 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml @@ -118,4 +118,11 @@ DELETE FROM ics_repair_remind where delete_flag = 0 and user_id = #{userId} + + DELETE FROM ics_repair_remind where id in + + #{id} + + + \ No newline at end of file