diff --git a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java index 0be0953..e29830d 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java @@ -37,6 +37,14 @@ public abstract class RangeDateUtils { * 多选结尾标志 */ public static final String MULTIPLE_SELECT = "Multiple"; + /** + * 判断是否需要分组 + */ + public static final String CHARGE_ITEM = "收费科目"; + /** + * 是否抄表 + */ + public static final String IS_METER_READING = "Y"; /** * 构造样式 diff --git a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SelectInputComponent.java b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SelectInputComponent.java index 2e97e17..e58dcdf 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SelectInputComponent.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SelectInputComponent.java @@ -37,7 +37,7 @@ public class SelectInputComponent extends InputComponent { String name=getBindParameter(); Object pvalue=context.getParameter(name)==null ? "" : context.getParameter(name); StringBuilder sb=new StringBuilder(); - sb.append(""); return sb.toString(); } diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RangeDateUtils.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RangeDateUtils.class index 382250b..5e1d7a5 100644 Binary files a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RangeDateUtils.class and b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RangeDateUtils.class differ diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class index 253b883..47e9ccd 100644 Binary files a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class and b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class differ diff --git a/ureport2-core/target/maven-archiver/pom.properties b/ureport2-core/target/maven-archiver/pom.properties index dab600c..ca3b724 100644 --- a/ureport2-core/target/maven-archiver/pom.properties +++ b/ureport2-core/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Jul 08 10:44:50 CST 2020 +#Thu Jul 09 09:38:18 CST 2020 version=2.2.9 groupId=com.bstek.ureport artifactId=ureport2-core diff --git a/ureport2-core/target/ureport2-core-2.2.9-sources.jar b/ureport2-core/target/ureport2-core-2.2.9-sources.jar index 188f242..29a9a8c 100644 Binary files a/ureport2-core/target/ureport2-core-2.2.9-sources.jar and b/ureport2-core/target/ureport2-core-2.2.9-sources.jar differ diff --git a/ureport2-core/target/ureport2-core-2.2.9.jar b/ureport2-core/target/ureport2-core-2.2.9.jar index b4fa8cf..fd09cd8 100644 Binary files a/ureport2-core/target/ureport2-core-2.2.9.jar and b/ureport2-core/target/ureport2-core-2.2.9.jar differ