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

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>antai-api</artifactId>
-    <version>1.2</version>
+    <version>1.7</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -737,6 +737,21 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.importCapacity(map);
     }
 
+    @ApiOperation("导入车辆")
+    @PostMapping("/importCapacityDriver")
+    public Map<String, Object> importCapacityDriver(@RequestBody MultipartFile file,
+                                              String userId,
+                                              String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        map.put("setList",list);
+        map.put("userId",userId);
+        map.put("userName",userName);
+        return rmsFeign.importCapacityDriver(map);
+    }
+
 
     @ApiOperation(value = "删除", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "仓库id", value = "id", required = true, dataType = "int")

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

@@ -289,6 +289,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/importCapacity")
     Map<String, Object> importCapacity(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/importCapacityDriver")
+    Map<String, Object> importCapacityDriver(Map<String, Object> map);
+
     //==============仓库
     //新增仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")

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

@@ -897,6 +897,9 @@
             <if test="capacityTypeId!=null and capacityTypeId!=''">
                 AND RCT.CAPACITY_TYPE_ID =  #{capacityTypeId}
             </if>
+            <if test="insertUserName != null and insertUserName !='' ">
+                AND RCT.INSERT_USERNAME = #{insertUserName}
+            </if>
             <if test="isPCapacityTypeId!=null and isPCapacityTypeId!=''">
                 AND RCT.P_CAPACITY_TYPE_ID is null
             </if>