diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java index d315dc0..a3bb3dc 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java @@ -95,6 +95,7 @@ public class DmYdjhController { .eq(StrUtil.isNotEmpty(map.get("dcch")),"dc_ch",map.get("dcch")) .eq(StrUtil.isNotEmpty(map.get("dcpl")),"dc_pl",map.get("dcpl")) .eq("lx","B") + .and(wp->wp.ne("zt", "-1").or().ne("zt","99")) .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb") ); diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 60b112e..a29f3a1 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -862,7 +862,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl} SUM(CASE WHEN ISNULL(dm_ydjh.ylbs, 'N') = 'Y' THEN 1 ELSE 0 END) AS ylbs FROM dm_ydjh - where 1=1 AND lx='B' and isnull(dm_ydjh.zt,'') != '-1' + where 1=1 AND lx='B' and ( isnull(dm_ydjh.zt,'') != '-1' or isnull(dm_ydjh.zt,'') !='99' ) and dm_ydjh.dc_ch=#{dcCh}