修改

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -11,6 +11,7 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ExcelToolUtils;
 import com.steerinfo.dil.util.Util;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -1089,4 +1090,10 @@ public class TMSController extends BaseRESTfulController {
                                                 Integer pageSize) {
         return tmsFeign.purchaseTrainsOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation("吊装信息")
+    @PostMapping("/disposeHandling")
+    public Map<String,Object> disposeHandling(@RequestBody Map<String,Object> map) {
+        return tmsFeign.disposeHandling(map);
+    }
 }

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -393,6 +393,10 @@ public interface TmsFeign {
                                          @RequestParam Integer apiId,
                                          @RequestParam Integer pageNum,
                                          @RequestParam Integer pageSize);
+
+    @PostMapping("/api/v1/tms/tmsloadresults/disposeHandling")
+    Map<String, Object> disposeHandling(@RequestBody Map<String, Object> map);
+
 }
 
 

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

@@ -269,6 +269,7 @@
             MATERIAL_TYPE_NAME "label",
             MATERIAL_TYPE_NAME "text",
             REMARK "remark",
+            company_id "businessCompanyId",
             'operationsName' "prop"
             from RMS_MATERIAL_TYPE
             where MATERIAL_TYPE_ID in
@@ -551,6 +552,7 @@
         FROM
         RMS_CAPACITY RCA
         LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+        LEFT JOIN RMS_CAPACITY_TYPE RCT2 ON RCT2.CAPACITY_TYPE_ID = RCA.CAPACITY_TYPE_ID2
         left join oms_trans_order oto
         on RCA.capacity_id = oto.capacity_id
         and oto.deleted between 4 and 5
@@ -581,6 +583,9 @@
             <if test="capacityType != null and capacityType != '' ">
                 AND RCT.CAPACITY_TYPE_NAME = #{capacityType}
             </if>
+            <if test="capacityType2 != null and capacityType2 != '' ">
+                AND RCT2.CAPACITY_TYPE_NAME = #{capacityType2}
+            </if>
             <if test="capacityType == null">
                 AND RCT.CAPACITY_TYPE_NAME != '火车'
             </if>