From fe2be017cfc5b16a231d79d4569d2d5b2f16efb7 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 14 Apr 2025 15:41:22 +0800 Subject: [PATCH] =?UTF-8?q?test=20=E6=97=A5=E6=9C=9F=E5=8C=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/service/impl/SchemeServiceImpl.java | 6 ++++++ .../engine/organization/util/OrganizationFormItemUtil.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 47d6a8e5..9fcb6e62 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -113,6 +113,12 @@ public class SchemeServiceImpl extends Service implements SchemeService { SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547131, "schemeNo"); conditionItems.add(schemeNameCondition); conditionItems.add(schemeNoCondition); + + + //测试 + SearchConditionItem dateCondition = OrganizationFormItemUtil.rangeDateItem(user, 2, 16, 2, "测试", "date1", "date2"); + conditionItems.add(dateCondition); + addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); apiDatas.put("conditions", addGroups); return apiDatas; diff --git a/src/com/engine/organization/util/OrganizationFormItemUtil.java b/src/com/engine/organization/util/OrganizationFormItemUtil.java index 31a28eac..f1976d15 100644 --- a/src/com/engine/organization/util/OrganizationFormItemUtil.java +++ b/src/com/engine/organization/util/OrganizationFormItemUtil.java @@ -239,7 +239,7 @@ public class OrganizationFormItemUtil { public static SearchConditionItem rangeDateItem(User user, int colSpan, int fieldcol, int viewAttr , String label, String name1, String name2) { ConditionFactory conditionFactory = new ConditionFactory(user); - SearchConditionItem rangeDate = conditionFactory.createCondition(ConditionType.TIMEPICKER, 502327, new String[]{name1, name2}); + SearchConditionItem rangeDate = conditionFactory.createCondition(ConditionType.RANGEPICKER, 502327, new String[]{name1, name2}); rangeDate.setColSpan(colSpan); rangeDate.setFieldcol(fieldcol); rangeDate.setViewAttr(viewAttr);