From 00bf5d3bdf40a86c28a1e499e175c1c5f7877e2a Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 18 May 2022 14:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=8F=91=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=B8=88=E6=8E=A5=E5=8F=A3=EF=BC=88prehomo=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81=E9=AA=8C=E8=AF=81=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E3=80=82=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rojectTaskInventoryDetailEOController.java |  6 ++---
 .../entity/ProjectTaskInventoryDetailEO.java  |  3 +++
 .../IProjectTaskInventoryDetailEOService.java |  4 ++--
 ...ojectTaskInventoryDetailEOServiceImpl.java | 24 +++++++++++++++----
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java
index 039b5c355..81c7bb78a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java
@@ -74,14 +74,14 @@ public class ProjectTaskInventoryDetailEOController extends JeroController<Proje
 	/**
 	 *   添加
 	 *
-	 * @param projectTaskInventoryDetailEO
+	 * @param projectTaskInventoryDetailEOList
 	 * @return
 	 */
 	@AutoLog(value = "项目库-任务清单明细表-添加")
 	@ApiOperation(value="项目库-任务清单明细表-添加", notes="项目库-任务清单明细表-添加")
 	@PostMapping(value = "/add")
-	public Result<?> add(@Validated @RequestBody ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
-		projectTaskInventoryDetailEOService.add(projectTaskInventoryDetailEO);
+	public Result<?> add(@Validated @RequestBody List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList) {
+		projectTaskInventoryDetailEOService.add(projectTaskInventoryDetailEOList);
 		return Result.OK("添加成功！");
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
index 48f397ef4..d1b24903c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
@@ -116,4 +116,7 @@ public class ProjectTaskInventoryDetailEO implements Serializable {
     /**用户名*/
     @TableField(exist = false)
     private String userName;
+
+    @ApiModelProperty(value = "工程交付说明")
+    private String deliveryInstructions;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java
index f1080f661..060dba4cf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java
@@ -16,10 +16,10 @@ public interface IProjectTaskInventoryDetailEOService extends IService<ProjectTa
 	/**
 	 * 保存
 	 *
-	 * @param projectTaskInventoryDetailEO
+	 * @param projectTaskInventoryDetailEOList
 	 * @return
 	 */
-    void add(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO);
+    void add(List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList);
 
 	/**
 	 * 更新
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index bd9558389..784370f50 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -52,12 +52,28 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	/**
 	 * 保存
 	 *
-	 * @param projectTaskInventoryDetailEO
+	 * @param projectTaskInventoryDetailEOList
 	 * @return
 	 */
 	@Override
-    public void add(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
-		if(StringUtils.isNotEmpty(projectTaskInventoryDetailEO.getUserIds())){
+    public void add(List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList) {
+		if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){
+			List<String> userIdList = new ArrayList<>();
+
+			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
+				userIdList.add(projectTaskInventoryDetailEO.getUserId());
+			}
+
+			//先删后加，确保一个用户只有一个任务。
+			QueryWrapper<ProjectTaskInventoryDetailEO> deleteWrapper = new QueryWrapper<>();
+			deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEOList.get(0).getActiProcInstId());
+			deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList);
+			this.baseMapper.delete(deleteWrapper);
+
+			super.saveBatch(projectTaskInventoryDetailEOList);
+			sendMessage(projectTaskInventoryDetailEOList.get(0),userIdList);
+		}
+		/*if(StringUtils.isNotEmpty(projectTaskInventoryDetailEO.getUserIds())){
 			Date now = new Date();
 			projectTaskInventoryDetailEO.setCreateTime(now);
 			projectTaskInventoryDetailEO.setUpdateTime(now);
@@ -84,7 +100,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 
 				sendMessage(projectTaskInventoryDetailEO,userIdList);
 			}
-		}
+		}*/
     }
 
 	/**