|
@@ -241,7 +241,7 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public String versionRollback(VersionRollbackVo versionRollback) {
|
|
public String versionRollback(VersionRollbackVo versionRollback) {
|
|
|
LambdaQueryWrapper<AitagTagInfoVersionEntity> queryTagVersionWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<AitagTagInfoVersionEntity> queryTagVersionWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryTagVersionWrapper.eq(AitagTagInfoVersionEntity::getTagCode,versionRollback.getTagCode());
|
|
|
|
|
|
|
+ queryTagVersionWrapper.eq(AitagTagInfoVersionEntity::getPrimaryVersionId,versionRollback.getId());
|
|
|
queryTagVersionWrapper.eq(AitagTagInfoVersionEntity::getTagVersion,versionRollback.getVersion());
|
|
queryTagVersionWrapper.eq(AitagTagInfoVersionEntity::getTagVersion,versionRollback.getVersion());
|
|
|
List<AitagTagInfoVersionEntity> versionEntities = this.aitagTagInfoVersionDao.selectList(queryTagVersionWrapper);
|
|
List<AitagTagInfoVersionEntity> versionEntities = this.aitagTagInfoVersionDao.selectList(queryTagVersionWrapper);
|
|
|
if(versionEntities !=null && !versionEntities.isEmpty()){
|
|
if(versionEntities !=null && !versionEntities.isEmpty()){
|
|
@@ -253,7 +253,7 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
aitagTagInfoEntity.setReviser(SessionCommonUtil.getUserInfo());
|
|
aitagTagInfoEntity.setReviser(SessionCommonUtil.getUserInfo());
|
|
|
this.baseMapper.updateById(aitagTagInfoEntity);
|
|
this.baseMapper.updateById(aitagTagInfoEntity);
|
|
|
LambdaUpdateWrapper<AitagTagInfoVersionEntity> updateTagVersion = new LambdaUpdateWrapper<>();
|
|
LambdaUpdateWrapper<AitagTagInfoVersionEntity> updateTagVersion = new LambdaUpdateWrapper<>();
|
|
|
- updateTagVersion.eq(AitagTagInfoVersionEntity::getTagCode,versionRollback.getTagCode());
|
|
|
|
|
|
|
+ updateTagVersion.eq(AitagTagInfoVersionEntity::getPrimaryVersionId,versionRollback.getId());
|
|
|
updateTagVersion.ge(AitagTagInfoVersionEntity::getTagVersion,versionRollback.getVersion());
|
|
updateTagVersion.ge(AitagTagInfoVersionEntity::getTagVersion,versionRollback.getVersion());
|
|
|
AitagTagInfoVersionEntity aitagTagInfoVersionEntity = new AitagTagInfoVersionEntity();
|
|
AitagTagInfoVersionEntity aitagTagInfoVersionEntity = new AitagTagInfoVersionEntity();
|
|
|
aitagTagInfoVersionEntity.setReviser(SessionCommonUtil.getUserInfo());
|
|
aitagTagInfoVersionEntity.setReviser(SessionCommonUtil.getUserInfo());
|