|
|
@@ -56,23 +56,23 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
log.info("查询出符合条件的全部打标数据:{} 条",totalCnt);
|
|
|
dataOverview.setCountNum(totalCnt);
|
|
|
|
|
|
- LambdaQueryWrapper<AitagTagLogEntity> queryCount = new LambdaQueryWrapper<>();
|
|
|
+ LambdaQueryWrapper<AitagTagLogEntity> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(taggingResult.getCategoryId())) {
|
|
|
- queryCount.eq(AitagTagLogEntity::getCategoryId, taggingResult.getCategoryId());
|
|
|
+ queryWrapper.apply("result @> '"+taggingResult.getCategoryExp()+"'");
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(taggingResult.getStartTaggingTime())){
|
|
|
- queryCount.ge(AitagTagLogEntity::getInsertTime, taggingResult.getStartTaggingTime());
|
|
|
+ queryWrapper.ge(AitagTagLogEntity::getInsertTime, taggingResult.getStartTaggingTime());
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(taggingResult.getEndTaggingTime())){
|
|
|
- queryCount.le(AitagTagLogEntity::getInsertTime, taggingResult.getEndTaggingTime());
|
|
|
+ queryWrapper.le(AitagTagLogEntity::getInsertTime, taggingResult.getEndTaggingTime());
|
|
|
}
|
|
|
- queryCount.in(AitagTagLogEntity::getState, DataDictionary.RESULT_PUSHED,DataDictionary.MANAGER_CONFIRMED);
|
|
|
- queryCount.eq(AitagTagLogEntity::getTagScope, PROD_DATA);
|
|
|
- Integer totalConfirmedCnt = this.baseMapper.selectCount(queryCount);
|
|
|
+ queryWrapper.in(AitagTagLogEntity::getState, DataDictionary.RESULT_PUSHED,DataDictionary.MANAGER_CONFIRMED);
|
|
|
+ queryWrapper.eq(AitagTagLogEntity::getTagScope, PROD_DATA);
|
|
|
+ Integer totalConfirmedCnt = this.baseMapper.selectCount(queryWrapper);
|
|
|
log.info("查询出符合条件的打标完成数据:{} 条",totalConfirmedCnt);
|
|
|
|
|
|
- queryCount.eq(AitagTagLogEntity::getFeedback,FEEDBACK_RESULT_AGREE);
|
|
|
- Integer agreeTagNum = this.baseMapper.selectCount(queryCount);
|
|
|
+ queryWrapper.eq(AitagTagLogEntity::getFeedback,FEEDBACK_RESULT_AGREE);
|
|
|
+ Integer agreeTagNum = this.baseMapper.selectCount(queryWrapper);
|
|
|
log.info("查询出符合条件的打标准确数据:{} 条",agreeTagNum);
|
|
|
dataOverview.setAccurateNum(agreeTagNum);
|
|
|
|
|
|
@@ -112,7 +112,7 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
public IPage<AitagTagLogEntity> taggingDetails(TaggingTransactionReqVo transactionReqVo) {
|
|
|
LambdaQueryWrapper<AitagTagLogEntity> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryId())) {
|
|
|
- queryWrapper.eq(AitagTagLogEntity::getCategoryId, transactionReqVo.getCategoryId());
|
|
|
+ queryWrapper.apply("result @> '"+transactionReqVo.getCategoryExp()+"'");
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
|
|
|
queryWrapper.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
|
|
|
@@ -179,7 +179,7 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
public List<AitagTagLogEntity> queryConfirmedTagData(TaggingTransactionReqVo transactionReqVo) {
|
|
|
LambdaQueryWrapper<AitagTagLogEntity> query = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryId())) {
|
|
|
- query.eq(AitagTagLogEntity::getCategoryId, transactionReqVo.getCategoryId());
|
|
|
+ query.apply("result @> '"+transactionReqVo.getCategoryExp()+"'");
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
|
|
|
query.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
|