Просмотр исходного кода

[update] 查询区间统计逻辑整改

miajio 4 дней назад
Родитель
Сommit
8b0fa21580

+ 5 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/vo/DriverIntervalCargoDamageVo.java

@@ -51,6 +51,11 @@ public class DriverIntervalCargoDamageVo implements Serializable {
     private String warehouseName;
 
     /**
+     * 统计类型 SPOT_CHECK 抽查(指定补货员) REGULAR 定期(全部补货员)
+     */
+    private String stockTakingType;
+
+    /**
      * 区间开始时间
      */
     private LocalDateTime intervalStartTime;

+ 1 - 0
warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossIntervalMainMapper.xml

@@ -47,6 +47,7 @@
         wi.name as warehouseName,
         dglim.intervalStartTime as intervalStartTime,
         dglim.intervalEndTime as intervalEndTime,
+        dglim.stockTakingType as stockTakingType,
         dglim.pickingOrderCreateNum as pickingOrderCreateNum,
         dglim.wholeOrderCreateNum as wholeOrderCreateNum,
         dglim.replenishNum as replenishNum,

+ 1 - 1
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverIntervalCargoDamageController.java

@@ -181,7 +181,7 @@ public class DriverIntervalCargoDamageController extends BaseController {
         extractedAreaStaffSearchParam(bo);
         DriverIntervalCargoDamageDetailPageBo pageBo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.detailExportBoToPageBo(bo);
         pageBo.setPageNum(1);
-        pageBo.setPageNum(1000);
+        pageBo.setPageSize(1000);
         List<DriverIntervalCargoDamageDetailVo> all = new ArrayList<>();
         while (true) {
             Page<DriverIntervalCargoDamageDetailVo> page = driverGoodsLossIntervalDetailService.searchForPage(pageBo);

+ 5 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/response/DriverIntervalCargoDamageResponse.java

@@ -52,6 +52,11 @@ public class DriverIntervalCargoDamageResponse implements Serializable {
     private String warehouseName;
 
     /**
+     * 统计类型 SPOT_CHECK 抽查(指定补货员) REGULAR 定期(全部补货员)
+     */
+    private String stockTakingType;
+
+    /**
      * 区间开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")