From ddacfb236cc17c6a63cde191f1ff3d2a46ee4069 Mon Sep 17 00:00:00 2001 From: zhangran Date: Fri, 21 Mar 2025 11:55:28 +0800 Subject: [PATCH] =?UTF-8?q?add(feature/REQ-3714)=20=E5=88=A4=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E5=B7=A5=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...orkerProfessionSkillTagRepositoryImpl.java | 19 ++++++++++-------- .../WorkerProfessionTagRepositoryImpl.java | 20 +++++++++++-------- .../impl/DeletePlatTeamWorkerProcessor.java | 5 ++++- ...OrgWorkerHistoryFoundationServiceImpl.java | 4 ++++ 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionSkillTagRepositoryImpl.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionSkillTagRepositoryImpl.java index 4f1ff6d..955fcbc 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionSkillTagRepositoryImpl.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionSkillTagRepositoryImpl.java @@ -17,8 +17,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; +import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * @author zhanghongbo @@ -60,12 +60,15 @@ public class WorkerProfessionSkillTagRepositoryImpl implements WorkerProfessionS return; } - List delete = ids.stream().map(id -> { - WorkerProfessionSkillTag workerProfessionSkillTag = new WorkerProfessionSkillTag(); - workerProfessionSkillTag.setId(id); - workerProfessionSkillTag.setIsDelete(id); - return workerProfessionSkillTag; - }).collect(Collectors.toList()); - workerProfessionSkillTagDao.updateBatchById(delete); + List skillTags = workerProfessionSkillTagDao.listByIds(ids); + if (CollUtil.isEmpty(skillTags)) { + return ; + } + Date date = new Date(); + skillTags.forEach(skillTag -> { + skillTag.setIsDelete(skillTag.getId()); + skillTag.setUpdateAt(date); + }); + workerProfessionSkillTagDao.updateBatchById(skillTags); } } diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionTagRepositoryImpl.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionTagRepositoryImpl.java index e4fc239..56cba0c 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionTagRepositoryImpl.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/workerprofession/repository/impl/WorkerProfessionTagRepositoryImpl.java @@ -16,8 +16,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; +import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * @author zhanghongbo @@ -58,12 +58,16 @@ public class WorkerProfessionTagRepositoryImpl implements WorkerProfessionTagRep if (CollUtil.isEmpty(ids)) { return ; } - List delete = ids.stream().map(id -> { - WorkerProfessionTag workerProfessionTag = new WorkerProfessionTag(); - workerProfessionTag.setId(id); - workerProfessionTag.setIsDelete(id); - return workerProfessionTag; - }).collect(Collectors.toList()); - workerProfessionTagDao.updateBatchById(delete); + List workerProfessionTags = workerProfessionTagDao.listByIds(ids); + if (CollUtil.isEmpty(workerProfessionTags)) { + return ; + } + + Date date = new Date(); + workerProfessionTags.forEach(workerProfessionTag -> { + workerProfessionTag.setIsDelete(workerProfessionTag.getId()); + workerProfessionTag.setUpdateAt(date); + }); + workerProfessionTagDao.updateBatchById(workerProfessionTags); } } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java index 6f39e87..17b1389 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java @@ -161,7 +161,7 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor { nodeUserFoundationService.delete(nodeUserDelete); // 删除平台工人工种和技能标签 DeleteWorkerProfession workerProfession = DeleteWorkerProfession.builder() - .scene(TeamSceneEnum.PROJECT_TEAM.name()) + .scene(TeamSceneEnum.PLAT_TEAM.name()) .personIds(param.getPersonIds()) .isResign(Boolean.TRUE) .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.setIncludeDeleted(Boolean.FALSE); List workerInvites = projectWorkerInviteRepository.list(queryBo); + if (CollUtil.isEmpty(workerInvites)) { + return ; + } List inviteIds = workerInvites.stream().map(ProjectWorkerInviteRepository.ProjectWorkerInviteResp::getId).collect(Collectors.toList()); List processInstanceIds = workerInvites.stream().map(ProjectWorkerInviteRepository.ProjectWorkerInviteResp::getProcessInstanceId).filter(StringUtils::hasText).collect(Collectors.toList()); diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/foundation/impl/OrgWorkerHistoryFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/foundation/impl/OrgWorkerHistoryFoundationServiceImpl.java index 1a9bde2..1c35f13 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/foundation/impl/OrgWorkerHistoryFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/foundation/impl/OrgWorkerHistoryFoundationServiceImpl.java @@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -110,12 +111,15 @@ public class OrgWorkerHistoryFoundationServiceImpl implements OrgWorkerHistoryFo .jsonStrData(professionSkillTags) .build()); } + Date date = new Date(); return WorkerProfessionHistory.builder() .personId(first.getPersonId()) .orgNodeId(first.getOrgNodeId()) .workspaceId(first.getWorkspaceId()) .bizData(first.getBizData()) .jsonContent(JSON.toJSONString(historyDataList)) + .createAt(date) + .updateAt(date) .build(); } }