liang.cheng
/
weaver-hrm-organization
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!144 记录操作日志

Browse Source 
Merge pull request !144 from dxfeng/feature/dxf
pull/145/MERGE
dxfeng 3 years ago committed by Gitee
parent 5f779e9bc4 cca52d7080
commit 8410a9d77f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 81 additions and 19 deletions
Show Stats Download Patch File Download Diff File

5
src/com/engine/organization/entity/logview/vo/LogViewVO.java
Unescape Escape View File

@ -19,7 +19,7 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
@OrganizationTable(pageId = "caef4d3e-fc3d-11ec-a203-00e04c680716",
fields = "t.id, t.operator_name, t.create_time, t.operate_type, t.client_ip, t.operate_module_name",
fields = "t.id, t.operator_name, t.create_time, t.operate_type, t.client_ip, t.operate_module_name,t.operate_desc",
fromSql = "FROM hr_log t ",
primarykey = "id",
tableType = WeaTableType.NONE
@ -35,6 +35,9 @@ public class LogViewVO {
@OrganizationTableColumn(text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType")
private String operateType;
@OrganizationTableColumn(text = "操作描述", width = "16%", column = "operate_desc")
private String operateDesc;
@OrganizationTableColumn(text = "所属模块", width = "16%", column = "operate_module_name")
private String operateModuleName;

16
src/com/engine/organization/service/impl/JobServiceImpl.java
Unescape Escape View File

@ -245,7 +245,7 @@ public class JobServiceImpl extends Service implements JobService {
List<ExtendTitlePO> extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID);
if (CollectionUtils.isNotEmpty(extendTitles)) {
for (ExtendTitlePO extendTitle : extendTitles) {
List<SearchConditionItem> items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue(), "scheme_id");
List<SearchConditionItem> items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue(), "scheme_id", "parent_comp");
if (CollectionUtils.isNotEmpty(items)) {
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items));
}
@ -275,7 +275,7 @@ public class JobServiceImpl extends Service implements JobService {
List<ExtendTitlePO> extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID);
if (CollectionUtils.isNotEmpty(extendTitles)) {
for (ExtendTitlePO extendTitle : extendTitles) {
List<SearchConditionItem> items = getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_JOB : JCL_ORG_JOBEXT, viewAttr, id, extendTitle.getId().toString(), "scheme_id");
List<SearchConditionItem> items = getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_JOB : JCL_ORG_JOBEXT, viewAttr, id, extendTitle.getId().toString(), "scheme_id", "parent_comp");
if (CollectionUtils.isNotEmpty(items)) {
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items));
}
@ -309,6 +309,7 @@ public class JobServiceImpl extends Service implements JobService {
JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class);
params.put("is_key", null == searchParam.getIsKey() ? 0 : searchParam.getIsKey());
// TODO 处理ec表关联关系
DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
params.put("parent_comp", departmentPO.getParentComp());
if (StringUtils.isBlank(params.get("show_order").toString())) {
@ -348,22 +349,13 @@ public class JobServiceImpl extends Service implements JobService {
// 更新主表数据
params.put("is_key", searchParam.getIsKey());
// TODO 处理ec表关联关系
DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
params.put("parent_comp", departmentPO.getParentComp());
getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId());
// 更新主表拓展表
getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, groupId, searchParam.getId());
// 更新明细表
getJobDTMapper().deleteByIds(searchParam.getId());
int rowNum = Util.getIntValue((String) params.get("rownum"));
for (int i = 0; i < rowNum; i++) {
String levelId = (String) params.get("levelId_" + i);
String gradeId = (String) params.get("gradeId_" + i);
String levelIdspan = (String) params.get("levelIdspan_" + i);
String gradeIdspan = (String) params.get("gradeIdspan_" + i);
getJobDTMapper().insertIgnoreNull(JobDTPO.builder().levelId(levelId).gradeId(gradeId).levelIdspan(levelIdspan).gradeIdspan(gradeIdspan).mainId(searchParam.getId()).creator((long) user.getUID()).deleteType(0).createTime(new Date()).updateTime(new Date()).build());
}
getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_JOBEXT_DT1, params, searchParam.getId());
return searchParam.getId();
}

11
src/com/engine/organization/service/impl/LogViewServiceImpl.java
Unescape Escape View File

