mac 2 лет назад
Родитель
Сommit
3c8b0beb76

+ 5 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/gd/GdDotNumVO.java

@@ -34,6 +34,11 @@ public class GdDotNumVO implements Serializable {
     @Schema(description = "已报备")
     @Schema(description = "已报备")
     private Object reportNum;
     private Object reportNum;
 
 
+    /**
+     * 报备成功
+     */
+    private Object reportSuc;
+
 
 
     /**
     /**
      * 已作废
      * 已作废

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

@@ -102,11 +102,20 @@ public class KxsGdReportServiceImpl extends ServiceImpl<KxsGdReportMapper, KxsGd
                 .orElse(0L));
                 .orElse(0L));
         gdDotNumVO.setReportNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery()
         gdDotNumVO.setReportNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery()
                         .eq(KxsGdReport::getPutType, putType)
                         .eq(KxsGdReport::getPutType, putType)
-                        .eq(KxsGdReport::getUserId, userId).eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())))
+                        .eq(KxsGdReport::getUserId, userId)
+                        .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
+                        .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())))
+                .orElse(0L));
+        gdDotNumVO.setReportSuc(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery()
+                        .eq(KxsGdReport::getPutType, putType)
+                        .eq(KxsGdReport::getUserId, userId)
+                        .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
+                        .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())))
                 .orElse(0L));
                 .orElse(0L));
         gdDotNumVO.setCancelNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery()
         gdDotNumVO.setCancelNum(Optional.of(this.count(Wrappers.<KxsGdReport>lambdaQuery()
                         .eq(KxsGdReport::getPutType, putType)
                         .eq(KxsGdReport::getPutType, putType)
-                        .eq(KxsGdReport::getUserId, userId).eq(KxsGdReport::getStatus, GdReportEnum.CANCEL.getType())))
+                        .eq(KxsGdReport::getUserId, userId)
+                        .eq(KxsGdReport::getStatus, GdReportEnum.CANCEL.getType())))
                 .orElse(0L));
                 .orElse(0L));
 
 
         return gdDotNumVO;
         return gdDotNumVO;