diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java index c7bbca0..5e2afe4 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java @@ -208,7 +208,7 @@ public class RepairServiceImpl implements IRepairService { private List processRemind(Repair repair, IcsCustomerStaff currentUser, IcsCustomerStaff nextUser, Integer from, Integer to, String content) { List rList = new ArrayList<>();//流程提醒 Date now = new Date(); - String remind = repair.getAddress() + "/" + repair.getFloor() + " " + repair.getRoom() + " / " + repair.getExplain(); + String remind = repair.getAddress() + "/" + repair.getFloor() + " " + repair.getRoom() + " / " + repair.getTypeName(); if (from == 0) {//报修 if (to == 1) //提醒派单员 @@ -428,15 +428,16 @@ public class RepairServiceImpl implements IRepairService { @Override public int repairTimeOutRed() { List list = dictDataService.selectDictDataByType("repair_timeout"); - if (list.size() == 4) { - Integer red = Integer.valueOf(list.get(3).getDictValue()); - List redList = repairMapper.getRepairTimeoutRed(red); + if (list.size() == 3) { + Integer day = Integer.valueOf(list.get(2).getDictValue()); + List redList = repairMapper.getRepairTimeoutRed(day); Date now = new Date(); for (Repair repair : redList) { - RepairRemind repairRemind = new RepairRemind(repair.getId(), repair.getRepairUserId(), String.format(repairRemindContent.getTimeRed(), repair.getRepairName()), -1L, now); + String remindContent = repair.getAddress() + "/" + repair.getFloor() + " " + repair.getRoom() + " / " + repair.getTypeName(); + RepairRemind repairRemind = new RepairRemind(repair.getId(), repair.getRepairUserId(), String.format(repairRemindContent.getTimeRed(), remindContent), -1L, now); repairRemindMapper.insertRepairRemind(repairRemind); } - if (redList.size() > 0) return repairMapper.repairTimeoutRed(red); + if (redList.size() > 0) return repairMapper.repairTimeoutRed(day); } return 0; } @@ -445,15 +446,16 @@ public class RepairServiceImpl implements IRepairService { @Override public int repairTimeOutOrange() { List list = dictDataService.selectDictDataByType("repair_timeout"); - if (list.size() == 4) { - Integer orange = Integer.valueOf(list.get(2).getDictValue()); - List orangeList = repairMapper.getRepairTimeoutOrange(orange); + if (list.size() == 3) { + Integer day = Integer.valueOf(list.get(2).getDictValue()); + List orangeList = repairMapper.getRepairTimeoutOrange(day); Date now = new Date(); for (Repair repair : orangeList) { - RepairRemind repairRemind = new RepairRemind(repair.getId(), repair.getRepairUserId(), String.format(repairRemindContent.getTimeOrange(), repair.getRepairName()), -1L, now); + String remindContent = repair.getAddress() + "/" + repair.getFloor() + " " + repair.getRoom() + " / " + repair.getTypeName(); + RepairRemind repairRemind = new RepairRemind(repair.getId(), repair.getRepairUserId(), String.format(repairRemindContent.getTimeOrange(), remindContent), -1L, now); repairRemindMapper.insertRepairRemind(repairRemind); } - if (orangeList.size() > 0) return repairMapper.repairTimeoutOrange(orange); + if (orangeList.size() > 0) return repairMapper.repairTimeoutOrange(day); } return 0; } @@ -461,7 +463,7 @@ public class RepairServiceImpl implements IRepairService { @Override public int repairForewarnWarn() { List list = dictDataService.selectDictDataByType("repair_timeout"); - if (list.size() == 4) { + if (list.size() == 3) { Integer orange = Integer.valueOf(list.get(0).getDictValue()); Integer red = Integer.valueOf(list.get(1).getDictValue()); int r = repairMapper.repairForewarnRed(red); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java index e6a6dd8..c16584d 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java @@ -84,7 +84,6 @@ public class RepairStatsServiceImpl implements IRepairStatsService { List> timeout = new ArrayList<>(); timeout.add(getMap("严重超时", repairStatsVo.getHtimeout())); timeout.add(getMap("超时", repairStatsVo.getMtimeout())); - timeout.add(getMap("轻微超时", repairStatsVo.getLtimeout())); timeout.add(getMap("未超时", repairStatsVo.getNtimeout())); map.put("timeout", timeout); } else if ("eval".equals(type)) { diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairStatsVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairStatsVo.java index 12db6e1..fba7e7c 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairStatsVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairStatsVo.java @@ -66,11 +66,6 @@ public class RepairStatsVo implements Serializable { */ @JsonIgnore private Integer mtimeout = 0; - /** - * 轻微超时 - */ - @JsonIgnore - private Integer ltimeout = 0; /** * 未超时 */ diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml index bd0c8d8..344874a 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml @@ -313,12 +313,12 @@ = #{day} + update ics_repair set timeout=3 where delete_flag=0 and (status=5 or status=7) and timeout <= 1 and now()>preDate and TIMESTAMPDIFF(DAY,preDate,now()) < #{day} ]]> diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml index 689d051..b71b912 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml @@ -146,8 +146,7 @@ sum(case when status > 7 then 1 else 0 end) wc, sum(case when timeout =5 and status>=9 then 1 else 0 end) htimeout, sum(case when timeout =3 and status>=9 then 1 else 0 end) mtimeout, - sum(case when predate < end_date and timeout=1 and status>=9 then 1 else 0 end) ltimeout, - sum(case when predate > end_date and timeout=1 and status>=9 then 1 else 0 end) ntimeout + sum(case when timeout<=1 and status>=9 then 1 else 0 end) ntimeout FROM ics_repair WHERE