|
@@ -169,23 +169,30 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
return aggDao.selectTagDistStats(resultVo);
|
|
return aggDao.selectTagDistStats(resultVo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 查询确认后的标签数据
|
|
|
|
|
+ * @param transactionReqVo
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
@Override
|
|
@Override
|
|
|
- public List<AitagTagLogEntity> queryList(TaggingTransactionReqVo transactionReqVo) {
|
|
|
|
|
- LambdaQueryWrapper<AitagTagLogEntity> queryCount = new LambdaQueryWrapper<>();
|
|
|
|
|
|
|
+ public List<AitagTagLogEntity> queryConfirmedTagData(TaggingTransactionReqVo transactionReqVo) {
|
|
|
|
|
+ LambdaQueryWrapper<AitagTagLogEntity> query = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryId())) {
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryId())) {
|
|
|
- queryCount.eq(AitagTagLogEntity::getCategoryId, transactionReqVo.getCategoryId());
|
|
|
|
|
|
|
+ query.eq(AitagTagLogEntity::getCategoryId, transactionReqVo.getCategoryId());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
|
|
if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
|
|
|
- queryCount.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
|
|
|
|
|
|
|
+ query.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getEndTaggingTime())){
|
|
if (StringUtils.isNotBlank(transactionReqVo.getEndTaggingTime())){
|
|
|
- queryCount.le(AitagTagLogEntity::getInsertTime, transactionReqVo.getEndTaggingTime());
|
|
|
|
|
|
|
+ query.le(AitagTagLogEntity::getInsertTime, transactionReqVo.getEndTaggingTime());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getLoanApplicationNo())){
|
|
if (StringUtils.isNotBlank(transactionReqVo.getLoanApplicationNo())){
|
|
|
- queryCount.le(AitagTagLogEntity::getBusinessAttr, transactionReqVo.getLoanApplicationNo());
|
|
|
|
|
|
|
+ query.eq(AitagTagLogEntity::getBusinessAttr, transactionReqVo.getLoanApplicationNo());
|
|
|
}
|
|
}
|
|
|
- queryCount.eq(AitagTagLogEntity::getTagScope, PROD_DATA);
|
|
|
|
|
- return this.baseMapper.selectList(queryCount);
|
|
|
|
|
|
|
+ query.in(AitagTagLogEntity::getState, DataDictionary.RESULT_PUSHED,DataDictionary.MANAGER_CONFIRMED);
|
|
|
|
|
+ query.eq(AitagTagLogEntity::getTagScope, PROD_DATA);
|
|
|
|
|
+ return this.baseMapper.selectList(query);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|