fix(service): 修复台账排序功能并优化事件用户查询逻辑

- 在CsEquipmentDeliveryServiceImpl中添加sort字段设置
- 重构CsEventUserPOServiceImpl中的线路电压获取逻辑,修复空指针异常
- 移除旧的模块编号生成条件,统一使用clDid判断逻辑
- 在CsLedgerServiceImpl中为项目列表添加排序功能
- 为IcdServiceImpl中的项目信息和设备信息列表添加按sort字段排序
- 优化线路信息排序逻辑,按clDid和lineNo字段排序
This commit is contained in:
xy
2026-06-29 20:22:29 +08:00
parent 99fb7aab66
commit ff3341549f
4 changed files with 19 additions and 17 deletions

View File

@@ -469,6 +469,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
returnpage = this.getBaseMapper().queryEventPageWeb(returnpage,csEventUserQueryPage,devIds);
}
returnpage.getRecords().forEach(temp->{
CsLineDTO dto = map.get(temp.getLineId());
DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData();
temp.setEquipmentName(devDetail.getEquipmentName());
temp.setProjectId(devDetail.getProjectId());
@@ -476,8 +477,11 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
temp.setEngineeringid(devDetail.getEngineeringid());
temp.setEngineeringName(devDetail.getEngineeringName());
if (ObjectUtil.isNotNull(temp.getLineId())) {
if (!Objects.isNull(map.get(temp.getLineId()))) {
temp.setLineVoltage(map.get(temp.getLineId()).getVolGrade());
if (!Objects.isNull(dto)) {
temp.setLineVoltage(dto.getVolGrade());
if (dto.getClDid() == 0) {
temp.setModuleNo("模块" + temp.getClDid());
}
}
}
EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
@@ -488,11 +492,6 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
temp.setShowName(ele.getShowName());
temp.setCode(ele.getDefaultValue());
}
if (ObjectUtil.isNotNull(temp.getLineId())) {
if (temp.getLineId().endsWith("0")) {
temp.setModuleNo("模块" + temp.getClDid());
}
}
if(Objects.equals(csEventUserQueryPage.getType(),"0")){
List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>();