From 71eed1baf6de1de2545f88482839d9051ac86f5a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 14:50:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 12 +++++++++---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java | 34 +++++++++++++++++++++++++++++++---
2 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
index 09322b3..1387e3a 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
@@ -141,16 +141,44 @@
@Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
private String nextOpName;
- /**
- * 浣庨樁鐮�
- */
+ /** 浣庨樁鐮� */
+ @JsonProperty("LowLevelCode")
private String lowOrderCode;
/** 宸ュ崟鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonProperty("CreatedOn")
private Date orderCreateTime;
+ /** 宸ュ崟瀹℃牳鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonProperty("ApproveOn")
+ private Date approveOn;
+
+ /** 宸ュ崟寮�宸ユ椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonProperty("StartDatetime")
+ private Date startWorkDate;
+
+ public Date getApproveOn() {
+ return approveOn;
+ }
+
+ public void setApproveOn(Date approveOn) {
+ this.approveOn = approveOn;
+ }
+
+ public Date getStartWorkDate() {
+ return startWorkDate;
+ }
+
+ public void setStartWorkDate(Date startWorkDate) {
+ this.startWorkDate = startWorkDate;
+ }
+
public String getLowOrderCode() {
return lowOrderCode;
}
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
index 8e82da4..6edc249 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
@@ -41,6 +41,8 @@
<result property="nextOpName" column="next_op_name" />
<result property="lowOrderCode" column="low_order_code" />
<result property="orderCreateTime" column="order_create_time" />
+ <result property="approveOn" column="approve_on" />
+ <result property="startWorkDate" column="start_work_date" />
</resultMap>
<sql id="selectApsWorkOrderJobVo">
@@ -48,7 +50,7 @@
doc_status, item_code, item_figure, item_figure_version, pruduct_qty, work_qty, op_num, work_center,
dept, start_date, complete_date, next_dept, is_hold_release, is_out_source, org, page_num, page_index,
del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name,
- low_order_code, order_create_time
+ low_order_code, order_create_time, approve_on, start_work_date
from aps_work_order_job
</sql>
@@ -295,7 +297,9 @@
op_status,
next_op_name,
low_order_code,
- order_create_time
+ order_create_time,
+ approve_on,
+ start_work_date
</trim>
values
<foreach collection="list" item="job" separator=",">
@@ -336,7 +340,9 @@
#{job.opStatus},
#{job.nextOpName},
#{job.lowOrderCode},
- #{job.orderCreateTime}
+ #{job.orderCreateTime},
+ #{job.approveOn},
+ #{job.startWorkDate}
)
</foreach>
</insert>
--
Gitblit v1.9.3