root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:数据解析结果显示

Browse Source
This commit is contained in:
zhangzq
2024-05-14 10:39:14 +08:00
parent 1e2da6f427
commit c81d454a4f
3 changed files with 87 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
View File

@@ -38,7 +38,7 @@ public class PmFormDataController {
public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
// Page<PmFormData> result = formDataService.page(page.build(), query.build());
// Object o = formDataService.queryAll(query,page);
return new ResponseEntity<>(formDataService.queryAll(query, page), HttpStatus.CREATED);
return new ResponseEntity<>(TableDataInfo.build(formDataService.page(page.build(),query.build())), HttpStatus.CREATED);
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -104,7 +104,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
throw new BadRequestException("当前业务数据为空");
}
//暂时只有两层
JSONArray mst_mapping_json = (JSONArray)mapping_json.remove(0);
JSONArray mst_mapping_json = mapping_json.size()>1?(JSONArray)mapping_json.remove(0):mapping_json.getJSONArray(0);
Map<String, JSONObject> fieldMapping = mst_mapping_json.stream().collect(HashMap::new, (formMap, o) -> {
JSONObject item = (JSONObject) o;
formMap.put(item.getString("value"), item);