修改

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

@@ -948,4 +948,21 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> gatepostTransitManager(@RequestBody Map<String,Object> map) {
         return tmsFeign.gatepostTransitManager(map);
     }
+
+
+    @ApiOperation("导入宏瑞综合实绩")
+    @PostMapping("/importComprehensiveResult")
+    public Map<String, Object> importComprehensiveResult(@RequestBody MultipartFile file,
+                                                 String userId,
+                                                 String userName,
+                                                 String resultType) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        map.put("userId", userId);
+        map.put("userName", userName);
+        map.put("resultType",resultType);
+        return tmsFeign.importComprehensiveResult(map);
+    }
 }

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

@@ -332,6 +332,9 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/tmstransitorders/gatepostTransitManager")
     Map<String, Object> gatepostTransitManager(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmscomprehensiveresults/importComprehensiveResult")
+    Map<String, Object> importComprehensiveResult(Map<String, Object> map);
 }
 
 

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

@@ -1160,6 +1160,7 @@
                 OR REGEXP_LIKE(RC.MATERIAL_CODE, #{prodCode}) )
             </if>
         </where>
+        order by length("text")
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">