1

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

@@ -300,7 +300,25 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation("查询运单中所有的司机排班")
     @PostMapping("/getCapacityDriverSelect")
     public RESTfulResult getCapacityDriverSelect(@RequestBody Map<String,Object> map) {
-        return success(universalMapper.getCapacityDriverSelect(map));
+        List<Map<String,Object>> list = universalMapper.getCapacityDriverSelect(map);
+        List<Map<String,Object>> result = new ArrayList<>();
+        Set<String> set = new HashSet<>();
+        //对list去重
+        for (Map<String,Object> item : list) {
+            //只保留5条
+            if(result.size() >= 5){
+                break;
+            }
+            //去重
+            String key = item.get("capacityId") + "-" +item.get("driverId");
+            if(set.contains(key)){
+                continue;
+            }else{
+                set.add(key);
+                result.add(item);
+            }
+        }
+        return success(result);
     }
 
     @ApiOperation("获取车辆信息")

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

@@ -1703,9 +1703,9 @@
     </select>
     <select id="getCapacityDriverSelect" resultType="java.util.Map">
         SELECT DISTINCT
-        OTO.TRANS_ORDER_ID "transOrderId",
         OTO.DRIVER_ID "driverId",
         OTO.CAPACITY_ID "capacityId",
+        OTO.ISSUE_TIME,
         RP.PERSONNEL_NAME "driverName",
         RCA.CAPACITY_NUMBER "capacityNumber"
         FROM
@@ -1721,6 +1721,7 @@
         <if test="capacityId!=null and capacityId!=''">
             AND OTO.CAPACITY_ID = #{capacityId}
         </if>
+        ORDER BY OTO.ISSUE_TIME DESC
     </select>
     <select id="getCapacityInfo" resultType="java.util.Map">
         SELECT * FROM RMS_CAPACITY