From 5bdf4ce30689bd94d055875f08ca11bc103acf16 Mon Sep 17 00:00:00 2001 From: chenze <1824191732@qq.com> Date: Wed, 7 Aug 2024 10:10:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/RepairController.java | 34 ++++++++++++++++++- .../java/com/ics/admin/domain/Repair.java | 10 ++++++ .../admin/service/impl/RepairServiceImpl.java | 1 + .../main/java/com/ics/admin/vo/RepairVO.java | 3 ++ .../resources/mapper/admin/RepairMapper.xml | 4 +++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java index 462fe7b..17f5f33 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java @@ -98,7 +98,39 @@ public class RepairController extends BaseController { @GetMapping("list") public R list(Repair repair, @LoginUser User user) { startPage(); - return result(repairService.selectRepairList(repair)); + List repairList = repairService.selectRepairList(repair); + for (Repair repair1 : repairList) { + repair1.setStatusValue(repair1.getStatus().getValue()); + repair1.setStatusName(repair1.getStatus().getName()); + //设备类型 + if (repair1.getTypeId() != null) { + RepairType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair1.getTypeId())); + repair1.setTypeName(repairType.getName()); + } + + + //设备名称 + if (repair1.getRepairDevice() != null){ + RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); + repair1.setRepairDeviceName(repairDevice.getName()); + } + //故障 + if (repair1.getFailureTypeId() != null){ + + RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair1.getFailureTypeId()); + repair1.setFailureTypeName(repairFailureType.getName()); + } + if (repair.getUserId() != null){ + IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair1.getUserId())); + repair1.setUserName(staff.getUsername()); + } + + if (repair.getWorkerId() != null){ + IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair1.getWorkerId()); + repair1.setWorkerName(worker.getUsername()); + } + } + return result(repairList); } /** diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java index fc06c8c..431a26d 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java @@ -76,6 +76,9 @@ public class Repair extends BaseEntity { private Integer statusValue; + @TableField(exist = false) + private String statusName; + public enum Status implements IEnum { /** * 待分配 @@ -246,5 +249,12 @@ public class Repair extends BaseEntity { private Long failureTypeId; + private Long addressId; + + private Long roomId; + + @TableField(exist = false) + private String failureTypeName; + } 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 0d6955e..8912026 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 @@ -87,6 +87,7 @@ public class RepairServiceImpl extends ServiceImpl impleme public int insertRepair(Repair repair) { repair.setSn(snService.generate(Sn.Type.REPAIR)); repair.setCreateTime(DateUtils.getNowDate()); + repair.setRepairTime(DateUtils.getNowDate()); int result = repairMapper.insert(repair); // 增加报修日志 RepairLog repairLog = new RepairLog(); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java index 2bffd23..d9eaf2d 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java @@ -161,6 +161,9 @@ public class RepairVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date failureDate; + /** * 工单记录 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 e47e9ae..22bcaeb 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 @@ -15,6 +15,8 @@ + + @@ -76,6 +78,8 @@ r.user_id, r.repair_level, r.repair_voice, + r.address_id, + r.room_id, r.worker_explain, r.worker_proof, r.dispatcher_id,