diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java index 9185ccd19..217699d52 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java @@ -135,8 +135,6 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe } } List list = numberMapper.number(page, query); - // - if (StrUtil.isEmpty(query.getDeliveryType())) { List excelVOS = new ArrayList<>(); if (CollUtil.isNotEmpty(list)) { diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchNumberExcelVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchNumberExcelVO.java index e29f9a4fc..973f55d75 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchNumberExcelVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchNumberExcelVO.java @@ -31,31 +31,38 @@ public class QualityDispatchNumberExcelVO implements Serializable { @ApiModelProperty(value = "预约件数") @ExcelProperty("预约件数") - private String planNum; + private Integer planNum; @ApiModelProperty(value = "装车件数") @ExcelProperty("装车件数") - private String loadNum; + private Integer loadNum; @ApiModelProperty(value = "签收件数") @ExcelProperty("签收件数") - private String signNum; + private Integer signNum; @ApiModelProperty(value = "签收率") @ExcelProperty("签收率") private String signRate; + @ExcelProperty("签收及时率") + private String signOnTimeRate; + @ApiModelProperty(value = "预约库存品件数") @ExcelProperty("预约库存品件数") - private String planStockNum; + private Integer planStockNum; + + @ApiModelProperty(value = "库存品备货件数") + @ExcelProperty("库存品备货件数") + private Integer stockingQuantity; @ApiModelProperty(value = "库存品装车件数") @ExcelProperty("库存品装车件数") - private String loadStockNum; + private Integer loadStockNum; @ApiModelProperty(value = "库存品签收件数") @ExcelProperty("库存品签收件数") - private String signStockNum; + private Integer signStockNum; @ApiModelProperty(value = "库存品签收率") @ExcelProperty("库存品签收率") @@ -63,7 +70,7 @@ public class QualityDispatchNumberExcelVO implements Serializable { @ApiModelProperty(value = "异常数") @ExcelProperty("异常数") - private String exceptionNum; + private Integer exceptionNum; @ApiModelProperty(value = "计划准确率") @ExcelProperty("计划准确率") @@ -71,14 +78,18 @@ public class QualityDispatchNumberExcelVO implements Serializable { @ApiModelProperty(value = "客户数") @ExcelProperty("客户数") - private String customerCount; + private Integer customerCount; @ApiModelProperty(value = "审核客户数") @ExcelProperty("审核客户数") - private String reviewCustomerCount; + private Integer reviewCustomerCount; @ApiModelProperty(value = "审核率") @ExcelProperty("审核率") private String reviewRate; + @ApiModelProperty(value = "复核及时率") + @ExcelProperty("复核及时率") + private String reviewOnTimeRate; + }