|
|
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
17
|
17
|
|
|
18
|
18
|
import javax.annotation.Resource;
|
|
19
|
19
|
import javax.validation.Valid;
|
|
|
20
|
+import java.util.ArrayList;
|
|
20
|
21
|
import java.util.List;
|
|
21
|
22
|
import java.util.Map;
|
|
22
|
23
|
|
|
|
@@ -116,13 +117,23 @@ public class KshzsController {
|
|
116
|
117
|
crkVo.setYwrq(crkVo.getRmsj().toString().substring(0,10));
|
|
117
|
118
|
}
|
|
118
|
119
|
}
|
|
119
|
|
-
|
|
120
|
120
|
if (crkVo.getHwkId() != null) {
|
|
121
|
121
|
HwkDO hwkDO = hwkService.getHwk(crkVo.getHwkId());
|
|
122
|
122
|
if (hwkDO != null && hwkDO.getHwmc() != null) {
|
|
123
|
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
|
139
|
return CommonResult.success(dataObj);
|
|
|
@@ -132,6 +143,21 @@ public class KshzsController {
|
|
132
|
143
|
@Operation(summary = "质检信息")
|
|
133
|
144
|
public CommonResult<PageResult<zjxxVo>> selectZjList(@Valid @RequestBody pageParamVo paramVo) {
|
|
134
|
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
|
161
|
return CommonResult.success(dataObj);
|
|
136
|
162
|
}
|
|
137
|
163
|
|