From 791208eed8021ef7eb857ced5f031485cff7a2b7 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 22 五月 2025 11:42:59 +0800
Subject: [PATCH] 增加workshop字段
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java | 9 +++++++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 7 ++++++-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java | 1 +
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
index 0ca36d2..96f663f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
@@ -4,6 +4,7 @@
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -15,6 +16,7 @@
* @author hjy
* @date 2025-04-24
*/
+@Data
@Schema(description = "姘斾綋绠¤矾浜ц兘瑙勫垝瀹炰綋绫�")
public class ApsGasPipelineCapacityPlan extends BaseEntity
{
@@ -60,6 +62,7 @@
@Schema(description = "鏃ヤ骇鍑哄崟浣�", type = "String")
private String dayProduceUnit;
+
/** 浜哄憳鏁伴噺 */
@Excel(name = "浜哄憳鏁伴噺")
@Schema(description = "浜哄憳鏁伴噺", type = "BigDecimal")
@@ -85,6 +88,12 @@
@Schema(description = "宸ュ巶浠ｇ爜", type = "String")
private String orgCode;
+
+ /** 杞﹂棿 */
+ @Excel(name = "杞﹂棿")
+ @Schema(description = "杞﹂棿", type = "String")
+ private String workshop;
+
public void setOrgCode(String orgCode)
{
this.orgCode = orgCode;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
index 742e2bf..543cd6f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
@@ -128,6 +128,7 @@
major
);
templatePlans.forEach(p -> {
+ p.setId(null);
p.setYear(year);
p.setMonth(month);
p.setCreateBy(SecurityUtils.getUsername());
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
index 6c48117..5c16e41 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
@@ -10,6 +10,7 @@
<result property="year" column="year" />
<result property="month" column="month" />
<result property="major" column="major" />
+ <result property="workshop" column="workshop" />
<result property="dayProduceType" column="day_produce_type" />
<result property="dayProduceNum" column="day_produce_num" />
<result property="dayProduceUnit" column="day_produce_unit" />
@@ -26,7 +27,7 @@
</resultMap>
<sql id="selectApsGasPipelineCapacityPlanVo">
- select id, process_name, year, month, major, day_produce_type, day_produce_num, day_produce_unit, personnel_number, day_produce_all_num, days, month_produce_all_num, remark, create_by, create_time, update_by, update_time, org_code from aps_gas_pipeline_capacity_plan
+ select id, process_name, year, month, major, workshop, day_produce_type, day_produce_num, day_produce_unit, personnel_number, day_produce_all_num, days, month_produce_all_num, remark, create_by, create_time, update_by, update_time, org_code from aps_gas_pipeline_capacity_plan
</sql>
<select id="selectApsGasPipelineCapacityPlanList" parameterType="com.aps.core.domain.ApsGasPipelineCapacityPlan" resultMap="ApsGasPipelineCapacityPlanResult">
@@ -36,6 +37,7 @@
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="month != null and month != ''"> and month = #{month}</if>
<if test="major != null and major != ''"> and major = #{major}</if>
+ <if test="workshop != null and workshop != ''"> and workshop = #{workshop}</if>
<if test="dayProduceType != null and dayProduceType != ''"> and day_produce_type = #{dayProduceType}</if>
<if test="dayProduceNum != null "> and day_produce_num = #{dayProduceNum}</if>
<if test="dayProduceUnit != null and dayProduceUnit != ''"> and day_produce_unit = #{dayProduceUnit}</if>
@@ -63,6 +65,7 @@
<if test="year != null">year,</if>
<if test="month != null">month,</if>
<if test="major != null">major,</if>
+ <if test="workshop != null">workshop,</if>
<if test="dayProduceType != null">day_produce_type,</if>
<if test="dayProduceNum != null">day_produce_num,</if>
<if test="dayProduceUnit != null">day_produce_unit,</if>
@@ -83,6 +86,7 @@
<if test="year != null">#{year},</if>
<if test="month != null">#{month},</if>
<if test="major != null">#{major},</if>
+ <if test="workshop != null">workshop,</if>
<if test="dayProduceType != null">#{dayProduceType},</if>
<if test="dayProduceNum != null">#{dayProduceNum},</if>
<if test="dayProduceUnit != null">#{dayProduceUnit},</if>
@@ -106,6 +110,7 @@
<if test="year != null">year = #{year},</if>
<if test="month != null">month = #{month},</if>
<if test="major != null">major = #{major},</if>
+ <if test="workshop != null">workshop,</if>
<if test="dayProduceType != null">day_produce_type = #{dayProduceType},</if>
<if test="dayProduceNum != null">day_produce_num = #{dayProduceNum},</if>
<if test="dayProduceUnit != null">day_produce_unit = #{dayProduceUnit},</if>
--
Gitblit v1.9.3