Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -444,6 +444,7 @@
         when oto.capacity_id is null then '空闲'
         when oto.deleted != '2' and oto.capacity_id is not null then '已派'
         end) "status",
+        RCT.CAPACITY_TYPE_NAME "capacityTypeName",
         'capacityNumber' "prop"
         <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
             ,NVL(T ."countNumber",0) "countNumber"
@@ -521,6 +522,7 @@
             when oto.capacity_id is null then '空闲'
             when oto.deleted != '2' and oto.capacity_id is not null then '已派'
             end) "status",
+            RCT.CAPACITY_TYPE_NAME "capacityTypeName",
             'capacityNumber' "prop"
             <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
                 ,NVL(T ."countNumber",0) "countNumber"
@@ -910,16 +912,16 @@
         select * from(
         select
         RC.MATERIAL_ID "materialId",
-        RC.MATERIAL_NAME "materialName",
+        RC.MATERIAL_NAME "label",
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
-        RC.MATERIAL_NAME  || '-' || RC.MATERIAL_CODE ||
+        RC.MATERIAL_CODE ||
         (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
         THEN '-' || RC.MATERIAL_SPECIFICATION
         WHEN RC.MATERIAL_MODEL IS NOT NULL
         THEN '-' || RC.MATERIAL_MODEL
         ELSE ''
-        END) "label",
+        END)|| '-' || RC.MATERIAL_NAME "materialName",
 
         RC.MATERIAL_NAME "text",
         'materialName' "prop"
@@ -927,13 +929,14 @@
         <where>
             DELETED = 0
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
-                (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
-                THEN '-' || RC.MATERIAL_SPECIFICATION
-                WHEN RC.MATERIAL_MODEL IS NOT NULL
-                THEN '-' || RC.MATERIAL_MODEL
-                ELSE ''
-                END), #{index})
+                AND instr(RC.MATERIAL_CODE || (CASE
+                WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL THEN
+                '-' || RC.MATERIAL_SPECIFICATION
+                WHEN RC.MATERIAL_MODEL IS NOT NULL THEN
+                '-' || RC.MATERIAL_MODEL
+                ELSE
+                ''
+                END) || '-' || RC.MATERIAL_NAME, #{index})>0
             </if>
             <if test="materialId!=null and materialId!=''">
                 AND RC.MATERIAL_ID = #{materialId}
@@ -945,16 +948,16 @@
         UNION
             select
             RC.MATERIAL_ID "materialId",
-            RC.MATERIAL_NAME "materialName",
+            RC.MATERIAL_NAME "label",
             RC.MATERIAL_ID "id",
             RC.MATERIAL_ID "value",
-            RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+            RC.MATERIAL_NAME ||
             (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
             THEN '-' || RC.MATERIAL_SPECIFICATION
             WHEN RC.MATERIAL_MODEL IS NOT NULL
             THEN '-' || RC.MATERIAL_MODEL
             ELSE ''
-            END) "label",
+            END) || '-' || RC.MATERIAL_CODE "materialName",
             RC.MATERIAL_NAME "text",
             'materialName' "prop"
             from RMS_MATERIAL RC