'提交'

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

@@ -372,7 +372,7 @@ public class SystemFileController extends BaseRESTfulController {
                 //}
             }
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
-            String filePath = simpleDateFormat.format(new Date()) + "/" + fileType;
+            String filePath = "/" + fileType  + simpleDateFormat.format(new Date());
             boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
             inputStream.close();
             if (result) {

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

@@ -229,8 +229,13 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiOperation("根据物料编码获取物料信息")
     @PostMapping("/getMaterial")
-    public RESTfulResult getMaterial(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getMaterial(@RequestBody Map<String,Object>
+                                                 map, Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> material = universalMapper.getMaterial(map);
-        return success(material);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, material);
+        return success(pageList);
     }
 }

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

@@ -0,0 +1,8 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CommonMapper {
+
+}