提交

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

@@ -54,11 +54,12 @@
                         )
                     </when>
                     <when test="item == 'businessCompany'">
-                        "businessCompanyId"
-                        in
+                        "businessCompanyId" in(
+                        select COMPANY_ID from RMS_COMPANY where COMPANY_NAME in(select COMPANY_NAME FROM RMS_COMPANY where COMPANY_ID in
                         <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
                             #{item.companyId}
                         </foreach>
+                        ))
                     </when>
                     <when test="item == 'approveBusinessCompany'">
                         "approveBusinessCompanyId"

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

@@ -474,10 +474,8 @@
         RCA.REMARK1 "remark1",
         RCA.CAPACITY_NUMBER "capacityNumber",
         (case
-        when RCA.deleted = '3' is not null then '维保'
         when oto.capacity_id is null then '空闲'
         when oto.deleted != '2' and oto.capacity_id is not null then '已派'
-        when oto.deleted = '2' and oto.capacity_id is not null then '空闲'
         end) "status",
         RCT.CAPACITY_TYPE_NAME "capacityTypeName",
         'capacityNumber' "prop"
@@ -638,8 +636,10 @@
         else RCA.REMARK1
         end "capacityNumber",
         (case
+        when RCA.deleted = '3' then '维保'
         when oto.capacity_id is null then '空闲'
         when oto.deleted != '2' and oto.capacity_id is not null then '已派'
+        when oto.deleted = '2' and oto.capacity_id is not null then '空闲'
         end) "status",
         RCT.CAPACITY_TYPE_NAME "capacityTypeName",
         'capacityNumber' "prop"