liyg пре 1 година
родитељ
комит
d7b188c9a1
1 измењених фајлова са 9 додато и 1 уклоњено
  1. 9 1
      src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

+ 9 - 1
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -559,6 +559,11 @@
             RCA .CAPACITY_ID "capacityId",
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
+            RCA .CAPACITY_LICENCE_NUMBER "capacityLicenceNumber",
+            RCA. CAPACITY_OPERATE_NUMBER "capacityOperateNumber",
+            RCA. CAPACITY_AXIS_NUMBER "capacityAxisNumber",
+            RCA.CAPACITY_WEIGHT_MAIN "capacityWeightMain",
+            RCA.CAPACITY_WEIGHT_TRAILER "capacityWeightTrailer",
             CASE WHEN RC.COMPANY_TYPE = '业务单位'
             THEN RC.COMPANY_ID
             else -1
@@ -587,7 +592,10 @@
             then RCA.CAPACITY_NUMBER
             else RCA.REMARK1
             end "remark1",
-            RCA.CAPACITY_NUMBER "capacityNumber",
+            CASE WHEN RCA.REMARK1 is null
+            then RCA.CAPACITY_NUMBER
+            else RCA.REMARK1
+            end "capacityNumber",
             (case
             when oto.capacity_id is null then '空闲'
             when oto.deleted != '2' and oto.capacity_id is not null then '已派'