liyuanyuan 2 anos atrás
pai
commit
7dac5b13b0

+ 2 - 3
zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -356,12 +356,11 @@ public class WorkOrderBaseController extends BaseController {
356 356
            List<SysAccessories> accessoriesList= sysaccessoriesService.getList(qw);
357 357
            if (accessoriesList!=null && accessoriesList.stream().count()>0)
358 358
            {
359
-               List<String> strlist=new ArrayList<>();
359
+               HashMap<String, String> fileInfo = new HashMap<String, String>();
360 360
                for (SysAccessories accessories:accessoriesList
361 361
                     ) {
362
-                   strlist.add( captchaEnabled+accessories.getFileurl())  ;
362
+                   fileInfo.put( accessories.getOriname(),captchaEnabled+accessories.getFileurl())  ;
363 363
                }
364
-            ov.setFileurl(strlist);
365 364
            }
366 365
 
367 366
         }

+ 6 - 3
zxkf-api/src/main/java/api/controller/system/SysAccessoriesController.java

@@ -1,5 +1,6 @@
1 1
 package api.controller.system;
2 2
 
3
+import api.util.helper.DateHelper;
3 4
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 5
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -49,8 +50,10 @@ public class SysAccessoriesController extends BaseController {
49 50
         StringBuilder allFileNames = new StringBuilder();
50 51
 
51 52
         //上传路径
52
-        String fileSavePath = "files";
53
+       // String fileSavePath = "files";
53 54
 
55
+
56
+        String fileSavePath = "files/order/" + DateHelper.getDate();
54 57
         //若文件夹不存在,则创建文件夹
55 58
         File pFile = new File(fileSavePath);
56 59
         if (!pFile.exists()) {
@@ -92,9 +95,9 @@ public class SysAccessoriesController extends BaseController {
92 95
         sysAccessories.setFilename(String.valueOf(newFileName));
93 96
         sysAccessories.setFiletype(file.getContentType());
94 97
         sysAccessories.setFilesize(file.getSize());
95
-        sysAccessories.setFileurl(pFile.getAbsolutePath()+"/" + newFileName);
98
+        sysAccessories.setFileurl(fileSavePath+"/" + newFileName);
96 99
         sysAccessories.setCreateuser(CurrentUser().getUserName());
97
-
100
+        sysAccessories.setOriname(file.getOriginalFilename());
98 101
             Boolean result=  sysaccessoriesService.insert(sysAccessories);
99 102
             if (result)
100 103
             {

+ 2 - 1
zxkf-entity/src/main/java/api/entity/view/order/WorkOrderBaseView.java

@@ -4,6 +4,7 @@ import api.entity.database.order.WorkOrderBase;
4 4
 import io.swagger.annotations.ApiModelProperty;
5 5
 import lombok.Data;
6 6
 
7
+import java.util.HashMap;
7 8
 import java.util.List;
8 9
 
9 10
 
@@ -31,7 +32,7 @@ public class WorkOrderBaseView extends WorkOrderBase {
31 32
 
32 33
     /** 工单类型 */
33 34
     @ApiModelProperty("文件路径")
34
-    private List<String> fileurl;
35
+    private HashMap<String,String> fileurl;
35 36
 
36 37
 
37 38
 }