Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

适配达梦

Browse Source
This commit is contained in:
cdf
2026-02-01 13:53:43 +08:00
parent b6eaff3b1e
commit 996ec87ea8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java
View File

@@ -512,7 +512,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
lambdaQueryWrapper.like(RmpEventDetailAssPO::getContentDes, baseParam.getSearchValue()); lambdaQueryWrapper.like(RmpEventDetailAssPO::getContentDes, baseParam.getSearchValue());
} }
lambdaQueryWrapper.between(RmpEventDetailAssPO::getTimeId, timeV.get(0), timeV.get(1)) lambdaQueryWrapper.between(RmpEventDetailAssPO::getTimeId, timeV.get(0), timeV.get(1))
.orderByAsc(RmpEventDetailAssPO::getTimeId); .orderByDesc(RmpEventDetailAssPO::getTimeId);
return rmpEventDetailAssMapper.selectPage(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); return rmpEventDetailAssMapper.selectPage(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
} }

8
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
View File

@@ -1513,14 +1513,14 @@
line.id AS lineId, line.id AS lineId,
CONCAT(sub.NAME, '_', vo.NAME, '_', line.NAME) AS lineName, CONCAT(sub.NAME, '_', vo.NAME, '_', line.NAME) AS lineName,
CONCAT( CONCAT(
IFNULL(CAST(detail.pt1 AS CHAR), 'N/A'), IFNULL(CAST(detail.pt1 AS VARCHAR), 'N/A'),
':', ':',
IFNULL(CAST(detail.pt2 AS CHAR), 'N/A') IFNULL(CAST(detail.pt2 AS VARCHAR), 'N/A')
) AS pt, ) AS pt,
CONCAT( CONCAT(
IFNULL(CAST(detail.ct1 AS CHAR), 'N/A'), IFNULL(CAST(detail.ct1 AS VARCHAR), 'N/A'),
':', ':',
IFNULL(CAST(detail.ct2 AS CHAR), 'N/A') IFNULL(CAST(detail.ct2 AS VARCHAR), 'N/A')
) AS ct, ) AS ct,
detail.Dev_Capacity AS Dev_Capacity, detail.Dev_Capacity AS Dev_Capacity,
detail.Short_Capacity AS Short_Capacity, detail.Short_Capacity AS Short_Capacity,