Преглед изворни кода

修改标签导出 增加 状态过滤

2507040827 пре 5 часа
родитељ
комит
d438e1f4fe

+ 1 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/controller/AitagTagLogController.java

@@ -121,7 +121,7 @@ public class AitagTagLogController {
     @ApiOperationType("导出数据")
     @GetMapping("/exportData")
     public void exportData(TaggingTransactionReqVo transactionReqVo,HttpServletResponse response) throws IOException {
-        List<AitagTagLogEntity> aitagTagLogEntities = aitagTagLogService.queryList(transactionReqVo);
+        List<AitagTagLogEntity> aitagTagLogEntities = aitagTagLogService.queryConfirmedTagData(transactionReqVo);
         List<ExportDataVo> exportDataVos = new ArrayList<>();
         for (AitagTagLogEntity aitagTagLog:aitagTagLogEntities) {
             ExportDataVo exportDataVo = JSONObject.parseObject(JSONObject.toJSONString(aitagTagLog), ExportDataVo.class);

+ 7 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/AitagTagLogService.java

@@ -26,6 +26,12 @@ public interface AitagTagLogService extends IService<AitagTagLogEntity> {
 
     List<IconResVo> tagDistStats(TagDistStatsReqVo resultDTO);
 
-    List<AitagTagLogEntity> queryList(TaggingTransactionReqVo transactionReqVo);
+
+    /**
+     * 查询确认后的标签数据
+     * @param transactionReqVo
+     * @return 有效的标签数据
+     */
+    List<AitagTagLogEntity> queryConfirmedTagData(TaggingTransactionReqVo transactionReqVo);
 }
 

+ 15 - 8
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/impl/AitagTagLogServiceImpl.java

@@ -169,23 +169,30 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
         return aggDao.selectTagDistStats(resultVo);
     }
 
+
+    /**
+     * 查询确认后的标签数据
+     * @param transactionReqVo
+     * @return
+     */
     @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())) {
-            queryCount.eq(AitagTagLogEntity::getCategoryId, transactionReqVo.getCategoryId());
+            query.eq(AitagTagLogEntity::getCategoryId, transactionReqVo.getCategoryId());
         }
         if (StringUtils.isNotBlank(transactionReqVo.getStartTaggingTime())){
-            queryCount.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
+            query.ge(AitagTagLogEntity::getInsertTime, transactionReqVo.getStartTaggingTime());
         }
         if (StringUtils.isNotBlank(transactionReqVo.getEndTaggingTime())){
-            queryCount.le(AitagTagLogEntity::getInsertTime, transactionReqVo.getEndTaggingTime());
+            query.le(AitagTagLogEntity::getInsertTime, transactionReqVo.getEndTaggingTime());
         }
         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);
     }