修改分发工程师接口(prehomo、设计、验证流程。)

This commit is contained in:
wangzhijiang
2022-05-18 14:17:36 +08:00
parent 52bebbbc0a
commit 00bf5d3bdf
4 changed files with 28 additions and 9 deletions
@@ -74,14 +74,14 @@ public class ProjectTaskInventoryDetailEOController extends JeroController<Proje
/** /**
* 添加 * 添加
* *
* @param projectTaskInventoryDetailEO * @param projectTaskInventoryDetailEOList
* @return * @return
*/ */
@AutoLog(value = "项目库-任务清单明细表-添加") @AutoLog(value = "项目库-任务清单明细表-添加")
@ApiOperation(value="项目库-任务清单明细表-添加", notes="项目库-任务清单明细表-添加") @ApiOperation(value="项目库-任务清单明细表-添加", notes="项目库-任务清单明细表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) { public Result<?> add(@Validated @RequestBody List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList) {
projectTaskInventoryDetailEOService.add(projectTaskInventoryDetailEO); projectTaskInventoryDetailEOService.add(projectTaskInventoryDetailEOList);
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
@@ -116,4 +116,7 @@ public class ProjectTaskInventoryDetailEO implements Serializable {
/**用户名*/ /**用户名*/
@TableField(exist = false) @TableField(exist = false)
private String userName; private String userName;
@ApiModelProperty(value = "工程交付说明")
private String deliveryInstructions;
} }
@@ -16,10 +16,10 @@ public interface IProjectTaskInventoryDetailEOService extends IService<ProjectTa
/** /**
* 保存 * 保存
* *
* @param projectTaskInventoryDetailEO * @param projectTaskInventoryDetailEOList
* @return * @return
*/ */
void add(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO); void add(List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList);
/** /**
* 更新 * 更新
@@ -52,12 +52,28 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
/** /**
* 保存 * 保存
* *
* @param projectTaskInventoryDetailEO * @param projectTaskInventoryDetailEOList
* @return * @return
*/ */
@Override @Override
public void add(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) { public void add(List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList) {
if(StringUtils.isNotEmpty(projectTaskInventoryDetailEO.getUserIds())){ 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(); Date now = new Date();
projectTaskInventoryDetailEO.setCreateTime(now); projectTaskInventoryDetailEO.setCreateTime(now);
projectTaskInventoryDetailEO.setUpdateTime(now); projectTaskInventoryDetailEO.setUpdateTime(now);
@@ -84,7 +100,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
sendMessage(projectTaskInventoryDetailEO,userIdList); sendMessage(projectTaskInventoryDetailEO,userIdList);
} }
} }*/
} }
/** /**