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 add(@Validated @RequestBody ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) { - projectTaskInventoryDetailEOService.add(projectTaskInventoryDetailEO); + public Result add(@Validated @RequestBody List 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 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 projectTaskInventoryDetailEOList) { + if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){ + List userIdList = new ArrayList<>(); + + for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) { + userIdList.add(projectTaskInventoryDetailEO.getUserId()); + } + + //先删后加,确保一个用户只有一个任务。 + QueryWrapper 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