|
|
@@ -91,14 +91,14 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
if (aitagTagInfoQueryVo.getTagRemark() != null) {
|
|
|
queryWrapper.eq(AitagTagInfoEntity::getTagRemark, aitagTagInfoQueryVo.getTagRemark());
|
|
|
}
|
|
|
- if (aitagTagInfoQueryVo.getparentId() != null) {
|
|
|
- queryWrapper.eq(AitagTagInfoEntity::getParentId, aitagTagInfoQueryVo.getparentId());
|
|
|
+ if (aitagTagInfoQueryVo.getParentId() != null) {
|
|
|
+ queryWrapper.eq(AitagTagInfoEntity::getParentId, aitagTagInfoQueryVo.getParentId());
|
|
|
}
|
|
|
if (aitagTagInfoQueryVo.getReg() != null) {
|
|
|
queryWrapper.eq(AitagTagInfoEntity::getReg, aitagTagInfoQueryVo.getReg());
|
|
|
}
|
|
|
- if (aitagTagInfoQueryVo.getLevel() != null) {
|
|
|
- queryWrapper.eq(AitagTagInfoEntity::getLevel, aitagTagInfoQueryVo.getLevel());
|
|
|
+ if (aitagTagInfoQueryVo.getTagLevel() != null) {
|
|
|
+ queryWrapper.eq(AitagTagInfoEntity::getTagLevel, aitagTagInfoQueryVo.getTagLevel());
|
|
|
}
|
|
|
if (aitagTagInfoQueryVo.getTagPath() != null) {
|
|
|
queryWrapper.eq(AitagTagInfoEntity::getTagPath, aitagTagInfoQueryVo.getTagPath());
|
|
|
@@ -130,14 +130,14 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
if(!aitagTagInfoEntities.isEmpty()){
|
|
|
AitagTagInfoEntity aitagTagInfoEntity = aitagTagInfoEntities.get(0);
|
|
|
aitagTagInfo.setTagPath(aitagTagInfoEntity.getTagPath()+"/"+aitagTagInfo.getTagNm());
|
|
|
- aitagTagInfo.setLevel(aitagTagInfoEntity.getLevel()+1);
|
|
|
+ aitagTagInfo.setTagLevel(aitagTagInfoEntity.getTagLevel()+1);
|
|
|
}else{
|
|
|
aitagTagInfo.setTagPath(aitagTagInfo.getTagNm());
|
|
|
- aitagTagInfo.setLevel(1);
|
|
|
+ aitagTagInfo.setTagLevel(1);
|
|
|
}
|
|
|
}else{
|
|
|
aitagTagInfo.setTagPath(aitagTagInfo.getTagNm());
|
|
|
- aitagTagInfo.setLevel(1);
|
|
|
+ aitagTagInfo.setTagLevel(1);
|
|
|
}
|
|
|
aitagTagInfo.setRevisionTime(DateUtils.getCurrDateTimeStr());
|
|
|
aitagTagInfo.setTagVersion("1");
|
|
|
@@ -184,7 +184,7 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
aitagTagInfoEntity.setTagVersion(Integer.parseInt(tagInfo.getTagVersion())+1+"");
|
|
|
AitagTagInfoEntity parentTagInfo = this.baseMapper.selectById(aitagTagInfoEntity.getParentId());
|
|
|
aitagTagInfoEntity.setTagPath(parentTagInfo.getTagPath()+"/"+aitagTagInfoEntity.getTagNm());
|
|
|
- aitagTagInfoEntity.setLevel(parentTagInfo.getLevel()+1);
|
|
|
+ aitagTagInfoEntity.setTagLevel(parentTagInfo.getTagLevel()+1);
|
|
|
this.baseMapper.updateById(aitagTagInfoEntity);
|
|
|
}
|
|
|
|
|
|
@@ -242,14 +242,14 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
if (aitagTagInfoQueryVo.getTagRemark() != null) {
|
|
|
queryWrapper.eq(AitagTagInfoEntity::getTagRemark, aitagTagInfoQueryVo.getTagRemark());
|
|
|
}
|
|
|
- if (aitagTagInfoQueryVo.getparentId() != null) {
|
|
|
- queryWrapper.eq(AitagTagInfoEntity::getParentId, aitagTagInfoQueryVo.getparentId());
|
|
|
+ if (aitagTagInfoQueryVo.getParentId() != null) {
|
|
|
+ queryWrapper.eq(AitagTagInfoEntity::getParentId, aitagTagInfoQueryVo.getParentId());
|
|
|
}
|
|
|
if (aitagTagInfoQueryVo.getReg() != null) {
|
|
|
queryWrapper.eq(AitagTagInfoEntity::getReg, aitagTagInfoQueryVo.getReg());
|
|
|
}
|
|
|
- if (aitagTagInfoQueryVo.getLevel() != null) {
|
|
|
- queryWrapper.eq(AitagTagInfoEntity::getLevel, aitagTagInfoQueryVo.getLevel());
|
|
|
+ if (aitagTagInfoQueryVo.getTagLevel() != null) {
|
|
|
+ queryWrapper.eq(AitagTagInfoEntity::getTagLevel, aitagTagInfoQueryVo.getTagLevel());
|
|
|
}
|
|
|
if (aitagTagInfoQueryVo.getTagPath() != null) {
|
|
|
queryWrapper.eq(AitagTagInfoEntity::getTagPath, aitagTagInfoQueryVo.getTagPath());
|
|
|
@@ -305,11 +305,12 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
AitagTagInfoEntity.class);
|
|
|
String tagPath = tagImportDto.getTagPath();
|
|
|
aitagTagInfo.setTagPath(categoryNm+"/"+tagPath);
|
|
|
- aitagTagInfo.setLevel(aitagTagInfo.getTagPath().split("/").length);
|
|
|
+ aitagTagInfo.setTagLevel(aitagTagInfo.getTagPath().split("/").length);
|
|
|
aitagTagInfo.setRevisionTime(DateUtils.getCurrDateTimeStr());
|
|
|
aitagTagInfo.setReviser(reviser);
|
|
|
aitagTagInfo.setTagVersion("1");
|
|
|
aitagTagInfo.setIsDelete(TAG_UNDELETED);
|
|
|
+ aitagTagInfo.setCategoryId(categoryId);
|
|
|
aitagTagInfo.setState(TAG_ENABLED);
|
|
|
this.save(aitagTagInfo);
|
|
|
}
|