From c32eeed79c2f50a2a977bcf967982045e54e0321 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 9 May 2022 15:53:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=EF=BC=8Crules=E7=94=A8=E5=88=B0=E6=97=B6=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/SchemeService.java | 6 ++++++ .../service/impl/SchemeServiceImpl.java | 19 ++++++++++++++----- .../util/OrganizationFormItemUtil.java | 17 ++++------------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/com/engine/organization/service/SchemeService.java b/src/com/engine/organization/service/SchemeService.java index 62d8ad7e..3462ce29 100644 --- a/src/com/engine/organization/service/SchemeService.java +++ b/src/com/engine/organization/service/SchemeService.java @@ -68,4 +68,10 @@ public interface SchemeService { */ Map getSchemeForm(Map params); + /** + * 获取列表页面按钮信息 + * @return + */ + Map getTableBtn(); + } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index f865063e..33cdaf15 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -91,8 +91,8 @@ public class SchemeServiceImpl extends Service implements SchemeService { Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); - SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, "", 2, 16, 3, 50, "方案名称", "schemeName"); - SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, "", 2, 16, 3, 50, "方案编号", "schemeNo"); + SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "方案名称", "schemeName"); + SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "方案编号", "schemeNo"); conditionItems.add(schemeNameCondition); conditionItems.add(schemeNoCondition); addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); @@ -106,12 +106,14 @@ public class SchemeServiceImpl extends Service implements SchemeService { Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); - SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, "required", 2, 16, 3, 50, "方案名称", "schemeName"); - SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, "required", 2, 16, 3, 50, "方案编号", "schemeNo"); + SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "方案名称", "schemeName"); + schemeNameCondition.setRules("required"); + SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "方案编号", "schemeNo"); + schemeNoCondition.setRules("required"); SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "方案说明", "schemeDescription"); // 编辑状态下赋值操作 - String id = Util.null2String(params.get("locationid")); + String id = Util.null2String(params.get("id")); if (!StringUtil.isEmpty(id)) { SchemeMapper mapper = MapperProxyFactory.getProxy(SchemeMapper.class); SchemePO schemePO = mapper.getSchemeByID(Integer.parseInt(id)); @@ -129,6 +131,13 @@ public class SchemeServiceImpl extends Service implements SchemeService { return apiDatas; } + @Override + public Map getTableBtn() { + Map apiDatas = new HashMap<>(); + + return apiDatas; + } + /** * 查询条件 * diff --git a/src/com/engine/organization/util/OrganizationFormItemUtil.java b/src/com/engine/organization/util/OrganizationFormItemUtil.java index 2e420df5..548a91d9 100644 --- a/src/com/engine/organization/util/OrganizationFormItemUtil.java +++ b/src/com/engine/organization/util/OrganizationFormItemUtil.java @@ -69,14 +69,13 @@ public class OrganizationFormItemUtil { /** * 输入框数字 * @param user - * @param rules * @param colSpan * @param fieldcol * @param viewAttr * @param label * @return */ - public static SearchConditionItem inputNumberItem(User user,String rules,int colSpan, int fieldcol, + public static SearchConditionItem inputNumberItem(User user,int colSpan, int fieldcol, int viewAttr, String label,String name) { ConditionFactory conditionFactory = new ConditionFactory(user); SearchConditionItem inputnumber = conditionFactory.createCondition(ConditionType.INPUTNUMBER,502327, name); @@ -84,8 +83,6 @@ public class OrganizationFormItemUtil { inputnumber.setFieldcol(fieldcol); inputnumber.setViewAttr(viewAttr); inputnumber.setLabel(label); - inputnumber.setRules(rules); - return inputnumber; } @@ -93,7 +90,6 @@ public class OrganizationFormItemUtil { /** * 输入框文本 * @param user - * @param rules * @param colSpan * @param fieldcol * @param viewAttr @@ -101,7 +97,7 @@ public class OrganizationFormItemUtil { * @param label * @return */ - public static SearchConditionItem inputItem(User user,String rules,int colSpan, int fieldcol, + public static SearchConditionItem inputItem(User user,int colSpan, int fieldcol, int viewAttr,int length, String label,String name) { ConditionFactory conditionFactory = new ConditionFactory(user); SearchConditionItem input = conditionFactory.createCondition(ConditionType.INPUT,25034, name); @@ -110,7 +106,6 @@ public class OrganizationFormItemUtil { input.setViewAttr(viewAttr); input.setLength(length); input.setLabel(label); - input.setRules(rules); return input; } @@ -122,12 +117,11 @@ public class OrganizationFormItemUtil { * @param viewAttr * @param isQuickSearch * @param label - * @param rules * @param type * @return */ public static SearchConditionItem browserItem(User user,int colSpan, int fieldcol, - int viewAttr,boolean isQuickSearch,String label,String rules,String type,String name) { + int viewAttr,boolean isQuickSearch,String label,String type,String name) { ConditionFactory conditionFactory = new ConditionFactory(user); SearchConditionItem browser = conditionFactory.createCondition(ConditionType.BROWSER,502327,name,type); browser.setColSpan(colSpan); @@ -135,7 +129,6 @@ public class OrganizationFormItemUtil { browser.setViewAttr(viewAttr); browser.setIsQuickSearch(isQuickSearch); browser.setLabel(label); - browser.setRules(rules); return browser; } @@ -147,18 +140,16 @@ public class OrganizationFormItemUtil { * @param fieldcol * @param viewAttr * @param label - * @param rules * @return */ public static SearchConditionItem rangeDateItem(User user,int colSpan, int fieldcol,int viewAttr - ,String label,String rules,String name1,String name2) { + ,String label,String name1,String name2) { ConditionFactory conditionFactory = new ConditionFactory(user); SearchConditionItem rangeDate = conditionFactory.createCondition(ConditionType.TIMEPICKER,502327,new String[]{name1,name2}); rangeDate.setColSpan(colSpan); rangeDate.setFieldcol(fieldcol); rangeDate.setViewAttr(viewAttr); rangeDate.setLabel(label); - rangeDate.setRules(rules); return rangeDate; }