boyue2025/dbd-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting.git synced 2025-06-22 01:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增对应的数据结构

Browse Source
This commit is contained in:
chenze 2024-08-07 17:39:31 +08:00
parent 78859b4fad
commit 8884bce693
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
View File

@ -64,18 +64,28 @@ public class RepairController extends BaseController {
repairVO.setStatusName(repair.getStatus().getName()); repairVO.setStatusName(repair.getStatus().getName());
//设备类型 //设备类型
RepairType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair.getTypeId())); RepairType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair.getTypeId()));
if (null != repairType){
repairVO.setTypeName(repairType.getName()); repairVO.setTypeName(repairType.getName());
}
//设备名称 //设备名称
RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice())); RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice()));
if (repairDevice != null) {
repairVO.setRepairDeviceName(repairDevice.getName()); repairVO.setRepairDeviceName(repairDevice.getName());
}
//故障 //故障
RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair.getFailureTypeId()); RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair.getFailureTypeId());
if (repairFailureType != null) {
repairVO.setFailureTypeName(repairFailureType.getName()); repairVO.setFailureTypeName(repairFailureType.getName());
}
IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId())); IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId()));
if (null != staff){
repairVO.setUserName(staff.getUsername()); repairVO.setUserName(staff.getUsername());
}
IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair.getWorkerId()); IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair.getWorkerId());
if (null != worker){
repairVO.setWorkerName(worker.getUsername()); repairVO.setWorkerName(worker.getUsername());
}
RepairRecord repairRecord = repairRecordService.selectByRepairId(id); RepairRecord repairRecord = repairRecordService.selectByRepairId(id);
if (null != repairRecord){ if (null != repairRecord){

1
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java
View File

@ -79,7 +79,6 @@ public class RepairTypeController extends BaseController {
type.setWorkerNames(customerStaffs.get(0).getUsername()+"等"+customerStaffs.size()+"人"); type.setWorkerNames(customerStaffs.get(0).getUsername()+"等"+customerStaffs.size()+"人");
type.setWorkerList(customerStaffs); type.setWorkerList(customerStaffs);
} }
} }
return result(repairTypes); return result(repairTypes);
} }