From 14b0417bca9050a11792248f5c5c7e7c86e4744f Mon Sep 17 00:00:00 2001 From: 刘小明 <liuxm_a@163.com> Date: 星期三, 21 八月 2024 16:47:45 +0800 Subject: [PATCH] 排班功能 --- pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 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 02f66a5..7df4e08 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml +++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml @@ -12,24 +12,21 @@ <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,disabled,sort, deleted </sql> - <sql id="part_Column_List"> - ${alias}.id, - ${alias}.pro_id, - ${alias}.item, - ${alias}.sort, - ${alias}.disabled, - ${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" /> @@ -87,6 +84,10 @@ <if test="item != null and item != ''"> t.item like concat('%', #{item}, '%') and </if> + <if test="disabled != null and disabled != ''"> + t.disabled != 1 and + <!--FIND_IN_SET(t.disabled, #{disabled}) and--> + </if> </trim> order by sort desc <trim prefix="limit " > @@ -107,6 +108,9 @@ <if test="item != null and item != ''"> t.item like concat('%', #{item}, '%') and </if> + <if test="disabled != null and disabled != ''"> + t.disabled != 1 and + </if> </trim> </select> -- Gitblit v1.8.0