|
@@ -54,10 +54,10 @@
|
|
and bom.data_id = #{dataId}
|
|
and bom.data_id = #{dataId}
|
|
</if>
|
|
</if>
|
|
<if test="applyMan != null and applyMan != ''">
|
|
<if test="applyMan != null and applyMan != ''">
|
|
- and bom.apply_man = #{applyMan}
|
|
|
|
|
|
+ and bom.apply_man like concat(concat('%',#{applyMan}),'%')
|
|
</if>
|
|
</if>
|
|
<if test="applyTimeStart != null">
|
|
<if test="applyTimeStart != null">
|
|
- and bom.apply_time <![CDATA[>=]]>; #{applyTimeStart}
|
|
|
|
|
|
+ and bom.apply_time <![CDATA[>=]]> #{applyTimeStart}
|
|
</if>
|
|
</if>
|
|
<if test="applyTimeEnd != null">
|
|
<if test="applyTimeEnd != null">
|
|
and bom.apply_time <![CDATA[<=]]> #{applyTimeEnd}
|
|
and bom.apply_time <![CDATA[<=]]> #{applyTimeEnd}
|
|
@@ -105,7 +105,7 @@
|
|
and bom.created_user_name = #{createdUserName}
|
|
and bom.created_user_name = #{createdUserName}
|
|
</if>
|
|
</if>
|
|
<if test="createdTimeStart != null">
|
|
<if test="createdTimeStart != null">
|
|
- and bom.created_time <![CDATA[>=]]>; #{createdTimeStart}
|
|
|
|
|
|
+ and bom.created_time <![CDATA[>=]]> #{createdTimeStart}
|
|
</if>
|
|
</if>
|
|
<if test="createdTimeEnd != null">
|
|
<if test="createdTimeEnd != null">
|
|
and bom.created_time <![CDATA[<=]]> #{createdTimeEnd}
|
|
and bom.created_time <![CDATA[<=]]> #{createdTimeEnd}
|
|
@@ -131,6 +131,12 @@
|
|
<if test="keyword != null and keyword != ''">
|
|
<if test="keyword != null and keyword != ''">
|
|
and bom.id like concat(concat('%',#{keyword}),'%')
|
|
and bom.id like concat(concat('%',#{keyword}),'%')
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="formType != null and formType != ''">
|
|
|
|
+ and bom.form_type = #{formType}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="formCategory != null and formCategory != ''">
|
|
|
|
+ and bom.form_category = #{formCategory}
|
|
|
|
+ </if>
|
|
</sql>
|
|
</sql>
|
|
<select id="selectList" parameterType="com.platform.dao.dto.custom.CustomFormBomDTO"
|
|
<select id="selectList" parameterType="com.platform.dao.dto.custom.CustomFormBomDTO"
|
|
resultType="com.platform.dao.vo.query.custom.CustomFormBomVO">
|
|
resultType="com.platform.dao.vo.query.custom.CustomFormBomVO">
|