Commit 106ecc89 by wuchengwu

质量抽查任务:任务新建以及抽样对象生成,查询条件修改

parent 9b360334
......@@ -85,6 +85,7 @@ public class ZlccController {
ryxxs.setCcdw(zlccrw.getLrdwdm().substring(0, 6));
ryxxs.setCjdwdm(user.getUnitcode());
} else {
ryxxs.setBz("0");
// ryxxs.setCcdw(user.getUnitcode().substring(0,6));
ryxxs.setCjdwdm(user.getUnitcode());
}
......
......@@ -24,7 +24,10 @@
</sql>
<select id="queryZlccrwPageCount" resultType="int" parameterType="map">
select count(*) from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND RWBZ = '1'
AND A.SCBZ = '0'
<if test="entity.bz != null and entity.bz != ''">
AND RWBZ = '1'
</if>
<include refid="queryWhere"/>
</select>
......@@ -44,7 +47,10 @@
A.BZ as bz,
A.CJSJ as cjsj
from AFIS_QUALITY_CCRW A where 1=1
AND A.SCBZ = '0' AND RWBZ = '1'
AND A.SCBZ = '0'
<if test="entity.bz != null and entity.bz != ''">
AND RWBZ = '1'
</if>
<include refid="queryWhere"/>
<![CDATA[ order by ${sort} ${order} ) a
WHERE ROWNUM <= #{ end } ) t
......
......@@ -399,7 +399,7 @@
pageNumber: 1,
loadFilter: function (data) {
count++;
if (data.rows.length == 0 && count < 2) {
if (data.rows.length < $('#ccfs').val() && count < 2) {
doQuery('0')
} else {
return data;
......
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