Pre Merge pull request !146 from reset/feature/cl

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

@@ -3,8 +3,11 @@ package com.engine.organization.service.impl;
 import com.api.browser.bean.SearchConditionGroup;
 import com.api.browser.bean.SearchConditionItem;
 import com.api.browser.bean.SearchConditionOption;
+import com.api.browser.util.ConditionType;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.core.impl.Service;
+import com.engine.email.util.EmailCommonCondition;
+import com.engine.email.util.EmailConditionItem;
 import com.engine.organization.component.OrganizationWeaTable;
 import com.engine.organization.entity.logview.param.LogViewSearchParam;
 import com.engine.organization.entity.logview.vo.LogViewVO;
@@ -46,27 +49,16 @@ public class LogViewServiceImpl extends Service implements LogViewService {
 
         // 操作者
         SearchConditionItem operatorId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者", "1", "operatorId", "");
-        // 操作时间
-        List<SearchConditionOption> selectOperateDate = new ArrayList<>();
+        //操作时间
+        SearchConditionItem dateItem = OrganizationFormItemUtil.dateItem(user,2,16,true,2,"操作时间","operateDate");
 
-        selectOperateDate.add(new SearchConditionOption("-1", "全部"));
-        selectOperateDate.add(new SearchConditionOption("1", "今天"));
-        selectOperateDate.add(new SearchConditionOption("2", "本周"));
-        selectOperateDate.add(new SearchConditionOption("3", "本月"));
-        selectOperateDate.add(new SearchConditionOption("4", "本季"));
-        selectOperateDate.add(new SearchConditionOption("5", "本年"));
-        selectOperateDate.add(new SearchConditionOption("7", "上个月"));
-        selectOperateDate.add(new SearchConditionOption("9", "上一季"));
-        selectOperateDate.add(new SearchConditionOption("8", "上一年"));
-        //selectOperateDate.add(new SearchConditionOption("6", "指定日期范围"));
-
-        SearchConditionItem operateDate = OrganizationFormItemUtil.selectItem(user, selectOperateDate, 2, 16, 6, false, "操作时间", "operateDate");
         // 操作者部门
         SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者部门", "161", "departmentId", "deptBrowser");
         // 操作者分部
         SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者分部", "161", "companyId", "compBrowser");
+
         conditionItems.add(operatorId);
-        conditionItems.add(operateDate);
+        conditionItems.add(dateItem);
         conditionItems.add(departmentId);
         conditionItems.add(companyId);
 

src/com/engine/organization/util/OrganizationFormItemUtil.java

@@ -237,7 +237,29 @@ public class OrganizationFormItemUtil {
 
 
     /**
-     * 日期
+     * 日期组合
+     * @param user
+     * @param colSpan
+     * @param fieldcol
+     * @param isQuickSearch
+     * @param viewAttr
+     * @param label
+     * @param name
+     * @return
+     */
+    public static SearchConditionItem dateItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
+                                                     int viewAttr, String label, String name) {
+        ConditionFactory conditionFactory = new ConditionFactory(user);
+        SearchConditionItem date = conditionFactory.createCondition(ConditionType.DATE, 502227, name);
+        date.setColSpan(colSpan);
+        date.setFieldcol(fieldcol);
+        date.setIsQuickSearch(isQuickSearch);
+        date.setViewAttr(viewAttr);
+        date.setLabel(label);
+        return date;
+    }
+
+    /**
      *
      * @param user
      * @param colSpan
@@ -260,6 +282,7 @@ public class OrganizationFormItemUtil {
         return datePicker;
     }
 
+
     public static SearchConditionItem dateGroupItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
                                                      int viewAttr, String label, String name) {
         ConditionFactory conditionFactory = new ConditionFactory(user);