From eeee3d8fa04aff41db6ee2418468e7371ecad57d Mon Sep 17 00:00:00 2001
From: liuxm <liuxm_a@163.com>
Date: 星期二, 04 六月 2024 19:27:36 +0800
Subject: [PATCH] 生产计划部分修改

---
 pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 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 e8dfbc1..5dc10ae 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -14,7 +14,9 @@
         <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="creatorName" column="creator" javaType="java.lang.Long"
+                     select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
         <collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode"
                       select="selectByProcess" fetchType="eager" column="id" />
     </resultMap>
@@ -25,8 +27,11 @@
         deleted,remark
     </sql>
 
-    <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
-        select name proName from plt_product 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 *
@@ -170,6 +175,17 @@
             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