diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java index 1fe5c5541..12a3d3e97 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java @@ -512,7 +512,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); } diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml index 3831aff44..0a448d6f2 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml @@ -1513,14 +1513,14 @@ line.id AS lineId, CONCAT(sub.NAME, '_', vo.NAME, '_', line.NAME) AS lineName, 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, 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, detail.Dev_Capacity AS Dev_Capacity, detail.Short_Capacity AS Short_Capacity,