diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/SCKbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/SCKbanController.java index cc36bb9..9656b28 100644 --- a/src/main/java/com/dsic/gj_erp/controller/kban/SCKbanController.java +++ b/src/main/java/com/dsic/gj_erp/controller/kban/SCKbanController.java @@ -31,8 +31,9 @@ public class SCKbanController { String end=DateUtil.endOfMonth(date).offsetNew(DateField.DAY_OF_YEAR,1).toString("yyyy/MM/dd"); List between = service.list(Wrappers.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)); } diff --git a/src/main/resources/mappers/jcsj/DmWlqdMapper.xml b/src/main/resources/mappers/jcsj/DmWlqdMapper.xml index dba2dc3..9e78a48 100644 --- a/src/main/resources/mappers/jcsj/DmWlqdMapper.xml +++ b/src/main/resources/mappers/jcsj/DmWlqdMapper.xml @@ -127,10 +127,10 @@ and DM_WLQD.dc_pl=#{dcpl} - and DM_WLQD.dc_pl>=#{dcpl} and DM_WLQD.dc_pl<#{dcpl1} + and DM_WLQD.dc_pl>=#{dcpl} and DM_WLQD.dc_pl<=#{dcpl1} - and DM_WLQD.dc_pl<#{dcpl1} + and DM_WLQD.dc_pl<=#{dcpl1} and DM_WLQD.DC_CH=#{dcch}