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/PltProductQualityInspectionItemsMapper.xml |  108 +++++++++++++++++++++++++-----------------------------
 1 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
index 5f127d2..1293f66 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
@@ -8,24 +8,25 @@
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="proId" column="pro_id" jdbcType="BIGINT"/>
         <result property="item" column="item" jdbcType="VARCHAR"/>
-        <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+        <result property="sort" column="sort" jdbcType="INTEGER"/>
+        <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
+        <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
         <association property="proName" column="pro_id" javaType="java.lang.Long"
-                     select="selectProNameById" fetchType="eager" />
+                     select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,pro_id,item,
+        id,pro_id,item,disabled,sort,
         deleted
     </sql>
-    <sql id="part_Column_List">
-        ${alias}.id,
-        ${alias}.pro_id,
-        ${alias}.item,
-        ${alias}.deleted
-    </sql>
-    <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
-        select name proName from plt_product where id=#{id}
-    </select>
+<!--    <sql id="part_Column_List">-->
+<!--        ${alias}.id,-->
+<!--        ${alias}.pro_id,-->
+<!--        ${alias}.item,-->
+<!--        ${alias}.sort,-->
+<!--        ${alias}.disabled,-->
+<!--        ${alias}.deleted-->
+<!--    </sql>-->
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
@@ -33,73 +34,62 @@
         where  id = #{id,jdbcType=BIGINT} 
     </select>
 
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-        delete from plt_product_quality_inspection_items
-        where  id = #{id,jdbcType=BIGINT} 
-    </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems" useGeneratedKeys="true">
-        insert into plt_product_quality_inspection_items
-        ( id,pro_id,item
-        ,deleted)
-        values (#{id,jdbcType=BIGINT},#{proId,jdbcType=BIGINT},#{item,jdbcType=VARCHAR}
-        ,#{deleted,jdbcType=TINYINT})
-    </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems" useGeneratedKeys="true">
         insert into plt_product_quality_inspection_items
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="id != null">id,</if>
-                <if test="proId != null">pro_id,</if>
-                <if test="item != null">item,</if>
-                <if test="deleted != null">deleted,</if>
+            <if test="id != null">id,</if>
+            <if test="proId != null">pro_id,</if>
+            <if test="item != null and item !=''">item,</if>
+            <if test="sort != null">sort,</if>
+            <if test="disabled != null">disabled,</if>
+            <if test="deleted != null">deleted,</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="item != null">#{item,jdbcType=VARCHAR},</if>
-                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
+            <if test="id != null">#{id,jdbcType=BIGINT},</if>
+            <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
+            <if test="item != null and item !=''">#{item,jdbcType=VARCHAR},</if>
+            <if test="sort != null">#{sort,jdbcType=INTEGER},</if>
+            <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
+            <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems">
         update plt_product_quality_inspection_items
         <set>
-                <if test="proId != null">
-                    pro_id = #{proId,jdbcType=BIGINT},
-                </if>
-                <if test="item != null">
-                    item = #{item,jdbcType=VARCHAR},
-                </if>
-                <if test="deleted != null">
-                    deleted = #{deleted,jdbcType=TINYINT},
-                </if>
+            <if test="proId != null">
+                pro_id = #{proId,jdbcType=BIGINT},
+            </if>
+            <if test="disabled != null">
+                disabled = #{disabled,jdbcType=BIGINT},
+            </if>
+            <if test="item != null and item !=''">
+                item = #{item,jdbcType=VARCHAR},
+            </if>
+            <if test="sort != null">
+                sort = #{sort,jdbcType=INTEGER},
+            </if>
         </set>
-        where   id = #{id,jdbcType=BIGINT} 
-    </update>
-    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems">
-        update plt_product_quality_inspection_items
-        set 
-            pro_id =  #{proId,jdbcType=BIGINT},
-            item =  #{item,jdbcType=VARCHAR},
-            deleted =  #{deleted,jdbcType=TINYINT}
         where   id = #{id,jdbcType=BIGINT} 
     </update>
 
     <select id="selectSome" resultMap="BaseResultMap">
         select
-        <include refid="part_Column_List" >
-            <property name="alias" value="t"/>
-        </include>
+        <include refid="Base_Column_List" />
         from plt_product_quality_inspection_items t
-        inner join plt_product p on t.pro_id = p.id
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
-            <if test="proName != null and proName != ''">
-                p.name like concat('%', #{proName}, '%') and
+            <if test="proId != null and proId != ''">
+                t.pro_id=#{proId} and
             </if>
             <if test="item != null  and item != ''">
                 t.item like concat('%', #{item}, '%') and
             </if>
+            <if test="disabled != null">
+                t.disabled != 1  and
+                <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
+            </if>
         </trim>
-        order by id desc
+        order by sort desc
         <trim prefix="limit " >
             <if test="start != null and count != null">
                 #{start}, #{count}
@@ -110,15 +100,17 @@
     <select id="selectSomeCount" resultType="java.lang.Long">
         select count(1)
         from plt_product_quality_inspection_items t
-        inner join plt_product p on t.pro_id = p.id
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
-            <if test="proName != null and proName != ''">
-                p.name like concat('%', #{proName}, '%') and
+            <if test="proId != null and proId != ''">
+                t.pro_id=#{proId} and
             </if>
             <if test="item != null  and item != ''">
                 t.item like concat('%', #{item}, '%') and
             </if>
+            <if test="disabled != null">
+                t.disabled != 1  and
+            </if>
         </trim>
     </select>
 

--
Gitblit v1.8.0