From b494a93711ddf54fda772990b6c269958b64584e Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sat, 27 Apr 2024 15:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xz/controller/XzMaterialController.java      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
index 467ffda41..c3adb2822 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
@@ -127,27 +127,25 @@ public class XzMaterialController {
     /**
      * 添加
      *
-     * @param map
      * @return
      */
     @OperLog(operModul = "材料批次信息管理", operType = "新增", operDesc = "添加材料批次信息信息")
     @ApiOperation(value = " 添加材料批次信息信息", notes = "添加材料批次信息信息", httpMethod = "POST")
     @PostMapping(value = "/save")
-    public Result<Object> save(@RequestBody String map) {
-        JSONObject obj = JSONObject.parseObject(map);
+    public Result<Object> save(@RequestBody JSONObject obj) {
         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<>();
         xzMaterial.setName(obj.getString("name"));
         xzMaterial.setEntryTime(obj.getDate("entryTime"));
         JSONArray detail = obj.getJSONArray("detail");
-        for (Object d : detail) {
+        for (int i = 0; i < detail.size(); i++) {
             JSONObject detailObj = new JSONObject();
-            JSONObject j = JSONObject.parseObject(d.toString());
-            int i = 0;
+            JSONObject j = detail.getJSONObject(i);
+            int k = 0;
             for (String s : j.keySet()) {
-                detailObj.put(param[i], j.get(s));
-                i++;
+                detailObj.put(param[k], j.get(s));
+                k++;
             }
             detailObj.put("projectSn", obj.getString("projectSn"));
             list.add(JSONObject.parseObject(JSON.toJSONString(detailObj), XzMaterialDetail.class));