From 5b207a55bdd10f1516031f629217daac069b64fd Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 30 八月 2024 11:40:31 +0800
Subject: [PATCH] 添加免登录查询所有排班接口;

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml |  127 +++++++++++++++++++++++-------------------
 1 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml
index 1a3b93f..3eeff2e 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml
@@ -5,20 +5,21 @@
 <mapper namespace="com.dy.pmsGlobal.daoPlt.PltProductionLineMapper">
 
     <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPlt.PltProductionLine">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="type" column="type" jdbcType="VARCHAR"/>
-            <result property="factory" column="factory" jdbcType="VARCHAR"/>
-            <result property="director" column="director" jdbcType="VARCHAR"/>
-            <result property="dMobile" column="d_mobile" jdbcType="VARCHAR"/>
-            <result property="installTime" column="install_time" jdbcType="VARCHAR"/>
-            <result property="deleted" column="deleted" jdbcType="TINYINT"/>
-            <result property="remark" column="remark" jdbcType="VARCHAR"/>
-            <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+        <result property="factory" column="factory" jdbcType="VARCHAR"/>
+        <result property="director" column="director" jdbcType="VARCHAR"/>
+        <result property="dMobile" column="d_mobile" jdbcType="VARCHAR"/>
+        <result property="installTime" column="install_time" jdbcType="VARCHAR"/>
+        <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
+        <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,name,type,
+        id,name,type,disabled,
         factory,director,d_mobile,
         install_time,deleted,remark,dt
     </sql>
@@ -29,7 +30,9 @@
         from plt_production_line
         where  id = #{id,jdbcType=BIGINT} 
     </select>
-
+    <select id="selectNameByLineId" parameterType="java.lang.Long" resultType="String">
+        select name from plt_production_line where id = #{id}
+    </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from plt_production_line
         where  id = #{id,jdbcType=BIGINT} 
@@ -49,54 +52,57 @@
         insert into plt_production_line
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
-                <if test="name != null">name,</if>
-                <if test="type != null">type,</if>
-                <if test="factory != null">factory,</if>
-                <if test="director != null">director,</if>
-                <if test="dMobile != null">d_mobile,</if>
-                <if test="installTime != null">install_time,</if>
+                <if test="name != null and name !=''">name,</if>
+                <if test="type != null and type !=''">type,</if>
+                <if test="factory != null and factory !=''">factory,</if>
+                <if test="director != null and director !=''">director,</if>
+                <if test="dMobile != null and dMobile !=''">d_mobile,</if>
+                <if test="installTime != null and installTime !=''">install_time,</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="name != null">#{name,jdbcType=VARCHAR},</if>
-                <if test="type != null">#{type,jdbcType=VARCHAR},</if>
-                <if test="factory != null">#{factory,jdbcType=VARCHAR},</if>
-                <if test="director != null">#{director,jdbcType=VARCHAR},</if>
-                <if test="dMobile != null">#{dMobile,jdbcType=VARCHAR},</if>
-                <if test="installTime != null">#{installTime,jdbcType=VARCHAR},</if>
+                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
+                <if test="type != null and type !=''">#{type,jdbcType=VARCHAR},</if>
+                <if test="factory != null and factory !=''">#{factory,jdbcType=VARCHAR},</if>
+                <if test="director != null and director !=''">#{director,jdbcType=VARCHAR},</if>
+                <if test="dMobile != null and dMobile !=''">#{dMobile,jdbcType=VARCHAR},</if>
+                <if test="installTime != null and installTime !=''">#{installTime,jdbcType=VARCHAR},</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.pojoPlt.PltProductionLine">
         update plt_production_line
         <set>
-                <if test="name != null">
-                    name = #{name,jdbcType=VARCHAR},
-                </if>
-                <if test="type != null">
-                    type = #{type,jdbcType=VARCHAR},
-                </if>
-                <if test="factory != null">
-                    factory = #{factory,jdbcType=VARCHAR},
-                </if>
-                <if test="director != null">
-                    director = #{director,jdbcType=VARCHAR},
-                </if>
-                <if test="dMobile != null">
-                    d_mobile = #{dMobile,jdbcType=VARCHAR},
-                </if>
-                <if test="installTime != null">
-                    install_time = #{installTime,jdbcType=VARCHAR},
-                </if>
-                <if test="deleted != null">
-                    deleted = #{deleted,jdbcType=TINYINT},
-                </if>
-                <if test="remark != null">
-                    remark = #{remark,jdbcType=VARCHAR},
-                </if>
+            <if test="name != null and name !=''">
+                name = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="type != null and type !=''">
+                type = #{type,jdbcType=VARCHAR},
+            </if>
+            <if test="factory != null and factory !=''">
+                factory = #{factory,jdbcType=VARCHAR},
+            </if>
+            <if test="director != null and director !=''">
+                director = #{director,jdbcType=VARCHAR},
+            </if>
+            <if test="dMobile != null and dMobile !=''">
+                d_mobile = #{dMobile,jdbcType=VARCHAR},
+            </if>
+            <if test="installTime != null and installTime !=''">
+                install_time = #{installTime,jdbcType=VARCHAR},
+            </if>
+            <if test="disabled != null">
+                disabled = #{disabled},
+            </if>
+            <if test="deleted != null">
+                deleted = #{deleted,jdbcType=TINYINT},
+            </if>
+            <if test="remark != null and remark !=''">
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
         </set>
         where   id = #{id,jdbcType=BIGINT} 
     </update>
@@ -119,16 +125,16 @@
         <include refid="Base_Column_List" />
         from plt_production_line where deleted != 1
         <trim prefix="and" suffixOverrides="and">
-            <if test="name != null">
+            <if test="name != null and name !=''">
                 name like concat('%', #{name}, '%') and
             </if>
-            <if test="factory != null">
+            <if test="factory != null and factory !=''">
                 factory like concat('%', #{factory}, '%') and
             </if>
-            <if test="director != null">
+            <if test="director != null and director !=''">
                 director like concat('%', #{director}, '%') and
             </if>
-            <if test="dMobile != null">
+            <if test="dMobile != null and dMobile !=''">
                 d_mobile = #{dMobile,jdbcType=VARCHAR} and
             </if>
         </trim>
@@ -144,16 +150,16 @@
         select count(1)
         from plt_production_line where deleted != 1
         <trim prefix="and" suffixOverrides="and">
-            <if test="name != null">
+            <if test="name != null and name !=''">
                 name like concat('%', #{name}, '%') and
             </if>
-            <if test="factory != null">
+            <if test="factory != null and factory !=''">
                 factory like concat('%', #{factory}, '%') and
             </if>
-            <if test="director != null">
+            <if test="director != null and director !=''">
                 director like concat('%', #{director}, '%') and
             </if>
-            <if test="dMobile != null">
+            <if test="dMobile != null and dMobile !=''">
                 d_mobile = #{dMobile,jdbcType=VARCHAR} and
             </if>
         </trim>
@@ -164,6 +170,11 @@
             and id != #{id}
         </if>
     </select>
+    <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPlt.PltProductionLine">
+        select
+        <include refid="Base_Column_List" />
+        from plt_production_line where deleted != 1 and disabled != 1
+    </select>
 
     <update id="deleteLogicById" parameterType="java.lang.Long">
         update plt_production_line set deleted = 1

--
Gitblit v1.8.0