wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add(feature/REQ-3714) 判空，删除工种

Browse Source
This commit is contained in:
zhangran 2025-03-21 11:55:28 +08:00
parent bb233e3c0d
commit ddacfb236c
4 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionSkillTagRepositoryImpl.java
View File

@ -17,8 +17,8 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* @author zhanghongbo * @author zhanghongbo
@ -60,12 +60,15 @@ public class WorkerProfessionSkillTagRepositoryImpl implements WorkerProfessionS
return; return;
} }
List<WorkerProfessionSkillTag> delete = ids.stream().map(id -> { List<WorkerProfessionSkillTag> skillTags = workerProfessionSkillTagDao.listByIds(ids);
WorkerProfessionSkillTag workerProfessionSkillTag = new WorkerProfessionSkillTag(); if (CollUtil.isEmpty(skillTags)) {
workerProfessionSkillTag.setId(id); return ;
workerProfessionSkillTag.setIsDelete(id); }
return workerProfessionSkillTag; Date date = new Date();
}).collect(Collectors.toList()); skillTags.forEach(skillTag -> {
workerProfessionSkillTagDao.updateBatchById(delete); skillTag.setIsDelete(skillTag.getId());
skillTag.setUpdateAt(date);
});
workerProfessionSkillTagDao.updateBatchById(skillTags);
} }
} }

20
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionTagRepositoryImpl.java
View File

@ -16,8 +16,8 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* @author zhanghongbo * @author zhanghongbo
@ -58,12 +58,16 @@ public class WorkerProfessionTagRepositoryImpl implements WorkerProfessionTagRep
if (CollUtil.isEmpty(ids)) { if (CollUtil.isEmpty(ids)) {
return ; return ;
} }
List<WorkerProfessionTag> delete = ids.stream().map(id -> { List<WorkerProfessionTag> workerProfessionTags = workerProfessionTagDao.listByIds(ids);
WorkerProfessionTag workerProfessionTag = new WorkerProfessionTag(); if (CollUtil.isEmpty(workerProfessionTags)) {
workerProfessionTag.setId(id); return ;
workerProfessionTag.setIsDelete(id); }
return workerProfessionTag;
}).collect(Collectors.toList()); Date date = new Date();
workerProfessionTagDao.updateBatchById(delete); workerProfessionTags.forEach(workerProfessionTag -> {
workerProfessionTag.setIsDelete(workerProfessionTag.getId());
workerProfessionTag.setUpdateAt(date);
});
workerProfessionTagDao.updateBatchById(workerProfessionTags);
} }
} }

5
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java
View File

@ -161,7 +161,7 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor {
nodeUserFoundationService.delete(nodeUserDelete); nodeUserFoundationService.delete(nodeUserDelete);
// 删除平台工人工种和技能标签 // 删除平台工人工种和技能标签
DeleteWorkerProfession workerProfession = DeleteWorkerProfession.builder() DeleteWorkerProfession workerProfession = DeleteWorkerProfession.builder()
.scene(TeamSceneEnum.PROJECT_TEAM.name()) .scene(TeamSceneEnum.PLAT_TEAM.name())
.personIds(param.getPersonIds()) .personIds(param.getPersonIds())
.isResign(Boolean.TRUE) .isResign(Boolean.TRUE)
.orgNodeId(nodeId) .orgNodeId(nodeId)
@ -212,6 +212,9 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor {
queryBo.setStatusList(Arrays.asList(WorkerInviteStatusEnum.WAIT_LEADER_APPROVE.getValue(), WorkerInviteStatusEnum.WAIT_LABOUR_APPROVE.getValue())); queryBo.setStatusList(Arrays.asList(WorkerInviteStatusEnum.WAIT_LEADER_APPROVE.getValue(), WorkerInviteStatusEnum.WAIT_LABOUR_APPROVE.getValue()));
queryBo.setIncludeDeleted(Boolean.FALSE); queryBo.setIncludeDeleted(Boolean.FALSE);
List<ProjectWorkerInviteRepository.ProjectWorkerInviteResp> workerInvites = projectWorkerInviteRepository.list(queryBo); List<ProjectWorkerInviteRepository.ProjectWorkerInviteResp> workerInvites = projectWorkerInviteRepository.list(queryBo);
if (CollUtil.isEmpty(workerInvites)) {
return ;
}
List<Long> inviteIds = workerInvites.stream().map(ProjectWorkerInviteRepository.ProjectWorkerInviteResp::getId).collect(Collectors.toList()); List<Long> inviteIds = workerInvites.stream().map(ProjectWorkerInviteRepository.ProjectWorkerInviteResp::getId).collect(Collectors.toList());
List<String> processInstanceIds = workerInvites.stream().map(ProjectWorkerInviteRepository.ProjectWorkerInviteResp::getProcessInstanceId).filter(StringUtils::hasText).collect(Collectors.toList()); List<String> processInstanceIds = workerInvites.stream().map(ProjectWorkerInviteRepository.ProjectWorkerInviteResp::getProcessInstanceId).filter(StringUtils::hasText).collect(Collectors.toList());

4
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/foundation/impl/OrgWorkerHistoryFoundationServiceImpl.java
View File

@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -110,12 +111,15 @@ public class OrgWorkerHistoryFoundationServiceImpl implements OrgWorkerHistoryFo
.jsonStrData(professionSkillTags) .jsonStrData(professionSkillTags)
.build()); .build());
} }
Date date = new Date();
return WorkerProfessionHistory.builder() return WorkerProfessionHistory.builder()
.personId(first.getPersonId()) .personId(first.getPersonId())
.orgNodeId(first.getOrgNodeId()) .orgNodeId(first.getOrgNodeId())
.workspaceId(first.getWorkspaceId()) .workspaceId(first.getWorkspaceId())
.bizData(first.getBizData()) .bizData(first.getBizData())
.jsonContent(JSON.toJSONString(historyDataList)) .jsonContent(JSON.toJSONString(historyDataList))
.createAt(date)
.updateAt(date)
.build(); .build();
} }
} }