优化

platform-rest/src/main/java/com/platform/rest/controller/merge/LongYanPurchaseOrderMergeController.java

@@ -1,6 +1,9 @@
 package com.platform.rest.controller.merge;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.google.gson.JsonArray;
 import com.platform.common.bean.DictVO;
 import com.platform.common.cache.DictCache;
@@ -16,6 +19,7 @@ import com.platform.dao.vo.query.merge.LongYanPurchaseOrderMergeVO;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -58,11 +62,10 @@ public class LongYanPurchaseOrderMergeController {
   @SysLog("新增龙岩采购合并表")
   @PostMapping("/{title}")
 //  @PreAuthorize("@pms.hasPermission('merge-merge-add')")
-  public R save(@PathVariable String title,@RequestBody String purchaseOrderStr) {
-//      purchaseOrderStr = purchaseOrderStr.substring(1,purchaseOrderStr.length()-1);
-//      purchaseOrderStr = "\"purchaseOrderStr\":{\"id\":\"650c0197d7a14541a0aba317\",\"sbId\":null,\"type\":1,\"oldOrNew\":2,\"projectId\":null,\"positionNo\":null,\"cptcode\":\"01\",\"remark\":\"1212\",\"cdepcode\":\"10\",\"cbustype\":\"普通采购\",\"planGetDate\":\"2023-09-22\",\"needDate\":\"2023-09-22\"},{\"id\":\"65080e8ea619cc4ad48d3515\",\"sbId\":null,\"type\":1,\"oldOrNew\":1,\"projectId\":null,\"positionNo\":null,\"cptcode\":\"01\",\"remark\":\"旺旺\",\"cdepcode\":\"12\",\"cbustype\":\"普通采购\",\"planGetDate\":\"2023-09-19\",\"needDate\":\"2023-09-23\"}";
-      List<LongYanPurchaseOrder> longYanPurchaseOrders = JSONArray.parseArray(purchaseOrderStr,LongYanPurchaseOrder.class);
-      longYanPurchaseOrderMergeService.saveModelByList(title,longYanPurchaseOrders);
+  public R save(@PathVariable String title, @RequestBody String purchaseOrderStr) {
+//    List<LongYanPurchaseOrder> longYanPurchaseOrders = JSONArray.parseArray(purchaseOrderStr, LongYanPurchaseOrder.class);
+    List<LongYanPurchaseOrder> purchaseOrders = JSON.parseArray(JSON.parseObject(purchaseOrderStr).getString("purchaseOrderStr"), LongYanPurchaseOrder.class);
+      longYanPurchaseOrderMergeService.saveModelByList(title,purchaseOrders);
       return new R();
   }