|
|
@@ -55,8 +55,10 @@ public class HardwareApiServiceImpl implements HardwareApiService {
|
|
|
.set(IsJobTicketKey::getKeyId, startKey.getKeyId())
|
|
|
.set(dto.getFromHardwareId() != null, IsJobTicketKey::getFromHardwareId, dto.getFromHardwareId())
|
|
|
.set(dto.getFromHardwareId() != null, IsJobTicketKey::getCollectTime, date)
|
|
|
+ .set(dto.getFromHardwareId() != null, IsJobTicketKey::getKeyStatus, "1")
|
|
|
.set(dto.getToHardwareId() != null, IsJobTicketKey::getToHardwareId, dto.getToHardwareId())
|
|
|
- .set(dto.getToHardwareId() != null, IsJobTicketKey::getGiveBackTime, date));
|
|
|
+ .set(dto.getToHardwareId() != null, IsJobTicketKey::getGiveBackTime, date)
|
|
|
+ .set(dto.getToHardwareId() != null, IsJobTicketKey::getKeyStatus, "2"));
|
|
|
|
|
|
} else {
|
|
|
// 4.1获取解锁时取出的锁的信息
|
|
|
@@ -69,8 +71,10 @@ public class HardwareApiServiceImpl implements HardwareApiService {
|
|
|
.set(IsJobTicketKey::getKeyId, startKey.getKeyId())
|
|
|
.set(dto.getFromHardwareId() != null, IsJobTicketKey::getFromHardwareId, dto.getFromHardwareId())
|
|
|
.set(dto.getFromHardwareId() != null, IsJobTicketKey::getCollectTime, date)
|
|
|
+ .set(dto.getFromHardwareId() != null, IsJobTicketKey::getKeyStatus, "1")
|
|
|
.set(dto.getToHardwareId() != null, IsJobTicketKey::getToHardwareId, dto.getToHardwareId())
|
|
|
- .set(dto.getToHardwareId() != null, IsJobTicketKey::getGiveBackTime, date));
|
|
|
+ .set(dto.getToHardwareId() != null, IsJobTicketKey::getGiveBackTime, date)
|
|
|
+ .set(dto.getToHardwareId() != null, IsJobTicketKey::getKeyStatus, "2"));
|
|
|
}
|
|
|
return true;
|
|
|
}
|