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

修改了报修的详情页面和新增页面字段

Browse Source
This commit is contained in:
chenze 2024-08-07 10:10:51 +08:00
parent e34bb05190
commit 5bdf4ce306
5 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<Repair> 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);
}
/**

10
shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java
View File

@ -76,6 +76,9 @@ public class Repair extends BaseEntity<Repair> {
private Integer statusValue;
@TableField(exist = false)
private String statusName;
public enum Status implements IEnum<Integer> {
/**
* 待分配
@ -246,5 +249,12 @@ public class Repair extends BaseEntity<Repair> {
private Long failureTypeId;
private Long addressId;
private Long roomId;
@TableField(exist = false)
private String failureTypeName;
}

1
shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java
View File

@ -87,6 +87,7 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> 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();

3
shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java
View File

@ -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;
/**
* 工单记录

4
shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml
View File

@ -15,6 +15,8 @@
<result property="dispatcherId" column="dispatcher_id"/>
<result property="failureTypeId" column="failure_type_id"/>
<result property="failureDate" column="failure_date"/>
<result property="addressId" column="address_id"/>
<result property="roomId" column="room_id"/>
<result property="name" column="name"/>
<result property="userId" column="user_id"/>
<result property="phone" column="phone"/>
@ -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,