2 Commity 1066d558d9 ... 9bc435b8c3

Autor SHA1 Wiadomość Data
  jiarui 9bc435b8c3 Merge remote-tracking branch 'origin/master' 1 rok temu
  jiarui 6f1b9b3b02 可视化展示-出入库、质检新增附件字段调整 1 rok temu

+ 27 - 1
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/KshzsController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
17
 
17
 
18
 import javax.annotation.Resource;
18
 import javax.annotation.Resource;
19
 import javax.validation.Valid;
19
 import javax.validation.Valid;
20
+import java.util.ArrayList;
20
 import java.util.List;
21
 import java.util.List;
21
 import java.util.Map;
22
 import java.util.Map;
22
 
23
 
@@ -116,13 +117,23 @@ public class KshzsController {
116
                        crkVo.setYwrq(crkVo.getRmsj().toString().substring(0,10));
117
                        crkVo.setYwrq(crkVo.getRmsj().toString().substring(0,10));
117
                    }
118
                    }
118
                }
119
                }
119
-
120
                 if (crkVo.getHwkId() != null) {
120
                 if (crkVo.getHwkId() != null) {
121
                     HwkDO hwkDO = hwkService.getHwk(crkVo.getHwkId());
121
                     HwkDO hwkDO = hwkService.getHwk(crkVo.getHwkId());
122
                     if (hwkDO != null && hwkDO.getHwmc() != null) {
122
                     if (hwkDO != null && hwkDO.getHwmc() != null) {
123
                         crkVo.setCfhw(hwkDO.getHwmc());
123
                         crkVo.setCfhw(hwkDO.getHwmc());
124
                     }
124
                     }
125
                 }
125
                 }
126
+                Integer num = 0;
127
+                if(crkVo.getFileIds() != null) {
128
+                    String[] ids = crkVo.getFileIds().split(",");
129
+                    List<String> list = new ArrayList<>();
130
+                    for (String id : ids) {
131
+                        num += 1;
132
+                        list.add(id);
133
+                    }
134
+                    crkVo.setFileIds(num.toString());
135
+                    crkVo.setFileList(list);
136
+                }
126
             }
137
             }
127
         }
138
         }
128
         return CommonResult.success(dataObj);
139
         return CommonResult.success(dataObj);
@@ -132,6 +143,21 @@ public class KshzsController {
132
     @Operation(summary = "质检信息")
143
     @Operation(summary = "质检信息")
133
     public CommonResult<PageResult<zjxxVo>> selectZjList(@Valid @RequestBody pageParamVo paramVo) {
144
     public CommonResult<PageResult<zjxxVo>> selectZjList(@Valid @RequestBody pageParamVo paramVo) {
134
         PageResult<zjxxVo> dataObj = kshzsService.selectZjList(paramVo);
145
         PageResult<zjxxVo> dataObj = kshzsService.selectZjList(paramVo);
146
+        if (dataObj.getList() != null || dataObj.getList().size() > 0) {
147
+            for (zjxxVo zjxxVo : dataObj.getList()){
148
+                Integer num = 0;
149
+                if(zjxxVo.getFileIds() != null) {
150
+                    String[] ids = zjxxVo.getFileIds().split(",");
151
+                    List<String> list = new ArrayList<>();
152
+                    for (String id : ids) {
153
+                        num += 1;
154
+                        list.add(id);
155
+                    }
156
+                    zjxxVo.setFileIds(num.toString());
157
+                    zjxxVo.setFileList(list);
158
+                }
159
+            }
160
+        }
135
         return CommonResult.success(dataObj);
161
         return CommonResult.success(dataObj);
136
     }
162
     }
137
 
163
 

+ 4 - 0
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/vo/crkVo.java

@@ -5,6 +5,7 @@ import lombok.Data;
5
 
5
 
6
 import java.math.BigDecimal;
6
 import java.math.BigDecimal;
7
 import java.time.LocalDateTime;
7
 import java.time.LocalDateTime;
8
+import java.util.List;
8
 
9
 
9
 /**
10
 /**
10
  * @Author: Insight
11
  * @Author: Insight
@@ -45,6 +46,9 @@ public class crkVo {
45
     @Schema(description = "附件个数")
46
     @Schema(description = "附件个数")
46
     private String fileIds;
47
     private String fileIds;
47
 
48
 
49
+    @Schema(description = "附件个数")
50
+    private List<String> fileList;
51
+
48
     @Schema(description = "出门时间")
52
     @Schema(description = "出门时间")
49
     private LocalDateTime cmsj;
53
     private LocalDateTime cmsj;
50
 
54
 

+ 4 - 0
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/vo/zjxxVo.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
4
 import lombok.Data;
4
 import lombok.Data;
5
 
5
 
6
 import java.time.LocalDate;
6
 import java.time.LocalDate;
7
+import java.util.List;
7
 
8
 
8
 /**
9
 /**
9
  * @Author: Insight
10
  * @Author: Insight
@@ -38,4 +39,7 @@ public class zjxxVo {
38
     @Schema(description = "纸质码单")
39
     @Schema(description = "纸质码单")
39
     private String fileIds;
40
     private String fileIds;
40
 
41
 
42
+    @Schema(description = "纸质码单")
43
+    private List<String> fileList;
44
+
41
 }
45
 }