diff --git a/gl/src/public/nccloud/dto/gl/lightgl/VoucherQueryVO.java b/gl/src/public/nccloud/dto/gl/lightgl/VoucherQueryVO.java index 1b12f0c..737a8a5 100644 --- a/gl/src/public/nccloud/dto/gl/lightgl/VoucherQueryVO.java +++ b/gl/src/public/nccloud/dto/gl/lightgl/VoucherQueryVO.java @@ -73,7 +73,7 @@ public class VoucherQueryVO { private String offervoucher = "0"; private String busidate; private String[] pk_liabilitycenter; - private String freevalue1;//客商名称 + private String freevalue1;// public VoucherQueryVO() { } @@ -528,6 +528,17 @@ public class VoucherQueryVO { if (this.oriamount != null && (!StringUtil.isEmptyWithTrim(this.oriamount.getFirstAmount()) || !StringUtil.isEmptyWithTrim(this.oriamount.getSecondAmount()))) { conditions.addAll(this.getAmountConditions(this.oriamount, "0")); } +/* if(this.freevalue1 == null){ + this.freevalue1 = "̩"; + }*/ + if(this.freevalue1 != null ){ + StringBuffer sqlBuff = new StringBuffer(); + sqlBuff.append(" RTRIM(gl_dtlfreevalue.FREEVALUE1) LIKE '%" + this.freevalue1 + "%' "); + sqlBuff.append(" or "); + sqlBuff.append(" RTRIM(gl_dtlfreevalue.FREEVALUE1) "); + QueryElementVO tempvo = this.creatQueryElemVO("String", "and", sqlBuff.toString(), "=", new String[]{"%" + this.freevalue1 + "%"}); + conditions.add(tempvo); + } if (this.amount != null && (!StringUtil.isEmptyWithTrim(this.amount.getFirstAmount()) || !StringUtil.isEmptyWithTrim(this.amount.getSecondAmount()))) { conditions.addAll(this.getAmountConditions(this.amount, this.amountType));