电渠报备数量接口

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/GdReportEnum.java

@@ -19,6 +19,11 @@ public enum GdReportEnum {
     PENDING(0, "待处理"),
     REPORT(1, "已报备"),
     CANCEL(-1, "已作废"),
+    /**
+     *
+     */
+    GH(0, "工号报备"),
+    DQ(1, "电渠报备"),
 
     /**
      * 匹配状态

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdReportServiceImpl.java

@@ -196,9 +196,20 @@ public class KxsGdReportServiceImpl extends ServiceImpl<KxsGdReportMapper, KxsGd
 
         Long userId = SecurityUtils.getUser().getId();
         GdDqDotNumVO gdDotNumVO = new GdDqDotNumVO();
-        gdDotNumVO.setAllNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery().eq(KxsGdReport::getUserId, userId))).orElse(0L));
-        gdDotNumVO.setReportNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery().eq(KxsGdReport::getUserId, userId).eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType()))).orElse(0L));
-        gdDotNumVO.setEndNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery().eq(KxsGdReport::getUserId, userId).eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC).eq(KxsGdReport::getStatus, GdReportEnum.CANCEL.getType()))).orElse(0L));
+        gdDotNumVO.setAllNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery().eq(KxsGdReport::getUserId, userId)
+                .eq(KxsGdReport::getPutType, GdReportEnum.DQ.getType())))
+                .orElse(0L));
+        gdDotNumVO.setReportNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery()
+                .eq(KxsGdReport::getUserId, userId)
+                .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
+                .eq(KxsGdReport::getPutType, GdReportEnum.DQ.getType())))
+                .orElse(0L));
+        gdDotNumVO.setEndNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery()
+                .eq(KxsGdReport::getUserId, userId)
+                .eq(KxsGdReport::getPutType, GdReportEnum.DQ.getType())
+                .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC)
+                .eq(KxsGdReport::getStatus, GdReportEnum.CANCEL.getType())))
+                .orElse(0L));
 
         return gdDotNumVO;
     }