From d01bad0d465d3a00644f8c5521be88c4b13237c3 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 04 七月 2024 17:28:10 +0800
Subject: [PATCH] add node type
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 2 +-
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java | 3 +++
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 12 ++++++------
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index 817840f..1e78c77 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -87,7 +87,7 @@
@TableField(exist = false)
public String nodeName;
- public String nodeType;
+ public Integer nodeType;
@TableField(exist = false)
public PrAssemblyPlan plan;
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index c5daeb1..40a0fb3 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -12,7 +12,7 @@
<result property="planId" column="plan_id" jdbcType="BIGINT"/>
<result property="processId" column="process_id" jdbcType="BIGINT"/>
<result property="nodeId" column="node_id" jdbcType="BIGINT"/>
- <result property="nodeType" column="node_type" jdbcType="VARCHAR"/>
+ <result property="nodeType" column="node_type" jdbcType="TINYINT"/>
<result property="dt" column="dt" jdbcType="TIMESTAMP"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -36,7 +36,7 @@
<result property="planId" column="plan_id" jdbcType="BIGINT"/>
<result property="processId" column="process_id" jdbcType="BIGINT"/>
<result property="nodeId" column="node_id" jdbcType="BIGINT"/>
- <result property="nodeType" column="node_type" jdbcType="VARCHAR"/>
+ <result property="nodeType" column="node_type" jdbcType="TINYINT"/>
<result property="dt" column="dt" jdbcType="TIMESTAMP"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -292,7 +292,7 @@
)
values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{lineId,jdbcType=BIGINT}
,#{stationId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{processId,jdbcType=BIGINT}
- ,#{nodeId,jdbcType=BIGINT},#{nodeType,jdbcType=VARCHAR},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
+ ,#{nodeId,jdbcType=BIGINT},#{nodeType,jdbcType=TINYINT},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
)
</insert>
@@ -321,7 +321,7 @@
<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
<if test="processId != null">#{processId,jdbcType=BIGINT},</if>
<if test="nodeId != null">#{nodeId,jdbcType=BIGINT},</if>
- <if test="nodeType != null">#{nodeType,jdbcType=BIGINT},</if>
+ <if test="nodeType != null">#{nodeType,jdbcType=TINYINT},</if>
<if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
@@ -351,7 +351,7 @@
node_id = #{nodeId,jdbcType=BIGINT},
</if>
<if test="nodeType != null">
- node_type = #{nodeType,jdbcType=BIGINT},
+ node_type = #{nodeType,jdbcType=TINYINT},
</if>
<if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
@@ -380,7 +380,7 @@
plan_id = #{planId,jdbcType=BIGINT},
process_id = #{processId,jdbcType=BIGINT},
node_id = #{nodeId,jdbcType=BIGINT},
- node_type = #{nodeType,jdbcType=BIGINT},
+ node_type = #{nodeType,jdbcType=TINYINT},
dt = #{dt,jdbcType=TIMESTAMP},
status = #{status,jdbcType=TINYINT},
start_time = #{startTime,jdbcType=TIMESTAMP},
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
index 2748c41..e843cf1 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
@@ -49,6 +49,9 @@
@NotNull(message="[鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long nodeId;
+
+ @NotNull(message="[鐢熶骇娴佺▼鑺傜偣绫诲瀷]涓嶈兘涓虹┖")
+ public Integer nodeType;
/**
* 浠诲姟璁ら鏃堕棿
*/
--
Gitblit v1.8.0