From 8000dd179e5a1eef3113cbd75dddb32bbb805d1c Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 07 一月 2025 11:58:12 +0800
Subject: [PATCH] edit
---
pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml | 121 ++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 61 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
index 588e6d3..08e0e9d 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -14,11 +14,30 @@
<result property="deleted" column="deleted" jdbcType="TINYINT"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
- select="selectProNameById" fetchType="eager" />
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
+ <association property="proType" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
<association property="creatorName" column="creator" javaType="java.lang.Long"
- select="selectNameByUserId" fetchType="eager" />
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
+ <association property="isQuote" column="id" javaType="java.lang.Boolean" fetchType="eager"
+ select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.processIsQuote" />
+ <association property="planNames" column="id" javaType="java.lang.String" fetchType="eager"
+ select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.selectPlanNamesByProcessId" />
<collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode"
select="selectByProcess" fetchType="eager" column="id" />
+ </resultMap>
+
+ <resultMap id="ProcessResultMap" type="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="proId" column="pro_id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="creator" column="creator" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="disabled" column="disabled" jdbcType="TINYINT"/>
+ <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode"
+ select="selectByProcess" fetchType="eager" column="id" />
</resultMap>
<sql id="Base_Column_List">
@@ -27,23 +46,28 @@
deleted,remark
</sql>
- <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
- select name proName from plt_product where id=#{creator}
- </select>
- <select id="selectNameByUserId" parameterType="java.lang.Long" resultType="java.lang.String">
- select name from ba_user where id=#{id}
+ <select id="selectProcessNameById" resultType="java.lang.String">
+ select name
+ from pr_production_process
+ where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectByProcess" resultMap="com.dy.pmsGlobal.daoPr.PrProductionNodeMapper.BaseResultMap">
select *
from pr_production_node
where process_id = #{processId,jdbcType=BIGINT}
</select>
+ <select id="selectByProcessId" parameterType="java.lang.Long" resultMap="ProcessResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from pr_production_process
+ where id = #{id,jdbcType=BIGINT}
+ </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from pr_production_process
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -56,22 +80,22 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="proId != null">pro_id,</if>
- <if test="name != null">name,</if>
- <if test="creator != null">creator,</if>
+ <if test="name != null and name !=''">name,</if>
+ <if test="creator != null and creator !=''">creator,</if>
<if test="dt != null">dt,</if>
<if test="disabled != null">disabled,</if>
<if test="deleted != null">deleted,</if>
- <if test="remark != null">remark,</if>
+ <if test="remark != null and remark !=''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="proId != null">#{proId,jdbcType=BIGINT},</if>
- <if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
+ <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
+ <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
<if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
- <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+ <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
@@ -80,10 +104,10 @@
<if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT},
</if>
- <if test="name != null">
+ <if test="name != null and name !=''">
name = #{name,jdbcType=VARCHAR},
</if>
- <if test="creator != null">
+ <if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR},
</if>
<if test="dt != null">
@@ -95,7 +119,7 @@
<if test="deleted != null">
deleted = #{deleted,jdbcType=TINYINT},
</if>
- <if test="remark != null">
+ <if test="remark != null and remark !=''">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set>
@@ -105,34 +129,16 @@
<select id="selectSome" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from pr_production_process
+ from pr_production_process t
<trim prefix="where" suffixOverrides="and">
- <!-- <if test="id != null">-->
- <!-- id = #{id,jdbcType=BIGINT} and-->
- <!-- </if>-->
<if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT} and
</if>
-<!-- <if test="name != null">-->
+<!-- <if test="name != null and name !=''">-->
<!-- name = #{name,jdbcType=VARCHAR} and-->
<!-- </if>-->
- <!-- <if test="creator != null">-->
- <!-- creator = #{creator,jdbcType=VARCHAR} and-->
- <!-- </if>-->
- <!-- <if test="dt != null">-->
- <!-- dt = #{dt,jdbcType=TIMESTAMP} and-->
- <!-- </if>-->
- <!-- <if test="disabled != null">-->
- <!-- disabled = #{disabled,jdbcType=TINYINT} and-->
- <!-- </if>-->
- <!-- <if test="deleted != null">-->
- <!-- deleted = #{deleted,jdbcType=TINYINT} and-->
- <!-- </if>-->
- <!-- <if test="remark != null">-->
- <!-- remark = #{remark,jdbcType=VARCHAR} and-->
- <!-- </if>-->
</trim>
- order by id desc
+ order by t.id desc
<trim prefix="limit " >
<if test="start != null and count != null">
#{start}, #{count}
@@ -142,39 +148,32 @@
<select id="selectSomeCount" resultType="java.lang.Long">
select count(1)
- from pr_production_process
+ from pr_production_process t
<trim prefix="where" suffixOverrides="and">
-<!-- <if test="id != null">-->
-<!-- id = #{id,jdbcType=BIGINT} and-->
-<!-- </if>-->
<if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT} and
</if>
-<!-- <if test="name != null">-->
-<!-- name = #{name,jdbcType=VARCHAR} and-->
-<!-- </if>-->
-<!-- <if test="creator != null">-->
-<!-- creator = #{creator,jdbcType=VARCHAR} and-->
-<!-- </if>-->
-<!-- <if test="dt != null">-->
-<!-- dt = #{dt,jdbcType=TIMESTAMP} and-->
-<!-- </if>-->
-<!-- <if test="disabled != null">-->
-<!-- disabled = #{disabled,jdbcType=TINYINT} and-->
-<!-- </if>-->
-<!-- <if test="deleted != null">-->
-<!-- deleted = #{deleted,jdbcType=TINYINT} and-->
-<!-- </if>-->
-<!-- <if test="remark != null">-->
-<!-- remark = #{remark,jdbcType=VARCHAR} and-->
-<!-- </if>-->
+ <!-- <if test="name != null and name !=''">-->
+ <!-- name = #{name,jdbcType=VARCHAR} and-->
+ <!-- </if>-->
</trim>
</select>
- <select id="queryAll" resultType="map">
+ <select id="queryAll" resultType="java.util.HashMap">
select
CAST(id AS CHAR) AS id,name
from pr_production_process
where deleted = 0
+ <trim prefix="and" suffixOverrides=",">
+ pro_id = #{proId,jdbcType=BIGINT}
+ </trim>
+ </select>
+ <select id="exists" resultType="java.lang.Boolean">
+ select count(1)
+ from pr_production_process
+ where name = #{name} and deleted = 0
+ <if test="id != null">
+ and id != #{id}
+ </if>
</select>
--
Gitblit v1.8.0