From ccbf509ba5d9028741eff7d7267e8c7f5b7d9fcc Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期四, 24 四月 2025 15:51:44 +0800
Subject: [PATCH] 【UPDATE】修改标准工序实体，增加专业字段
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java | 5 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java | 7 +++++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml | 7 ++++++-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java | 14 ++++++++++++++
4 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
index 5f86243..6986fd7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
@@ -88,6 +88,19 @@
@Excel(name = "鏃ュ巻鎻忚堪")
private String workCalender;
+ /** 涓撲笟 */
+ @Schema(description = "涓撲笟", type = "String")
+ @Excel(name = "涓撲笟")
+ private String major;
+
+ public String getMajor() {
+ return major;
+ }
+
+ public void setMajor(String major) {
+ this.major = major;
+ }
+
public void setId(Long id)
{
this.id = id;
@@ -249,6 +262,7 @@
.append("updateTime", getUpdateTime())
.append("modelId", getModelId())
.append("workCalender", getWorkCalender())
+ .append("major", getMajor())
.toString();
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java
index dbe73b0..b7cea7d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java
@@ -66,4 +66,11 @@
* @return
*/
public boolean importData(List<ApsStandardProcess> tempList);
+
+ /**
+ * 鏌ヨ鎵�鏈夋爣鍑嗗伐搴忔暟鎹�
+ * @param apsStandardProcess
+ * @return
+ */
+ public List<ApsStandardProcess> selectApsStandardProcessListAll(ApsStandardProcess apsStandardProcess);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
index 59b5ce6..cfb2f8a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
@@ -119,4 +119,9 @@
}
return true;
}
+
+ @Override
+ public List<ApsStandardProcess> selectApsStandardProcessListAll(ApsStandardProcess apsStandardProcess) {
+ return apsStandardProcessMapper.selectApsStandardProcessList(apsStandardProcess);
+ }
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml
index fdd4cd1..87c3b77 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml
@@ -23,10 +23,11 @@
<result property="updateTime" column="update_time" />
<result property="modelId" column="model_id" />
<result property="workCalender" column="work_calender" />
+ <result property="major" column="major" />
</resultMap>
<sql id="selectApsStandardProcessVo">
- select id, process_number, process_name, resource_group_name, model, design_capacity, plant_id, plant, work_shop_id, work_shop, work_calender_id, del_flag, create_by, create_time, update_by, update_time, model_id, work_calender from aps_standard_process
+ select id, process_number, process_name, resource_group_name, model, design_capacity, plant_id, plant, work_shop_id, work_shop, work_calender_id, del_flag, create_by, create_time, update_by, update_time, model_id, work_calender,major from aps_standard_process
</sql>
<select id="selectApsStandardProcessList" parameterType="ApsStandardProcess" resultMap="ApsStandardProcessResult">
@@ -44,6 +45,7 @@
<if test="workCalenderId != null "> and work_calender_id = #{workCalenderId}</if>
<if test="modelId != null "> and model_id = #{modelId}</if>
<if test="workCalender != null and workCalender != ''"> and work_calender = #{workCalender}</if>
+ <if test="major != null and major != ''"> and major = #{major}</if>
</where>
</select>
@@ -72,6 +74,7 @@
<if test="updateTime != null">update_time,</if>
<if test="modelId != null">model_id,</if>
<if test="workCalender != null">work_calender,</if>
+ <if test="major != null">major,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="processNumber != null">#{processNumber},</if>
@@ -91,6 +94,7 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="modelId != null">#{modelId},</if>
<if test="workCalender != null">#{workCalender},</if>
+ <if test="major != null">#{major},</if>
</trim>
</insert>
@@ -114,6 +118,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="modelId != null">model_id = #{modelId},</if>
<if test="workCalender != null">work_calender = #{workCalender},</if>
+ <if test="major != null">major = #{major},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3