Commit b09ec1fe by 丁伟峰

代码逻辑完善

1 parent 259d35fe
......@@ -128,7 +128,9 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
.setClusterId(groupEntity.getClusterId())
.setTeamName(req.getTeamName())
.setTeamType(TEAMTYPE_PEA)
.setWarehouseId(req.getWarehouseId());
.setWarehouseId(req.getWarehouseId())
.setCreateTime(LocalDateTime.now())
.setUpdateTime(LocalDateTime.now());
if (req.getWorkdays() != null) {
teamEntity.setWorkdays(String.join(",", req.getWorkdays()));
}
......@@ -160,13 +162,19 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
if (other != null && !other.getTeamId().equals(req.getTeamId())) {
return Result.failed("相同名称的其他工作队已经存在");
}
entity.setTeamName(req.getTeamName())
.setWarehouseId(req.getWarehouseId())
.setWorkdays(String.join(",", req.getWorkdays()));
if (req.getTeamName() != null) {
entity.setTeamName(req.getTeamName());
}
if (req.getWorkdays() != null) {
entity.setWorkdays(String.join(",", req.getWorkdays()));
}
if (req.getWarehouseId() != null) {
entity.setWarehouseId(req.getWarehouseId());
}
orgTeamDao.save(entity);
// 技术员列表
if (req.getEngineerCodes().size() > 0) {
if (req.getEngineerCodes() != null && req.getEngineerCodes().size() > 0) {
updateTeamEngineers(req.getTeamId(), req.getEngineerCodes());
}
return Result.success(null);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!