lims-ruoyi-after.git

			@@ -317,7 +317,7 @@
			order by send_time desc
			</select>

			<select id="selectIfsPage" resultType="com.ruoyi.basic.pojo.IfsInventoryQuantity">
			<select id="selectIfsPage" resultType="com.ruoyi.basic.vo.IfsInventoryQuantityVO">
			SELECT * from ifs_inventory_quantity ifs
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			${ew.customSqlSegment}
			@@ -334,7 +334,7 @@
			select * from (<include refid="getIfsOrder"/>
			<where>
			<if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
			send_time between #{beginDeclareDate} and #{endDeclareDate}
			declare_date between #{beginDeclareDate} and #{endDeclareDate}
			</if>
			</where>
			) a
			@@ -347,7 +347,7 @@
			select * from (<include refid="getIfsOrder"/>
			<where>
			<if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
			send_time between #{beginDeclareDate} and #{endDeclareDate}
			declare_date between #{beginDeclareDate} and #{endDeclareDate}
			</if>
			</where>
			) a
			@@ -360,7 +360,7 @@
			<where>
			and (quarter_order_id is not null)
			<if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
			and send_time between #{beginDeclareDate} and #{endDeclareDate}
			and declare_date between #{beginDeclareDate} and #{endDeclareDate}
			</if>
			</where>
			) a