rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/bug-1286' into develop

This commit is contained in:
曹鹏飞 2026-01-29 17:57:15 +08:00
parent 9c5425877c 24dcb9df96
commit 6ff6b0c64f
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java
View File

@ -823,6 +823,7 @@ public class DeviceController extends ControllerBase {
List<DeviceAgentRecordVO> vos = new ArrayList<>(); List<DeviceAgentRecordVO> vos = new ArrayList<>();
for (DeviceAgentRecord r : list) { for (DeviceAgentRecord r : list) {
DeviceAgentRecordVO vo = new DeviceAgentRecordVO() DeviceAgentRecordVO vo = new DeviceAgentRecordVO()
.setId(r.getId())
.setOldAgentCode(oldAgentCode) .setOldAgentCode(oldAgentCode)
.setOldAgentName(oldAgentName) .setOldAgentName(oldAgentName)
.setNewAgentCode(r.getAgentCode()) .setNewAgentCode(r.getAgentCode())
@ -833,6 +834,7 @@ public class DeviceController extends ControllerBase {
oldAgentName = r.getAgentName(); oldAgentName = r.getAgentName();
vos.add(vo); vos.add(vo);
} }
vos.sort(Comparator.comparingLong(DeviceAgentRecordVO::getId).reversed());
return ApiResult.success(vos); return ApiResult.success(vos);
} }
} }

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentRecordVO.java
View File

@ -9,6 +9,8 @@ import java.time.LocalDateTime;
@Accessors(chain = true) @Accessors(chain = true)
public class DeviceAgentRecordVO { public class DeviceAgentRecordVO {
private Long id;
/** /**
* 变更前公司编码 * 变更前公司编码
*/ */

2
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
View File

@ -867,6 +867,7 @@ public class DeviceController extends ControllerBase {
List<DeviceAgentRecordVO> vos = new ArrayList<>(); List<DeviceAgentRecordVO> vos = new ArrayList<>();
for (GongfuDeviceAgentRecord r : list) { for (GongfuDeviceAgentRecord r : list) {
DeviceAgentRecordVO vo = new DeviceAgentRecordVO() DeviceAgentRecordVO vo = new DeviceAgentRecordVO()
.setId(r.getId())
.setOldAgentCode(oldAgentCode) .setOldAgentCode(oldAgentCode)
.setOldAgentName(oldAgentName) .setOldAgentName(oldAgentName)
.setNewAgentCode(r.getAgentCode()) .setNewAgentCode(r.getAgentCode())
@ -877,6 +878,7 @@ public class DeviceController extends ControllerBase {
oldAgentName = r.getAgentName(); oldAgentName = r.getAgentName();
vos.add(vo); vos.add(vo);
} }
vos.sort(Comparator.comparingLong(DeviceAgentRecordVO::getId).reversed());
return ApiResult.success(vos); return ApiResult.success(vos);
} }
} }