From 82455f37fae3b361f54a074684587bc600fb5dff Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 16:49:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E8=A1=A8-?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsOpinionAssessmentResultEOController.java  |  7 +++++--
 .../ILawsOpinionAssessmentResultEOService.java    |  5 +++--
 .../LawsOpinionAssessmentResultEOServiceImpl.java | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
index 6d5c5cc27..a47f57b8f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
@@ -1,9 +1,12 @@
 package com.jero.modules.lawsOpinionGather.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
@@ -170,8 +173,8 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
 	 @AutoLog(value = "法规意见收集-评估结果表-添加")
 	 @ApiOperation(value="法规意见收集-评估结果表-添加", notes="法规意见收集-评估结果表-添加")
 	 @PostMapping(value = "/insertBatch")
-	 public Result<?> insertBatch(@Validated @RequestBody List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
-		 this.lawsOpinionAssessmentResultEOService.insertBatch(lawsOpinionAssessmentResultEOList);
+	 public Result<?> insertBatch(@RequestBody JSONObject json) {
+		 this.lawsOpinionAssessmentResultEOService.insertBatch(json);
 		 return Result.OK("添加成功！");
 	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
index cb35be57d..f5f7a15c2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
@@ -1,5 +1,6 @@
 package com.jero.modules.lawsOpinionGather.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -63,7 +64,7 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
 
 	/**
 	 * 批量新增
-	 * @param lawsOpinionAssessmentResultEOList
+	 * @param json
 	 */
-    void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList);
+    void insertBatch(JSONObject json);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
index f4d361405..b2ca31154 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
@@ -1,5 +1,7 @@
 package com.jero.modules.lawsOpinionGather.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
@@ -9,6 +11,8 @@ import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEO
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -97,7 +101,16 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
     }
 
 	@Override
-	public void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
+	public void insertBatch(JSONObject json) {
+		List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList = new ArrayList<>();
+		JSONArray dataList = json.getJSONArray("dataList");
+		LawsOpinionAssessmentResultEO lawsOpinionAssessmentResult = null;
+
+		for (Object data : dataList) {
+			lawsOpinionAssessmentResult = JSONObject.parseObject(JSONObject.toJSONString(data),LawsOpinionAssessmentResultEO.class);
+			lawsOpinionAssessmentResultEOList.add(lawsOpinionAssessmentResult);
+		}
+
 		if (CollectionUtils.isNotEmpty(lawsOpinionAssessmentResultEOList)) {
 			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();