|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
package com.engine.organization.service;
|
|
|
|
|
package com.engine.organization.service.impl;
|
|
|
|
|
|
|
|
|
|
import com.api.browser.bean.SearchConditionGroup;
|
|
|
|
|
import com.api.browser.bean.SearchConditionItem;
|
|
|
|
@ -8,6 +8,7 @@ import com.engine.core.impl.Service;
|
|
|
|
|
import com.engine.organization.component.OrganizationWeaTable;
|
|
|
|
|
import com.engine.organization.entity.logview.param.LogViewSearchParam;
|
|
|
|
|
import com.engine.organization.entity.logview.vo.LogViewVO;
|
|
|
|
|
import com.engine.organization.service.LogViewService;
|
|
|
|
|
import com.engine.organization.util.OrganizationFormItemUtil;
|
|
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
|
|
import weaver.general.TimeUtil;
|
|
|
|
@ -65,30 +66,10 @@ public class LogViewServiceImpl extends Service implements LogViewService {
|
|
|
|
|
SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者部门", "161", "departmentId", "deptBrowser");
|
|
|
|
|
// 操作者分部
|
|
|
|
|
SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者分部", "161", "companyId", "compBrowser");
|
|
|
|
|
// 操作模块
|
|
|
|
|
//List<SearchConditionOption> selectOperateModule = new ArrayList<>();
|
|
|
|
|
//
|
|
|
|
|
//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("6", "职务管理"));
|
|
|
|
|
//selectOperateDate.add(new SearchConditionOption("7", "集团管理"));
|
|
|
|
|
//selectOperateDate.add(new SearchConditionOption("8", "分部管理"));
|
|
|
|
|
//selectOperateDate.add(new SearchConditionOption("9", "部门管理"));
|
|
|
|
|
//selectOperateDate.add(new SearchConditionOption("10", "岗位管理"));
|
|
|
|
|
//selectOperateDate.add(new SearchConditionOption("11", "人员管理"));
|
|
|
|
|
//selectOperateDate.add(new SearchConditionOption("12", "编制方案"));
|
|
|
|
|
//selectOperateDate.add(new SearchConditionOption("13", "编制上报"));
|
|
|
|
|
//selectOperateDate.add(new SearchConditionOption("99", "其他模块"));
|
|
|
|
|
//SearchConditionItem operateModule = OrganizationFormItemUtil.selectItem(user, selectOperateModule, 2, 16, 6, false, "操作模块", "operateModule");
|
|
|
|
|
conditionItems.add(operatorId);
|
|
|
|
|
conditionItems.add(operateDate);
|
|
|
|
|
conditionItems.add(departmentId);
|
|
|
|
|
conditionItems.add(companyId);
|
|
|
|
|
//conditionItems.add(operateModule);
|
|
|
|
|
|
|
|
|
|
addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
|
|
|
|
|
apiDatas.put("conditions", addGroups);
|
|
|
|
@ -125,9 +106,6 @@ public class LogViewServiceImpl extends Service implements LogViewService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//if (StringUtils.isNotBlank(param.getOperateModule()) && !"-1".equals(param.getOperateModule())) {
|
|
|
|
|
// sqlWhere += " and operate_module = '" + param.getOperateModule() + "'";
|
|
|
|
|
//}
|
|
|
|
|
return sqlWhere;
|
|
|
|
|
}
|
|
|
|
|
}
|