From 2702b175cd464615feba72754566447a71c10c1a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 6 Jul 2022 15:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/logview/vo/LogViewVO.java | 4 +-- .../service/impl/HrmResourceServiceImpl.java | 4 +-- .../service/impl/LogViewServiceImpl.java | 29 +++++++++++++------ .../transmethod/LogViewTransMethod.java | 2 +- .../util/OrganizationFormItemUtil.java | 14 +-------- .../organization/wrapper/CompWrapper.java | 10 +++---- .../wrapper/DepartmentWrapper.java | 10 +++---- .../organization/wrapper/GradeWrapper.java | 8 ++--- 8 files changed, 40 insertions(+), 41 deletions(-) diff --git a/src/com/engine/organization/entity/logview/vo/LogViewVO.java b/src/com/engine/organization/entity/logview/vo/LogViewVO.java index fd896b85..ade133d8 100644 --- a/src/com/engine/organization/entity/logview/vo/LogViewVO.java +++ b/src/com/engine/organization/entity/logview/vo/LogViewVO.java @@ -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,t.operate_desc", + fields = "t.id, t.operator_name, t.create_time, t.operate_type, t.client_ip, t.operate_module_name,t.operate_desc,t.message", fromSql = "FROM hr_log t ", primarykey = "id", tableType = WeaTableType.NONE @@ -41,7 +41,7 @@ public class LogViewVO { @OrganizationTableColumn(text = "所属模块", width = "16%", column = "operate_module_name") private String operateModuleName; - @OrganizationTableColumn(text = "修改详情", width = "16%") + @OrganizationTableColumn(text = "修改详情", width = "16%",column = "message") private String showDetail; @OrganizationTableColumn(text = "操作IP", width = "16%", column = "client_ip") diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index be95ef94..c58aa7aa 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -234,10 +234,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build()); - topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build()); + //topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build()); btnDatas.put("topMenu", topMenuList); rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build()); - rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build()); + //rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build()); rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build()); btnDatas.put("rightMenu", rightMenuList); return btnDatas; diff --git a/src/com/engine/organization/service/impl/LogViewServiceImpl.java b/src/com/engine/organization/service/impl/LogViewServiceImpl.java index f030654b..fcb5ef2f 100644 --- a/src/com/engine/organization/service/impl/LogViewServiceImpl.java +++ b/src/com/engine/organization/service/impl/LogViewServiceImpl.java @@ -31,8 +31,6 @@ public class LogViewServiceImpl extends Service implements LogViewService { OrganizationWeaTable 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,17 +58,13 @@ public class LogViewServiceImpl extends Service implements LogViewService { 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"); - operateDate.setDateGroup(true); - //SearchConditionItem operateDate = OrganizationFormItemUtil.dateGroupItem(user, 2, 16, false, 2, "操作时间","operateDate"); + //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(operateDate); conditionItems.add(operatorId); conditionItems.add(operateDate); conditionItems.add(departmentId); @@ -86,12 +80,29 @@ public class LogViewServiceImpl extends Service implements LogViewService { return null; } + 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; + } + } private String buildSqlWhere(LogViewSearchParam param) { if (null == param) { return ""; } String sqlWhere = " where delete_type = 0 "; - if(StringUtils.isNotBlank(param.getModuleType())){ + if (StringUtils.isNotBlank(param.getModuleType())) { sqlWhere += " and operate_module = '" + param.getModuleType() + "'"; } if (null != param.getOperatorId()) { diff --git a/src/com/engine/organization/transmethod/LogViewTransMethod.java b/src/com/engine/organization/transmethod/LogViewTransMethod.java index 96a004fc..0a89ae48 100644 --- a/src/com/engine/organization/transmethod/LogViewTransMethod.java +++ b/src/com/engine/organization/transmethod/LogViewTransMethod.java @@ -19,7 +19,7 @@ public class LogViewTransMethod { case "2": operateType = OperateTypeEnum.UPDATE.getLabel(); break; - case "3": + case "4": operateType = OperateTypeEnum.DELETE.getLabel(); break; default: diff --git a/src/com/engine/organization/util/OrganizationFormItemUtil.java b/src/com/engine/organization/util/OrganizationFormItemUtil.java index 14aa2824..07f3f6f4 100644 --- a/src/com/engine/organization/util/OrganizationFormItemUtil.java +++ b/src/com/engine/organization/util/OrganizationFormItemUtil.java @@ -279,19 +279,7 @@ public class OrganizationFormItemUtil { datas.add(new DateGroupData("上个月","7")); datas.add(new DateGroupData("上一年","8")); datas.add(new DateGroupData("指定日期范围","6")); - List 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.setDatas(datas); dateGroup.setValue(new ArrayList<>()); dateGroup.setDateGroup(true); return dateGroup; diff --git a/src/com/engine/organization/wrapper/CompWrapper.java b/src/com/engine/organization/wrapper/CompWrapper.java index 13c6ab43..6d48c958 100644 --- a/src/com/engine/organization/wrapper/CompWrapper.java +++ b/src/com/engine/organization/wrapper/CompWrapper.java @@ -49,7 +49,7 @@ public class CompWrapper extends OrganizationWrapper { public Long saveBaseComp(Map params) { Long companyId = getCompService(user).saveBaseComp(params); writeOperateLog(new Object() { - }.getClass(), "新增分部【" + JSON.toJSONString(params) + "】"); + }.getClass(), JSON.toJSONString(params)); return companyId; } @@ -62,7 +62,7 @@ public class CompWrapper extends OrganizationWrapper { public int updateForbiddenTagById(CompSearchParam params) { int updateForbiddenTagById = getCompService(user).updateForbiddenTagById(params); writeOperateLog(new Object() { - }.getClass(), "更新分部禁用标识【" + JSON.toJSONString(params) + "】"); + }.getClass(), JSON.toJSONString(params)); return updateForbiddenTagById; } @@ -76,7 +76,7 @@ public class CompWrapper extends OrganizationWrapper { public Long updateComp(Map params) { Long companyId = getCompService(user).updateComp(params); writeOperateLog(new Object() { - }.getClass(), "更新分部信息【" + JSON.toJSONString(params) + "】"); + }.getClass(), JSON.toJSONString(params)); return companyId; } @@ -89,7 +89,7 @@ public class CompWrapper extends OrganizationWrapper { public int deleteByIds(Collection ids) { int deleteByIds = getCompService(user).deleteByIds(ids); writeOperateLog(new Object() { - }.getClass(), "删除分部信息，删除数据ID【" + JSON.toJSONString(ids) + "】"); + }.getClass(), JSON.toJSONString(ids)); return deleteByIds; } @@ -103,7 +103,7 @@ public class CompWrapper extends OrganizationWrapper { public int moveCompany(DepartmentMoveParam moveParam) { int moveCompany = getCompService(user).moveCompany(moveParam); writeOperateLog(new Object() { - }.getClass(), "转移分部,分部ID【" + moveParam.getId() + "】,目标分部ID【" + moveParam.getCompany() + "】"); + }.getClass(), JSON.toJSONString(moveParam)); return moveCompany; } diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index cc435465..208429c0 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -87,7 +87,7 @@ public class DepartmentWrapper extends OrganizationWrapper { public Long saveBaseForm(Map params) { Long departmentId = getDepartmentService(user).saveBaseForm(params); writeOperateLog(new Object() { - }.getClass(), "新增部门【" + JSON.toJSONString(params) + "】"); + }.getClass(), JSON.toJSONString(params)); return departmentId; } @@ -101,7 +101,7 @@ public class DepartmentWrapper extends OrganizationWrapper { public int updateForbiddenTagById(DeptSearchParam params) { int updateForbiddenTagById = getDepartmentService(user).updateForbiddenTagById(params); writeOperateLog(new Object() { - }.getClass(), "更新部门禁用标记【" + JSON.toJSONString(params) + "】"); + }.getClass(), JSON.toJSONString(params)); return updateForbiddenTagById; } @@ -115,7 +115,7 @@ public class DepartmentWrapper extends OrganizationWrapper { public Long updateForm(Map params) { Long departmentId = getDepartmentService(user).updateForm(params); writeOperateLog(new Object() { - }.getClass(), "更新部门信息【" + JSON.toJSONString(params) + "】"); + }.getClass(), JSON.toJSONString(params)); return departmentId; } @@ -128,7 +128,7 @@ public class DepartmentWrapper extends OrganizationWrapper { public int deleteByIds(Collection ids) { int deleteByIds = getDepartmentService(user).deleteByIds(ids); writeOperateLog(new Object() { - }.getClass(), "删除部门【" + JSON.toJSONString(ids) + "】"); + }.getClass(), JSON.toJSONString(ids)); return deleteByIds; } @@ -180,7 +180,7 @@ public class DepartmentWrapper extends OrganizationWrapper { public int copyDepartment(DeptCopyParam copyParam) { int copyDepartment = getDepartmentService(user).copyDepartment(copyParam); writeOperateLog(new Object() { - }.getClass(), "复制部门【" + JSON.toJSONString(copyParam) + "】"); + }.getClass(), JSON.toJSONString(copyParam)); return copyDepartment; } diff --git a/src/com/engine/organization/wrapper/GradeWrapper.java b/src/com/engine/organization/wrapper/GradeWrapper.java index 6d1b90db..167a0cca 100644 --- a/src/com/engine/organization/wrapper/GradeWrapper.java +++ b/src/com/engine/organization/wrapper/GradeWrapper.java @@ -50,7 +50,7 @@ public class GradeWrapper extends OrganizationWrapper { public int saveGrade(GradeSearchParam param) { int saveGrade = getGradeService(user).saveGrade(param); writeOperateLog(new Object() { - }.getClass(), "新增职等【" + JSON.toJSONString(param) + "】"); + }.getClass(), JSON.toJSONString(param)); return saveGrade; } @@ -64,7 +64,7 @@ public class GradeWrapper extends OrganizationWrapper { public int updateGrade(GradeSearchParam param) { int updateGrade = getGradeService(user).updateGrade(param); writeOperateLog(new Object() { - }.getClass(), "更新职级【" + JSON.toJSONString(param) + "】"); + }.getClass(), JSON.toJSONString(param)); return updateGrade; } @@ -77,7 +77,7 @@ public class GradeWrapper extends OrganizationWrapper { public int updateForbiddenTagById(GradeSearchParam params) { int updateForbiddenTagById = getGradeService(user).updateForbiddenTagById(params); writeOperateLog(new Object() { - }.getClass(), "更新职级禁用标识【" + JSON.toJSONString(params) + "】"); + }.getClass(), JSON.toJSONString(params)); return updateForbiddenTagById; } @@ -90,7 +90,7 @@ public class GradeWrapper extends OrganizationWrapper { public int deleteByIds(@Param("ids") Collection ids) { int deleteByIds = getGradeService(user).deleteByIds(ids); writeOperateLog(new Object() { - }.getClass(), "删除职等【" + JSON.toJSONString(ids) + "】"); + }.getClass(), JSON.toJSONString(ids)); return deleteByIds; }