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

add(feature/REQ-3714) 优化update,减少历史工种重复保存

Browse Source
This commit is contained in:
zhangran 2025-03-21 14:29:39 +08:00
parent ddacfb236c
commit 2bf1462388
6 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/MybatisPlusConfig.java
View File

@ -3,17 +3,21 @@ package cn.axzo.orgmanax.infra.config;
import cn.axzo.foundation.dao.support.mysql.plugins.LimitInterceptor;
import cn.axzo.foundation.enums.AppEnvEnum;
import cn.axzo.foundation.web.support.AppRuntime;
import cn.axzo.foundation.web.support.conditional.LocalCondition;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.logging.stdout.StdOutImpl;
import org.apache.ibatis.reflection.MetaObject;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Primary;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import java.util.Date;
@Slf4j
@EnableTransactionManagement
@MapperScan("cn.axzo.orgmanax.**.mapper")
@ -50,4 +54,29 @@ public class MybatisPlusConfig {
}
};
}
@Bean
@Primary
public EntityMetaObjectHandler entityMetaObjectHandler() {
return new EntityMetaObjectHandler();
}
public static class EntityMetaObjectHandler implements MetaObjectHandler {
public EntityMetaObjectHandler() {
}
@Override
public void insertFill(MetaObject metaObject) {
this.fillStrategy(metaObject, "createAt", new Date());
this.fillStrategy(metaObject, "updateAt", new Date());
}
@Override
public void updateFill(MetaObject metaObject) {
this.setFieldValByName("updateAt", new Date(), metaObject);
}
}
}

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

@ -59,16 +59,9 @@ public class WorkerProfessionSkillTagRepositoryImpl implements WorkerProfessionS
if (CollUtil.isEmpty(ids)) {
return;
}
List<WorkerProfessionSkillTag> 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);
workerProfessionSkillTagDao.lambdaUpdate()
.in(WorkerProfessionSkillTag::getId, ids)
.setSql(" is_delete = id")
.update();
}
}

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

@ -49,25 +49,19 @@ public class WorkerProfessionTagRepositoryImpl implements WorkerProfessionTagRep
}
@Override
public void removeByIds(List<Long> ids){
public void removeByIds(List<Long> ids) {
workerProfessionTagDao.removeByIds(ids);
}
@Override
public void deleteByIds(List<Long> ids){
public void deleteByIds(List<Long> ids) {
if (CollUtil.isEmpty(ids)) {
return ;
}
List<WorkerProfessionTag> workerProfessionTags = workerProfessionTagDao.listByIds(ids);
if (CollUtil.isEmpty(workerProfessionTags)) {
return ;
return;
}
Date date = new Date();
workerProfessionTags.forEach(workerProfessionTag -> {
workerProfessionTag.setIsDelete(workerProfessionTag.getId());
workerProfessionTag.setUpdateAt(date);
});
workerProfessionTagDao.updateBatchById(workerProfessionTags);
workerProfessionTagDao.lambdaUpdate()
.in(WorkerProfessionTag::getId, ids)
.setSql(" is_delete = id")
.update();
}
}

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

@ -162,7 +162,7 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor {
// 删除平台工人工种和技能标签
DeleteWorkerProfession workerProfession = DeleteWorkerProfession.builder()
.scene(TeamSceneEnum.PLAT_TEAM.name())
.personIds(param.getPersonIds())
.personIds(Sets.newHashSet(deleteTeamWorkerPersonIds))
.isResign(Boolean.TRUE)
.orgNodeId(nodeId)
.build();

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/workerprofession/foundation/impl/OrgProjectWorkerProfessionFoundationServiceImpl.java
View File

@ -60,7 +60,7 @@ public class OrgProjectWorkerProfessionFoundationServiceImpl implements OrgProje
return;
}
// 记录工人当前的工种&技能标签历史
historyFoundationService.recordHistory(req);
// historyFoundationService.recordHistory(req);
// 删除技能标签
absoluteRemoveSkillTags(req);
// 删除工种

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

@ -111,15 +111,12 @@ 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();
}
}