快捷搜索条件表单

src/com/engine/organization/entity/search/condition/RangeCondition.java

@@ -21,7 +21,7 @@ public class RangeCondition {
     private String label;
     private List<ConditionOption> options;
     private List<String> domkey;
-    private List<Map<String, Object>> selectLinkageDatas;
+    private Map<String, Object> selectLinkageDatas;
     private Integer labelcol;
     private Integer fieldcol;
 

src/com/engine/organization/service/impl/QuickSearchServiceImpl.java

@@ -42,6 +42,14 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
     @Override
     public Map<String, Object> getQuickSearchCondition(Map<String, Object> params) {
         Map<String, Object> apiDatas = new HashMap<>(16);
+
+        QuickSearchSetting quickSearchSetting = getQuickSearchMapper().getQuickSearchSetting(user.getUID());
+        if (null != quickSearchSetting) {
+            apiDatas.put("enable", Util.null2String(quickSearchSetting.getIsQuickSearch()));
+        } else {
+            apiDatas.put("enable", "0");
+        }
+
         List<Object> rangeConditions = new ArrayList<>();
 
         List<QuickSearchCondition> quickSearchConditionList = getQuickSearchMapper().getQuickSearchConditionList(user.getUID(), LogModuleNameEnum.RESOURCE.getValue());
@@ -58,7 +66,9 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
                     // 字段本身值、判断有无下拉框选项
                     if ("4".equals(formField.getFieldHtmlType()) || "5".equals(formField.getFieldHtmlType())) {
                         List<JclSelectItem> selectItemListByFieldId = getQuickSearchMapper().getSelectItemListByFieldId(quickSearchCondition.getFieldId());
-                        condition.setOptions(selectItemListByFieldId.stream().map(item -> ConditionOption.builder().key(item.getSelectValue()).showname(item.getSelectName()).build()).collect(Collectors.toList()));
+                        List<ConditionOption> options = selectItemListByFieldId.stream().map(item -> ConditionOption.builder().key(item.getSelectValue()).showname(item.getSelectName()).build()).collect(Collectors.toList());
+                        options.add(ConditionOption.builder().key("-1").showname("全部").build());
+                        condition.setOptions(options);
                         rangeConditions.add(condition);
                     } else {
 
@@ -82,7 +92,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
                     map.put("conditionType", "RANGEPICKER");
                     map.put("domkey", Arrays.asList("start", "end"));
                     selectLinkageDataMap.put("1", map);
-                    condition.setSelectLinkageDatas(Collections.singletonList(selectLinkageDataMap));
+                    condition.setSelectLinkageDatas(selectLinkageDataMap);
                     rangeConditions.add(condition);
                     break;
                 case 1: