feat: bug-1286 设备售后公司转移
This commit is contained in:
parent
8ba818a74a
commit
24dcb9df96
|
|
@ -823,6 +823,7 @@ public class DeviceController extends ControllerBase {
|
|||
List<DeviceAgentRecordVO> vos = new ArrayList<>();
|
||||
for (DeviceAgentRecord r : list) {
|
||||
DeviceAgentRecordVO vo = new DeviceAgentRecordVO()
|
||||
.setId(r.getId())
|
||||
.setOldAgentCode(oldAgentCode)
|
||||
.setOldAgentName(oldAgentName)
|
||||
.setNewAgentCode(r.getAgentCode())
|
||||
|
|
@ -833,6 +834,7 @@ public class DeviceController extends ControllerBase {
|
|||
oldAgentName = r.getAgentName();
|
||||
vos.add(vo);
|
||||
}
|
||||
vos.sort(Comparator.comparingLong(DeviceAgentRecordVO::getId).reversed());
|
||||
return ApiResult.success(vos);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ import java.time.LocalDateTime;
|
|||
@Accessors(chain = true)
|
||||
public class DeviceAgentRecordVO {
|
||||
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 变更前公司编码
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -867,6 +867,7 @@ public class DeviceController extends ControllerBase {
|
|||
List<DeviceAgentRecordVO> vos = new ArrayList<>();
|
||||
for (GongfuDeviceAgentRecord r : list) {
|
||||
DeviceAgentRecordVO vo = new DeviceAgentRecordVO()
|
||||
.setId(r.getId())
|
||||
.setOldAgentCode(oldAgentCode)
|
||||
.setOldAgentName(oldAgentName)
|
||||
.setNewAgentCode(r.getAgentCode())
|
||||
|
|
@ -877,6 +878,7 @@ public class DeviceController extends ControllerBase {
|
|||
oldAgentName = r.getAgentName();
|
||||
vos.add(vo);
|
||||
}
|
||||
vos.sort(Comparator.comparingLong(DeviceAgentRecordVO::getId).reversed());
|
||||
return ApiResult.success(vos);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue