材料优化

This commit is contained in:
pengjie 2024-04-27 15:11:55 +08:00
parent 86724b9c0c
commit b494a93711

View File

@ -127,27 +127,25 @@ public class XzMaterialController {
/** /**
* 添加 * 添加
* *
* @param map
* @return * @return
*/ */
@OperLog(operModul = "材料批次信息管理", operType = "新增", operDesc = "添加材料批次信息信息") @OperLog(operModul = "材料批次信息管理", operType = "新增", operDesc = "添加材料批次信息信息")
@ApiOperation(value = " 添加材料批次信息信息", notes = "添加材料批次信息信息", httpMethod = "POST") @ApiOperation(value = " 添加材料批次信息信息", notes = "添加材料批次信息信息", httpMethod = "POST")
@PostMapping(value = "/save") @PostMapping(value = "/save")
public Result<Object> save(@RequestBody String map) { public Result<Object> save(@RequestBody JSONObject obj) {
JSONObject obj = JSONObject.parseObject(map);
XzMaterial xzMaterial = new XzMaterial(); XzMaterial xzMaterial = new XzMaterial();
String [] param = {"name", "specifications", "num", "remark", "model", "unit"}; String [] param = {"name", "model", "specifications", "unit", "num", "remark"};
List<XzMaterialDetail> list = new ArrayList<>(); List<XzMaterialDetail> list = new ArrayList<>();
xzMaterial.setName(obj.getString("name")); xzMaterial.setName(obj.getString("name"));
xzMaterial.setEntryTime(obj.getDate("entryTime")); xzMaterial.setEntryTime(obj.getDate("entryTime"));
JSONArray detail = obj.getJSONArray("detail"); JSONArray detail = obj.getJSONArray("detail");
for (Object d : detail) { for (int i = 0; i < detail.size(); i++) {
JSONObject detailObj = new JSONObject(); JSONObject detailObj = new JSONObject();
JSONObject j = JSONObject.parseObject(d.toString()); JSONObject j = detail.getJSONObject(i);
int i = 0; int k = 0;
for (String s : j.keySet()) { for (String s : j.keySet()) {
detailObj.put(param[i], j.get(s)); detailObj.put(param[k], j.get(s));
i++; k++;
} }
detailObj.put("projectSn", obj.getString("projectSn")); detailObj.put("projectSn", obj.getString("projectSn"));
list.add(JSONObject.parseObject(JSON.toJSONString(detailObj), XzMaterialDetail.class)); list.add(JSONObject.parseObject(JSON.toJSONString(detailObj), XzMaterialDetail.class));