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

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

@@ -70,6 +70,11 @@ public class BackgroundProcessingController extends BaseRESTfulController {
                 resMap.put("code","500");
                 return resMap;
             }
+            //查询车牌及司机id
+            Map<String,Object> capacityMap = backgroundProcessingMapper.getCapacityMap(loginName);
+            if(capacityMap != null){
+                dataMap.putAll(capacityMap);
+            }
             System.out.println(dataMap);
         }
         return resMap;

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

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.HashMap;
 
-@FeignClient(value = "antwms-service", url = "http://192.168.1.16:8802/")  //http://192.168.0.244:8002/
+@FeignClient(value = "antwms-service", url = "http://192.168.0.244:8002/")  //http://192.168.0.244:8002/
 public interface ATWmsFeign {
 
     /**

src/main/java/com/steerinfo/dil/mapper/BackgroundProcessingMapper.java

@@ -24,4 +24,5 @@ public interface BackgroundProcessingMapper {
 
     Map<String,Object> getCompanyRootMap(String loginName);
 
+    Map<String,Object> getCapacityMap(String loginName);
 }

src/main/java/com/steerinfo/dil/util/util.java

@@ -1,5 +1,8 @@
 package com.steerinfo.dil.util;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Author zhangnan
  * @Date 2021/5/26 8:59

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

@@ -69,5 +69,20 @@
         ) CONNECT BY PRIOR rc.PARENT_COMPANY_ID = RC.COMPANY_ID
         ORDER BY LEVEL DESC FETCH NEXT 1 ROW ONLY
     </select>
-
+    <select id="getCapacityMap" resultType="java.util.Map">
+        SELECT DISTINCT
+            RCA.CAPACITY_ID "capacityId",
+            RCA.CAPACITY_NUMBER "capacityNumber",
+            RP.PERSONNEL_ID "driverId",
+            RP.PERSONNEL_NAME "driverName"
+        FROM
+            RMS_CAPACITY RCA
+                LEFT JOIN RMS_CAPACITY_DRIVER RCD ON RCD.CAPACITY_ID = RCA.CAPACITY_ID
+                LEFT JOIN RMS_PERSONNEL RP ON RP.PERSONNEL_ID = RCD.PERSONNEL_ID
+                AND RP.DELETED = 0
+        WHERE
+            RCA.DELETED = 0
+          AND (RP.PERSONNEL_JOB_NUMBER = #{loginName} OR RCA .CAPACITY_NUMBER = #{loginName})
+            FETCH NEXT 1 ROWS ONLY
+    </select>
 </mapper>

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

@@ -552,6 +552,7 @@
             <if test="!((driverId!=null and driverId!='') or (driverId2!=null and driverId2!=''))">
                 order by RCA.CAPACITY_ID desc
             </if>
+            FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
             UNION
@@ -559,6 +560,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 +593,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 '已派'
@@ -632,7 +641,6 @@
     <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
         ORDER BY "countNumber" DESC
     </if>
-    FETCH NEXT 10 ROWS ONLY
     </select>
 
     <select id="getCapacityByLikeSc" resultType="java.util.Map">