循环依赖

develop-QA
qinyulong 3 months ago
parent 2c5abbd60a
commit 6dce523566
  1. 22
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java
  2. 22
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java

@ -12,6 +12,7 @@ import org.springblade.desk.jobTransfer.mapper.CultivateDetailMapper;
import org.springblade.desk.jobTransfer.service.ICultivateDetailService; import org.springblade.desk.jobTransfer.service.ICultivateDetailService;
import org.springblade.desk.jobTransfer.service.IPostHandleService; import org.springblade.desk.jobTransfer.service.IPostHandleService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -32,9 +33,14 @@ import java.util.stream.Collectors;
@Service @Service
public class CultivateDetailServiceImpl extends BaseServiceImpl<CultivateDetailMapper, CultivateDetailEntity> implements ICultivateDetailService { public class CultivateDetailServiceImpl extends BaseServiceImpl<CultivateDetailMapper, CultivateDetailEntity> implements ICultivateDetailService {
@Resource
private IPostHandleService postHandleService; private IPostHandleService postHandleService;
@Resource
@Lazy
public void setPostHandleService(IPostHandleService postHandleService) {
this.postHandleService = postHandleService;
}
@Override @Override
public IPage<CultivateDetailVO> selectCultivateDetailPage(IPage<CultivateDetailVO> page, CultivateDetailQuery cultivateDetailQuery) { public IPage<CultivateDetailVO> selectCultivateDetailPage(IPage<CultivateDetailVO> page, CultivateDetailQuery cultivateDetailQuery) {
return page.setRecords(baseMapper.selectCultivateDetailPage(page, cultivateDetailQuery)); return page.setRecords(baseMapper.selectCultivateDetailPage(page, cultivateDetailQuery));
@ -60,19 +66,25 @@ public class CultivateDetailServiceImpl extends BaseServiceImpl<CultivateDetailM
} }
//2.批量修改人员岗位表数据 //2.批量修改人员岗位表数据
Set<Long> phIds = cultivateDetails.stream().map(CultivateDetailEntity::getPhId).collect(Collectors.toSet()); Set<Long> phIds = cultivateDetails.stream().map(CultivateDetailEntity::getPhId).collect(Collectors.toSet());
boolean updateSuccess = postHandleService.lambdaUpdate() boolean update1 = postHandleService.lambdaUpdate()
.in(PostHandleEntity::getId, phIds) .in(PostHandleEntity::getId, phIds)
// 根据不同的原始状态设置不同的目标状态
.eq(PostHandleEntity::getPhStatus, PostHandleStatusEnum.JOB_TRANSFER.getCode()) .eq(PostHandleEntity::getPhStatus, PostHandleStatusEnum.JOB_TRANSFER.getCode())
.set(PostHandleEntity::getPhStatus, PostHandleStatusEnum.JOB_TRANSFER_TRAINED.getCode()) .set(PostHandleEntity::getPhStatus, PostHandleStatusEnum.JOB_TRANSFER_TRAINED.getCode())
.set(PostHandleEntity::getUpdateTime, new Date())
.update();
boolean update2 = postHandleService.lambdaUpdate()
.in(PostHandleEntity::getId, phIds)
.eq(PostHandleEntity::getPhStatus, PostHandleStatusEnum.LAID_OFF.getCode()) .eq(PostHandleEntity::getPhStatus, PostHandleStatusEnum.LAID_OFF.getCode())
.set(PostHandleEntity::getPhStatus, PostHandleStatusEnum.LAID_OFF_TRAINED.getCode()) .set(PostHandleEntity::getPhStatus, PostHandleStatusEnum.LAID_OFF_TRAINED.getCode())
.set(PostHandleEntity::getUpdateTime, new Date())
.update();
boolean update3 = postHandleService.lambdaUpdate()
.in(PostHandleEntity::getId, phIds)
.eq(PostHandleEntity::getPhStatus, PostHandleStatusEnum.IN_PRACTICE.getCode()) .eq(PostHandleEntity::getPhStatus, PostHandleStatusEnum.IN_PRACTICE.getCode())
.set(PostHandleEntity::getPhStatus, PostHandleStatusEnum.IN_PRACTICE_TRAINED.getCode()) .set(PostHandleEntity::getPhStatus, PostHandleStatusEnum.IN_PRACTICE_TRAINED.getCode())
// 统一设置更新时间
.set(PostHandleEntity::getUpdateTime, new Date()) .set(PostHandleEntity::getUpdateTime, new Date())
.update(); .update();
return R.status(updateSuccess); return R.status(saved);
} }
@Override @Override

@ -41,14 +41,24 @@ import java.util.stream.Collectors;
@Service @Service
public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, PostHandleEntity> implements IPostHandleService { public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, PostHandleEntity> implements IPostHandleService {
@Resource
private ICultivateDetailService iCultivateDetailService; private ICultivateDetailService iCultivateDetailService;
private ICertificateMaintenanceService certificateMaintenanceService;
private IEquipmentMaintenanceService equipmentMaintenanceService;
@Resource @Resource
private ICertificateMaintenanceService certificateMaintenanceService; public void setICultivateDetailService(ICultivateDetailService iCultivateDetailService) {
this.iCultivateDetailService = iCultivateDetailService;
}
@Resource @Resource
private IEquipmentMaintenanceService equipmentMaintenanceService; public void setCertificateMaintenanceService(ICertificateMaintenanceService certificateMaintenanceService) {
this.certificateMaintenanceService = certificateMaintenanceService;
}
@Resource
public void setEquipmentMaintenanceService(IEquipmentMaintenanceService equipmentMaintenanceService) {
this.equipmentMaintenanceService = equipmentMaintenanceService;
}
@Override @Override
public IPage<PostHandleVO> selectPostHandlePage(IPage<PostHandleVO> page, PostHandleQuery postHandleQuery) { public IPage<PostHandleVO> selectPostHandlePage(IPage<PostHandleVO> page, PostHandleQuery postHandleQuery) {
@ -271,11 +281,7 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
.eq(EquipmentMaintenanceEntity::getPhId, postHandleEntity.getId()) .eq(EquipmentMaintenanceEntity::getPhId, postHandleEntity.getId())
.set(EquipmentMaintenanceEntity::getMaintenanceStatus, MaintenanceStatusEnum.DEPART.getCode().shortValue()) .set(EquipmentMaintenanceEntity::getMaintenanceStatus, MaintenanceStatusEnum.DEPART.getCode().shortValue())
.update(); .update();
if (updateP && updateC && updateE) { return R.status(updateP);
return R.status(updateE);
} else {
return R.fail("操作失败");
}
} }
/** /**

Loading…
Cancel
Save