From 9b63b9770cd02ca73c20196a3e02f971bc6e70e8 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 26 七月 2024 17:39:21 +0800
Subject: [PATCH] mapper 及xml整理

---
 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index bfd33b8..0bd9d4d 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -71,7 +71,7 @@
         node_id,work_type,dt,status,
         start_time,end_time,assistants
     </sql>
-    <sql id="part_Column_List">
+    <sql id="part_Column_List"><![CDATA[
         ${alias}.id,
         ${alias}.user_id,
         ${alias}.line_id,
@@ -85,7 +85,7 @@
         ${alias}.start_time,
         ${alias}.end_time,
         ${alias}.assistants
-    </sql>
+    ]]></sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
@@ -93,29 +93,29 @@
         where id = #{id,jdbcType=BIGINT}
     </select>
 
-    <select id="selectByUserAndStation" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from plt_station where status ==1
-        <trim prefix="and" suffixOverrides="and">
-            <if test="id != null and id !=''">
-                id = #{id,jdbcType=BIGINT} and
-            </if>
-            <if test="code != null and code !=''">
-                code = #{code,jdbcType=VARCHAR} and
-            </if>
-            <if test="name != null and name !=''">
-                name like concat('%', #{name}, '%') and
-            </if>
-            <if test="disabled != null and disabled !=''">
-                disabled = #{disabled,jdbcType=TINYINT} and
-            </if>
-            <if test="lineId != null and lineId !=''">
-                line_id = #{lineId,jdbcType=BIGINT} and
-            </if>
-        </trim>
-        order by id desc
-    </select>
+<!--    <select id="selectByUserAndStation" resultMap="BaseResultMap">-->
+<!--        select-->
+<!--        <include refid="Base_Column_List"/>-->
+<!--        from plt_station where status =1-->
+<!--        <trim prefix="and" suffixOverrides="and">-->
+<!--            <if test="id != null and id !=''">-->
+<!--                id = #{id,jdbcType=BIGINT} and-->
+<!--            </if>-->
+<!--            <if test="code != null and code !=''">-->
+<!--                code = #{code,jdbcType=VARCHAR} and-->
+<!--            </if>-->
+<!--            <if test="name != null and name !=''">-->
+<!--                name like concat('%', #{name}, '%') and-->
+<!--            </if>-->
+<!--            <if test="disabled != null and disabled !=''">-->
+<!--                disabled = #{disabled,jdbcType=TINYINT} and-->
+<!--            </if>-->
+<!--            <if test="lineId != null and lineId !=''">-->
+<!--                line_id = #{lineId,jdbcType=BIGINT} and-->
+<!--            </if>-->
+<!--        </trim>-->
+<!--        order by id desc-->
+<!--    </select>-->
 
     <select id="selectList" resultMap="BaseResultMap">
         select
@@ -144,10 +144,10 @@
                 and status = #{status,jdbcType=TINYINT}
             </if>
             <if test="startTime != null and startTime !=''">
-                and start_time = #{startTime,jdbcType=TIMESTAMP},
+                and start_time = #{startTime,jdbcType=TIMESTAMP}
             </if>
             <if test="endTime != null and endTime !=''">
-                and end_time = #{endTime,jdbcType=TIMESTAMP},
+                and end_time = #{endTime,jdbcType=TIMESTAMP}
             </if>
             <if test="assistants != null and assistants !=''">
                 and assistants = #{assistants,jdbcType=VARCHAR}
@@ -190,7 +190,7 @@
                 and p.name like concat('%', #{planName}, '%')
             </if>
             <if test="processName != null and processName != '' ">
-                and pp.name like concat('%', #{processName}, '%')
+                and ppp.name like concat('%', #{processName}, '%')
             </if>
             <if test="nodeName != null and nodeName != '' ">
                 and n.content like concat('%', #{nodeName}, '%')

--
Gitblit v1.8.0