From 432a1b0c4dd251f686e9bb7950c4868aaf3e4ed7 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm_a@163.com>
Date: 星期四, 06 六月 2024 09:55:57 +0800
Subject: [PATCH] 添加验证和异常处理

---
 pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml |   53 +++++++++++------------------------------------------
 1 files changed, 11 insertions(+), 42 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 5dc10ae..a1dea71 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -17,6 +17,11 @@
                      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" />
+        <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>
@@ -105,34 +110,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">-->
 <!--                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,32 +129,14 @@
 
     <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">-->
+            <!--                name = #{name,jdbcType=VARCHAR} and-->
+            <!--            </if>-->
         </trim>
     </select>
     <select id="queryAll" resultType="map">

--
Gitblit v1.8.0