1.修复由于ylbs缺失导致看板与查询统计结果不一致的问题

2.修复零件配套表批量范围查询bug
master
董哲奇 3 weeks ago
parent fe64550350
commit 20b88f9a4f

@ -31,8 +31,9 @@ public class SCKbanController {
String end=DateUtil.endOfMonth(date).offsetNew(DateField.DAY_OF_YEAR,1).toString("yyyy/MM/dd");
List<DmYdjh> between = service.list(Wrappers.<DmYdjh>lambdaQuery()
.select(DmYdjh::getKw,DmYdjh::getQgfkrq,DmYdjh::getZyq1,DmYdjh::getBcshzl,DmYdjh::getQgjhrq)
.between(DmYdjh::getQgfkrq, begin, end)
.or(it->it.between(DmYdjh::getQgjhrq,begin,end))
.eq(DmYdjh::getYlbs,"N").and(it->
it.between(DmYdjh::getQgfkrq, begin, end).or().between(DmYdjh::getQgjhrq,begin,end)
)
);
return new ResultBean<>(JSONArray.toJSONString(between));
}

@ -127,10 +127,10 @@
and DM_WLQD.dc_pl=#{dcpl}
</if>
<if test=" dcpl!=null and dcpl!='' and dcpl1!=null and dcpl1!=''">
and DM_WLQD.dc_pl>=#{dcpl} and DM_WLQD.dc_pl&lt;#{dcpl1}
and DM_WLQD.dc_pl>=#{dcpl} and DM_WLQD.dc_pl&lt;=#{dcpl1}
</if>
<if test=" (dcpl==null or dcpl=='') and dcpl1!=null and dcpl1!=''">
and DM_WLQD.dc_pl&lt;#{dcpl1}
and DM_WLQD.dc_pl&lt;=#{dcpl1}
</if>
<if test=" dcch!=null and dcch!=''">
and DM_WLQD.DC_CH=#{dcch}

Loading…
Cancel
Save