|
@@ -58,7 +58,7 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
|
|
|
|
|
LambdaQueryWrapper<AitagTagLogEntity> queryCount = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<AitagTagLogEntity> queryCount = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(taggingResult.getCategoryCode())) {
|
|
if (StringUtils.isNotBlank(taggingResult.getCategoryCode())) {
|
|
|
- queryCount.eq(AitagTagLogEntity::getCategoryCode, taggingResult.getCategoryCode());
|
|
|
|
|
|
|
+ queryCount.eq(AitagTagLogEntity::getCategoryId, taggingResult.getCategoryCode());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(taggingResult.getStartTaggingTime())){
|
|
if (StringUtils.isNotBlank(taggingResult.getStartTaggingTime())){
|
|
|
queryCount.ge(AitagTagLogEntity::getInsertTime, taggingResult.getStartTaggingTime());
|
|
queryCount.ge(AitagTagLogEntity::getInsertTime, taggingResult.getStartTaggingTime());
|
|
@@ -111,7 +111,7 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
public IPage<AitagTagLogEntity> taggingDetails(TaggingTransactionReqVo transactionReqVo) {
|
|
public IPage<AitagTagLogEntity> taggingDetails(TaggingTransactionReqVo transactionReqVo) {
|
|
|
LambdaQueryWrapper<AitagTagLogEntity> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<AitagTagLogEntity> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryCode())) {
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryCode())) {
|
|
|
- queryWrapper.eq(AitagTagLogEntity::getCategoryCode, transactionReqVo.getCategoryCode());
|
|
|
|
|
|
|
+ queryWrapper.eq(AitagTagLogEntity::getCategoryId, transactionReqVo.getCategoryCode());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
|
|
if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
|
|
|
queryWrapper.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
|
|
queryWrapper.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
|
|
@@ -172,7 +172,7 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
public List<AitagTagLogEntity> queryList(TaggingTransactionReqVo transactionReqVo) {
|
|
public List<AitagTagLogEntity> queryList(TaggingTransactionReqVo transactionReqVo) {
|
|
|
LambdaQueryWrapper<AitagTagLogEntity> queryCount = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<AitagTagLogEntity> queryCount = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryCode())) {
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryCode())) {
|
|
|
- queryCount.eq(AitagTagLogEntity::getCategoryCode, transactionReqVo.getCategoryCode());
|
|
|
|
|
|
|
+ queryCount.eq(AitagTagLogEntity::getCategoryId, transactionReqVo.getCategoryCode());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
|
|
if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
|
|
|
queryCount.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
|
|
queryCount.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
|