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

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

@@ -499,6 +499,7 @@ public class RMScontroller extends BaseRESTfulController {
         Map<String, Object> map = new HashMap<>();
         //获取Excel中包含的对象数组
         List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
         Set<String> set = new HashSet<>();
         for (Map<String, Object> item : list) {
             //校验行
@@ -694,6 +695,7 @@ public class RMScontroller extends BaseRESTfulController {
             ){
                 throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
             }
+            item.put("车号",item.get("车号").toString().toUpperCase());
             //隔开用于查询是否数据库存在
             set.add(item.get("车号").toString());
             //key-value结构方便数据库去重后获取值

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

@@ -494,6 +494,9 @@ public class ExcelToolUtils {
                 //遍历除表头外的所有行
                 for (int rowNum = startRow+1; rowNum <= lastRowNum; rowNum++) {
                     row = sheet.getRow(rowNum);
+                    if(row == null){
+                        continue;
+                    }
                     //遍历行的所有列
                     Map<String,Object> item = new HashMap<>();
                     for (int cellNum = firstCellNum; cellNum < lastCellNum; cellNum++) {

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

@@ -132,7 +132,7 @@
             <where>
                 DELETED = 0
                 <if test="companyType!=null and companyType!=''">
-                    AND RC.COMPANY_TYPE = #{companyType}
+                    AND REGEXP_LIKE(RC.COMPANY_TYPE, #{companyType})
                 </if>
                 <if test="companyId!=null and companyId!=''">
                     AND RC.COMPANY_ID = #{companyId}