From ddd56a8f37eb47d933a7064be9341feb8dbd8165 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 04 七月 2024 16:51:34 +0800
Subject: [PATCH] edit params and file Api
---
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 3ef6649..ddbf664 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -27,7 +27,25 @@
<association property="processName" column="process_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectProcessNameById" fetchType="eager" />
<collection property="process" ofType="com.dy.pmsGlobal.pojoPr.PrProductionProcess"
- select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByProcess" fetchType="eager" column="process_id" />
+ select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByPrimaryKey" fetchType="eager" column="process_id" />
+ </resultMap>
+
+ <resultMap id="PlanResultMap" type="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="proId" column="pro_id" jdbcType="BIGINT"/>
+ <result property="batchId" column="batch_id" jdbcType="BIGINT"/>
+ <result property="processId" column="process_id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="number" column="number" jdbcType="INTEGER"/>
+ <result property="status" column="status" jdbcType="TINYINT"/>
+ <result property="creator" column="creator" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="startDate" column="start_date" jdbcType="VARCHAR"/>
+ <result property="endDate" column="end_date" jdbcType="VARCHAR"/>
+ <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <result property="content" column="content" jdbcType="VARCHAR"/>
+ <collection property="process" ofType="com.dy.pmsGlobal.pojoPr.PrProductionProcess"
+ select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByProcessId" fetchType="eager" column="process_id" />
</resultMap>
<sql id="Base_Column_List">
@@ -65,6 +83,50 @@
from pr_production_node
where process_id = #{processId,jdbcType=BIGINT}
</select>
+ <select id="selectAssyPlanSimplify" resultMap="PlanResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
+ select
+ <include refid="Base_Column_List" />
+ from pr_assembly_plan
+ <trim prefix="where" suffixOverrides="and">
+ <if test="proId != null">
+ pro_id = #{proId,jdbcType=BIGINT} and
+ </if>
+ <if test="batchId != null">
+ batch_id = #{batchId,jdbcType=BIGINT} and
+ </if>
+ <if test="processId != null">
+ process_id = #{processId,jdbcType=BIGINT} and
+ </if>
+ <if test="name != null">
+ name = #{name,jdbcType=VARCHAR} and
+ </if>
+ <if test="number != null">
+ number = #{number,jdbcType=INTEGER} and
+ </if>
+ <if test="status != null">
+ status = #{status,jdbcType=TINYINT} and
+ </if>
+ <if test="creator != null">
+ creator = #{creator,jdbcType=VARCHAR} and
+ </if>
+ <if test="dt != null">
+ dt = #{dt,jdbcType=TIMESTAMP} and
+ </if>
+ <if test="startDate != null">
+ start_date = #{startDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="endDate != null">
+ end_date = #{endDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT} and
+ </if>
+ <if test="content != null">
+ content = #{content,jdbcType=VARCHAR} and
+ </if>
+ </trim>
+ order by id desc
+ </select>
<select id="selectAssyPlanList" resultMap="BaseResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
select
<include refid="Base_Column_List" />
--
Gitblit v1.8.0