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

.gitignore

@@ -9,7 +9,7 @@ src/test
 src/main/resources/application-dev2.yml
 # Compiled class file
 *.class
-
+*.xlsx
 # Log file
 *.log
 

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

@@ -257,7 +257,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation("getShipContainer")
     @PostMapping("/getShipContainer")
     public RESTfulResult getShipContainer(@RequestBody Map<String,Object> map) {
-        List<Map<String,Object>> containerList = universalMapper.getContainerList();
+        List<Map<String,Object>> containerList = universalMapper.getContainerList(map);
         return success(containerList);
     }
 

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

@@ -83,7 +83,7 @@ public interface UniversalMapper {
     //获取车型剩余的空闲车辆和已经派车的数量
     List<Map<String, Object>> getcountCar(Map<String, Object> map);
 
-    List<Map<String, Object>> getContainerList();
+    List<Map<String, Object>> getContainerList(Map<String,Object> map);
 
     String getRequirementNo(Map<String, Object> map);
 

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

@@ -88,7 +88,7 @@
                     <when test="item.contains('admin')">
                         1 = 1
                     </when>
-                    <when test="item.contains('siji)">
+                    <when test="item.contains('siji')">
                         1 = 1
                     </when>
                     <otherwise>

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

@@ -159,6 +159,9 @@
             FETCH NEXT 10 ROWS ONLY
         </if>
         )
+        <where>
+            <include refid="com.steerinfo.dil.mapper.CommonMapper.rootCompanyFilter"></include>
+        </where>
         <if test="id!=null and id.size>0">
         UNION
             select
@@ -1290,7 +1293,7 @@
                FROM RMS_SHIPPING_CONTAINER RSC
         <where>
             <if test="index != null and index != ''">
-
+                REGEXP_LIKE(RSC.CONTAINER_NO,#{index})
             </if>
         </where>
     </select>