From 70a46cd5e65b1ee16fb4bb4954a01129e6898b6d Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 12 五月 2025 18:29:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 7 ++++++-
1 files changed, 6 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 c5cc0cc..45731fd 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
@@ -22,10 +22,11 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="orgCode" column="org_code" />
</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 from aps_gas_pipeline_capacity_plan
+ 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
</sql>
<select id="selectApsGasPipelineCapacityPlanList" parameterType="ApsGasPipelineCapacityPlan" resultMap="ApsGasPipelineCapacityPlanResult">
@@ -42,6 +43,7 @@
<if test="dayProduceAllNum != null "> and day_produce_all_num = #{dayProduceAllNum}</if>
<if test="days != null "> and days = #{days}</if>
<if test="monthProduceAllNum != null "> and month_produce_all_num = #{monthProduceAllNum}</if>
+ <if test="orgCode != null "> and org_code = #{orgCode}</if>
<!-- <if test="major != null and major != ''">-->
<!-- and process_name in (select process_name from aps_standard_process where major=#{major})-->
<!-- </if>-->
@@ -73,6 +75,7 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
+ <if test="orgCode != null">org_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -92,6 +95,7 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
+ <if test="orgCode != null">#{orgCode},</if>
</trim>
</insert>
@@ -114,6 +118,7 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="orgCode != null">org_code = #{orgCode},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3