diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java index d816bbbf1..568619b5b 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java @@ -81,6 +81,24 @@ public class ExpenseDispatchTrainDetailEntity extends TenantEntity { @ApiModelProperty(value = "车次完成时间") @ExcelProperty("车次完成时间") private Date trainCompletionTime; + /** + * 车次完成时间-年 + */ + @ApiModelProperty(value = "车次完成时间-年") + @ExcelProperty("车次完成时间-年") + private int trainCompletionYear; + /** + * 车次完成时间-月 + */ + @ApiModelProperty(value = "车次完成时间-月") + @ExcelProperty("车次完成时间-月") + private int trainCompletionMonth; + /** + * 车次完成时间-日 + */ + @ApiModelProperty(value = "车次完成时间-日") + @ExcelProperty("车次完成时间-日") + private int trainCompletionDay; /** * 目的仓 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java index fb725531e..0f8de634d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java @@ -116,6 +116,9 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl select t.destination_warehouse destinationWarehouse, - t.settlement_month settlementMonth, - t.settlement_year settlementYear, - concat(t.settlement_year,'年',t.settlement_month,'月') settlementTime, + t.train_completion_month settlementMonth, + t.train_completion_year settlementYear, + concat(t.train_completion_year,'年',t.train_completion_month,'月') settlementTime, count(*) totalTrainService, sum(t.planned_total_quantity) plannedTotalQuantity, sum(t.inventory_item_count) inventoryItemCount, @@ -57,9 +57,9 @@ sum(t.change_amount) changeAmount, sum(t.settlement_amount) settlementAmount from logpm_expense_dispatch_train_detail t - where t.settlement_year = #{year} - and t.settlement_month = #{month} - group by t.settlement_month,t.settlement_year,t.destination_warehouse + where t.train_completion_year = #{year} + and t.train_completion_month = #{month} + group by t.train_completion_month,t.train_completion_year,t.destination_warehouse