From e4efff6637f4d598a7efdfca8b62fbb4c3286b02 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 15:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
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 329ee58..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>
@@ -133,4 +138,12 @@
#{id}
</foreach>
</delete>
+
+ <delete id="deleteByDateAndFactory" >
+ delete from aps_gas_pipeline_capacity_plan
+ where year = #{year}
+ and month = #{month}
+ and org_code = #{factory}
+ and major = #{major}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3