From dc3dd99bd0eb9e9297e66b958ed4b7b31dd21d1d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 16 四月 2025 19:03:34 +0800
Subject: [PATCH] 钣金统计表
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java | 11 ++++-------
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml | 9 ++++-----
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
index 77a1bd1..eb216e3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
@@ -30,8 +30,6 @@
@Excel(name = "宸ュ簭鍚嶇О")
private String processName;
- /** 鎺掑簭 */
- @Excel(name = "鎺掑簭")
private Integer num;
/** 宸ュ簭鍙� */
@@ -56,12 +54,11 @@
/** 璁″垝瀹屾垚鏃� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date processPlanEndDay;
/** 璁＄畻瀹屾垚鏃� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁＄畻瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date computePlanEndDay;
@@ -77,11 +74,11 @@
private Date orderPlanEndDay;
/** 璁捐宸ユ椂 */
- @Excel(name = "璁捐宸ユ椂")
+
private Long designTimes;
/** 鎵规鍙� */
- @Excel(name = "鎵规鍙�")
+
private String batchNumber;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
index 6f26ce2..24b1626 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
@@ -65,12 +65,11 @@
<if test="processTotalTime != null">process_total_time,</if>
<if test="processPlanEndDay != null">process_plan_end_day,</if>
<if test="processPlanStartDay != null">process_plan_start_day,</if>
- <if test="processPlanStartDay != null">process_plan_start_day,</if>
+ <if test="orderPlanEndDay != null">order_plan_end_day,</if>
<if test="designTimes != null">design_times,</if>
<if test="batchNumber != null">batch_number,</if>
<if test="createBy != null">create_by,</if>
-
- <if test="delFlag != null">del_flag,</if>
+ del_flag,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -84,11 +83,11 @@
<if test="processTotalTime != null">#{processTotalTime},</if>
<if test="processPlanEndDay != null">#{processPlanEndDay},</if>
<if test="processPlanStartDay != null">#{processPlanStartDay},</if>
+ <if test="orderPlanEndDay != null">#{orderPlanEndDay},</if>
<if test="designTimes != null">#{designTimes},</if>
<if test="batchNumber != null">#{batchNumber},</if>
<if test="createBy != null">#{createBy},</if>
-
- <if test="delFlag != null">#{delFlag},</if>
+ '0'
</trim>
</insert>
--
Gitblit v1.9.3