From 1c0a822656eb655e3a9ef58c4804b3f1dbdddd8f Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Tue, 31 Dec 2024 15:41:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E8=BD=A6?=
 =?UTF-8?q?=E6=AC=A1=E6=88=90=E6=9C=AC=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加车次完结时间字段
---
 .../ExpenseDispatchTrainDetailEntity.java      | 18 ++++++++++++++++++
 .../impl/QualityDeliverServiceImpl.java        |  3 +++
 .../ExpenseDispatchWarehouseMonthMapper.xml    | 12 ++++++------
 3 files changed, 27 insertions(+), 6 deletions(-)

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<QualityDeliverMap
 						BigDecimal fuelCost = BigDecimal.ZERO;
 						trainDetailEntity.setSettlementStatus("未结算");
 						for (QualityDeliverEntity qualityDeliverEntity : value) {
+							trainDetailEntity.setTrainCompletionYear(DateUtil.year(qualityDeliverEntity.getCarComplateTime()));
+							trainDetailEntity.setTrainCompletionMonth(DateUtil.month(qualityDeliverEntity.getCarComplateTime()) + 1);
+							trainDetailEntity.setTrainCompletionDay(DateUtil.dayOfMonth(qualityDeliverEntity.getCarComplateTime()));
 							trainDetailEntity.setTrainCompletionTime(qualityDeliverEntity.getCarComplateTime());
 							trainDetailEntity.setTotalOrderQuantity(qualityDeliverEntity.getOrderNumber());
 							trainDetailEntity.setDeliveryVehicle(qualityDeliverEntity.getSignCarNumber());
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml
index c105a65fd..f24947158 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml
@@ -32,9 +32,9 @@
 
     <select id="expenseDispatchDetailMonthJob" resultType="com.logpm.statistics.entity.ExpenseDispatchWarehouseMonthEntity">
         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
 
 
     </select>