@ -31,6 +31,8 @@ public class LogViewServiceImpl extends Service implements LogViewService {
OrganizationWeaTable<LogViewVO> table = new OrganizationWeaTable<>(user, LogViewVO.class);
String sqlWhere = buildSqlWhere(param);
table.setSqlwhere(sqlWhere);
System.out.println("----------------------------");
System.out.println(sqlWhere);
WeaResultMsg result = new WeaResultMsg(false);
result.putAll(table.makeDataResult());
result.success();
@ -60,12 +62,15 @@ public class LogViewServiceImpl extends Service implements LogViewService {
selectOperateDate.add(new SearchConditionOption("8", "上一年"));
selectOperateDate.add(new SearchConditionOption("6", "指定日期范围"));
SearchConditionItem operateDate = OrganizationFormItemUtil.selectItem(user, selectOperateDate, 2, 16, 6, false, "操作时间", "operateDate");
SearchConditionItem operateDate = OrganizationFormItemUtil.selectItem(user, selectOperateDate, 2, 16, 6, false, "操作时间", "operateDate");
operateDate.setDateGroup(true);
//SearchConditionItem operateDate = OrganizationFormItemUtil.dateGroupItem(user, 2, 16, false, 2, "操作时间","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(operateDate);
conditionItems.add(operatorId);
conditionItems.add(operateDate);
conditionItems.add(departmentId);
@ -100,8 +105,8 @@ public class LogViewServiceImpl extends Service implements LogViewService {
}
if (StringUtils.isNotBlank(param.getOperateDate()) && !"-1".equals(param.getOperateDate())) {
if (!"6".equals(param.getOperateDate())) {
sqlWhere += " and create_time >= '" + TimeUtil.getDateByOption(param.getOperateDate() + "", "0") + "'";
sqlWhere += " and create_time <= '" + TimeUtil.getDateByOption(param.getOperateDate() + "", "") + "'";
sqlWhere += " and create_time >= '" + TimeUtil.getDateByOption(param.getOperateDate() + "", "0") + " 00:00:00'";
sqlWhere += " and create_time <= '" + TimeUtil.getDateByOption(param.getOperateDate() + "", "") + " 23:59:59'";
} else {
if (StringUtils.isNotBlank(param.getStartDate())) {
sqlWhere += " and create_time >= '" + param.getStartDate() + "'";

2
src/com/engine/organization/service/impl/StaffServiceImpl.java
Unescape Escape View File

@ -202,7 +202,7 @@ public class StaffServiceImpl extends Service implements StaffService {
selectOptions.add(option1);
selectOptions.add(option2);
selectOptions.add(option3);
SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "控制策略", "controlPolicy");
SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, true, "控制策略", "controlPolicy");
controlPolicyItem.setViewAttr(3);
controlPolicyItem.setRules("required|string");
SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "描述说明", "description");

1
src/com/engine/organization/transmethod/LogViewTransMethod.java
Unescape Escape View File

@ -25,6 +25,7 @@ public class LogViewTransMethod {
default:
break;
}
return operateType;
}
return "";
}

56
src/com/engine/organization/util/OrganizationFormItemUtil.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.api.browser.util.ConditionFactory;
import com.api.browser.util.ConditionType;
import weaver.hrm.User;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -259,5 +260,60 @@ 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);
SearchConditionItem dateGroup = conditionFactory.createCondition(ConditionType.DATEGROUP, 502227, name);
dateGroup.setColSpan(colSpan);
dateGroup.setFieldcol(fieldcol);
dateGroup.setIsQuickSearch(isQuickSearch);
dateGroup.setViewAttr(viewAttr);
dateGroup.setLabel(label);
List<Object> datas = new ArrayList<>();
datas.add(new DateGroupData("全部","0"));
datas.add(new DateGroupData("今天","1"));
datas.add(new DateGroupData("本周","2"));
datas.add(new DateGroupData("本月","3"));
datas.add(new DateGroupData("本季","4"));
datas.add(new DateGroupData("本年","5"));
datas.add(new DateGroupData("上个月","7"));
datas.add(new DateGroupData("上一年","8"));
datas.add(new DateGroupData("指定日期范围","6"));
List<Object> selectOperateDate = 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("7", "上个月"));
selectOperateDate.add(new SearchConditionOption("9", "上一季"));
selectOperateDate.add(new SearchConditionOption("8", "上一年"));
selectOperateDate.add(new SearchConditionOption("6", "指定日期范围"));
dateGroup.setDatas(selectOperateDate);
dateGroup.setValue(new ArrayList<>());
dateGroup.setDateGroup(true);
return dateGroup;
}
static class DateGroupData{
private String name;
private String value;
public DateGroupData(String name, String value) {
this.name = name;
this.value = value;
}
public String getName() {
return name;
}
public String getValue() {
return value;
}
}
}

9
src/com/engine/organization/web/LogViewController.java
Unescape Escape View File

@ -1,10 +1,12 @@
package com.engine.organization.web;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.logview.param.LogViewSearchParam;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.LogViewWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
@ -15,6 +17,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.Map;
/**
* @author:dxfeng
@ -30,9 +33,11 @@ public class LogViewController {
@GET
@Path("/listPage")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult listPage(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LogViewSearchParam params) {
public ReturnResult listPage(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
User user = HrmUserVarify.getUser(request, response);
Map<String, Object> map = ParamUtil.request2Map(request);
LogViewSearchParam params = JSONObject.toJavaObject((JSON) JSON.toJSON(map), LogViewSearchParam.class);
return ReturnResult.successed(getLogViewWrapper(user).listPage(params));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);

Write Preview
Loading…
Cancel
Save