Commit cdf07ad4 by jiangxuming

fix(core): 修正查询条件及限制数量

parent eff9e3eb
......@@ -820,7 +820,7 @@
JOIN entrust e ON s.entrust_id = e.ID
where s.deleted = 0
AND i.deleted = 0 and e.deleted = 0 and ii.deleted = 0
ANd i.name = '电解质分子比' and i.status > 49
ANd i.name = '电解质分子比' and ii.name = '电解质-分子比' and i.status > 49
<if test="null != vo.slotNo">
AND s.slot_no LIKE CONCAT ('%',#{vo.slotNo},'%')
</if>
......@@ -828,10 +828,10 @@
AND s.sample_from LIKE CONCAT ('%',#{vo.sampleFrom},'%')
</if>
<if test="vo.testTimeBegin != null and vo.testTimeEnd != null">
AND date_trunc('day',i.test_time) between #{vo.testTimeBegin} and #{vo.testTimeEnd}
AND date_trunc('day',ii.ctime) between #{vo.testTimeBegin} and #{vo.testTimeEnd}
</if>
order by i.test_time desc
LIMIT 1000
LIMIT 10000
</select>
<update id="updateBatchByData" parameterType="java.util.List">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment