From 12fc004e459ae874aa312f4ec2dcb1f35f673d1c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 11:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92-=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformTaskPlanningEOController.java         | 15 ++++++++++-----
 .../service/IPlatformTaskPlanningEOService.java   |  2 +-
 .../impl/PlatformTaskPlanningEOServiceImpl.java   |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
index cc130f5c9..eb2e32349 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java
@@ -1,5 +1,7 @@
 package com.jero.modules.platform.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,9 +31,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 
- /**
+/**
  * @Description: 平台件合规认证计划
  * @Author: jero-boot
  * @Date:   2023-09-14
@@ -75,8 +78,8 @@ public class PlatformTaskPlanningEOController extends JeroController<PlatformTas
 	@AutoLog(value = "平台件合规认证计划-列表查询")
     @ApiOperation(value="平台件合规认证计划-列表查询", notes="平台件合规认证计划-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<PlatformTaskPlanningEO>> queryList() {
-        List<PlatformTaskPlanningEO> list = platformTaskPlanningEOService.queryList();
+	public Result<List<PlatformTaskPlanningEO>> queryList(String projectId) {
+        List<PlatformTaskPlanningEO> list = platformTaskPlanningEOService.queryList(projectId);
         return Result.OK(list);
 	}
 
@@ -96,13 +99,15 @@ public class PlatformTaskPlanningEOController extends JeroController<PlatformTas
 	/**
 	 *   添加
 	 *
-	 * @param platformTaskPlanningEOList
+	 * @param data
 	 * @return
 	 */
 	@AutoLog(value = "平台件合规认证计划-批量添加")
 	@ApiOperation(value="平台件合规认证计划-批量添加", notes="平台件合规认证计划-批量添加")
 	@PostMapping(value = "/addBatch")
-	public Result<?> addBatch(@RequestBody List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
+	public Result<?> addBatch(@RequestBody Map<String,Object> data) {
+		JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(data.get("list")));
+		List<PlatformTaskPlanningEO> platformTaskPlanningEOList = jsonArray.toJavaList(PlatformTaskPlanningEO.class);
 		platformTaskPlanningEOService.addBatch(platformTaskPlanningEOList);
 		return Result.OK("添加成功！");
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
index 5a84716e9..4e965dc96 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java
@@ -63,5 +63,5 @@ public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPla
 	 *
 	 * @return
 	 */
-    List<PlatformTaskPlanningEO> queryList();
+    List<PlatformTaskPlanningEO> queryList(String projectId);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
index d663dadb7..652bd2bc4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java
@@ -101,8 +101,9 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskP
 	 * @return
 	 */
 	@Override
-    public List<PlatformTaskPlanningEO> queryList() {
+    public List<PlatformTaskPlanningEO> queryList(String projectId) {
 		LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PlatformTaskPlanningEO::getProjectId,projectId);
 		wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
         return list(wrapper);
     }