From 7103eb0c7309bc99210ecbd6c2c6a6f0ff95da2f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 7 Jul 2022 15:32:30 +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 --- .../organization/entity/logview/bo/AbstractEquator.java | 1 + .../engine/organization/entity/logview/vo/LogViewVO.java | 3 ++- src/com/engine/organization/enums/LogModuleNameEnum.java | 1 - .../organization/mapper/sequence/SequenceMapper.java | 2 +- .../engine/organization/service/impl/CompServiceImpl.java | 2 +- .../organization/service/impl/DepartmentServiceImpl.java | 3 ++- .../organization/transmethod/LogViewTransMethod.java | 7 +++++++ src/com/engine/organization/util/MenuBtn.java | 2 +- src/com/engine/organization/wrapper/PostWrapper.java | 6 +++--- src/com/engine/organization/wrapper/SequenceWrapper.java | 2 +- 10 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/entity/logview/bo/AbstractEquator.java b/src/com/engine/organization/entity/logview/bo/AbstractEquator.java index 98f693ad..215a834b 100644 --- a/src/com/engine/organization/entity/logview/bo/AbstractEquator.java +++ b/src/com/engine/organization/entity/logview/bo/AbstractEquator.java @@ -32,6 +32,7 @@ public abstract class AbstractEquator implements Equator { excludeFields.add("createTime"); excludeFields.add("updateTime"); excludeFields.add("deleteType"); + excludeFields.add("staffNum"); } /** diff --git a/src/com/engine/organization/entity/logview/vo/LogViewVO.java b/src/com/engine/organization/entity/logview/vo/LogViewVO.java index 30ecef24..56378396 100644 --- a/src/com/engine/organization/entity/logview/vo/LogViewVO.java +++ b/src/com/engine/organization/entity/logview/vo/LogViewVO.java @@ -22,11 +22,12 @@ import java.util.Date; fields = "t.id, t.operator_name, t.create_time, t.operate_type, t.client_ip, t.operate_module_name,t.operate_desc,t.message,t.value,t.params_str", fromSql = "FROM hr_log t ", primarykey = "id", + orderby = "create_time", tableType = WeaTableType.NONE ) public class LogViewVO { - @OrganizationTableColumn(text = "操作时间", width = "16%", column = "create_time", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") + @OrganizationTableColumn(text = "操作时间", width = "20%", column = "create_time",transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getDateTimeFormat") private Date createTime; @OrganizationTableColumn(text = "操作者", width = "16%", column = "operator_name") diff --git a/src/com/engine/organization/enums/LogModuleNameEnum.java b/src/com/engine/organization/enums/LogModuleNameEnum.java index 7b1c7ae5..7779b220 100644 --- a/src/com/engine/organization/enums/LogModuleNameEnum.java +++ b/src/com/engine/organization/enums/LogModuleNameEnum.java @@ -10,7 +10,6 @@ public enum LogModuleNameEnum { LEVEL("职等", 2), GRADE("职级", 3), SEQUENCE("岗位序列", 4), - POST("职务分类", 5), POSTINFO("职务管理", 6), GROUP("集团管理", 7), COMPANY("分部管理", 8), diff --git a/src/com/engine/organization/mapper/sequence/SequenceMapper.java b/src/com/engine/organization/mapper/sequence/SequenceMapper.java index ca78376c..3f734ebb 100644 --- a/src/com/engine/organization/mapper/sequence/SequenceMapper.java +++ b/src/com/engine/organization/mapper/sequence/SequenceMapper.java @@ -85,5 +85,5 @@ public interface SequenceMapper { */ int getCountByTag(@Param("tag") int tag); - List getSequencesByIds(Collection ids); + List getSequencesByIds(@Param("ids") Collection ids); } diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 91c746b9..32c400e3 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -141,7 +141,7 @@ public class CompServiceImpl extends Service implements CompService { // 判断是否开启自动编号 compNo = repeatDetermine(compNo); params.put("comp_no", compNo); - if (StringUtils.isBlank(params.get("show_order").toString())) { + if (null == params.get("show_order") || StringUtils.isBlank(params.get("show_order").toString())) { int maxShowOrder = getCompMapper().getMaxShowOrder(); params.put("show_order", maxShowOrder + 1); } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 3010fea3..ea131aca 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -388,6 +388,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 处理自动编号 deptById.setDeptNo(CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, deptById.getDeptNo(), false)); deptById.setParentComp(Long.parseLong(copyParam.getCompany())); + deptById.setParentDept(null); // 显示顺序字段 deptById.setShowOrder(maxShowOrder + i + 1); insertCount += getDepartmentMapper().insertIgnoreNull(deptById); @@ -395,7 +396,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listJobsByDepartmentId(idList.get(i)); Integer maxJobOrder = MapperProxyFactory.getProxy(JobMapper.class).getMaxShowOrder(); if (maxJobOrder == null) { - maxJobOrder = 0; + maxJobOrder = 0; } recursionCopyJob((long) user.getUID(), jobPOS, deptById.getParentComp(), deptById.getId(), maxJobOrder); } diff --git a/src/com/engine/organization/transmethod/LogViewTransMethod.java b/src/com/engine/organization/transmethod/LogViewTransMethod.java index a730fb5f..eace5f13 100644 --- a/src/com/engine/organization/transmethod/LogViewTransMethod.java +++ b/src/com/engine/organization/transmethod/LogViewTransMethod.java @@ -38,4 +38,11 @@ public class LogViewTransMethod { } return ""; } + + public String getDateTimeFormat(String dateTime){ + if(StringUtils.isNotBlank(dateTime)){ + dateTime = dateTime.substring(0,dateTime.length() - 2); + } + return dateTime; + } } diff --git a/src/com/engine/organization/util/MenuBtn.java b/src/com/engine/organization/util/MenuBtn.java index b95ad66d..7ce1b077 100644 --- a/src/com/engine/organization/util/MenuBtn.java +++ b/src/com/engine/organization/util/MenuBtn.java @@ -154,7 +154,7 @@ public class MenuBtn { // 新增 rightMenuList.add(MenuBtn.rightMenu_addNew()); // 复制 - rightMenuList.add(MenuBtn.rightMenu_copy()); + // rightMenuList.add(MenuBtn.rightMenu_copy()); // 日志 rightMenuList.add(MenuBtn.rightMenu_btnLog()); btnDatas.put("rightMenu", rightMenuList); diff --git a/src/com/engine/organization/wrapper/PostWrapper.java b/src/com/engine/organization/wrapper/PostWrapper.java index 2a06ecca..74ede385 100644 --- a/src/com/engine/organization/wrapper/PostWrapper.java +++ b/src/com/engine/organization/wrapper/PostWrapper.java @@ -39,7 +39,7 @@ public class PostWrapper extends OrganizationWrapper { * @param postPO * @return */ - @Log(operateType = OperateTypeEnum.ADD, operateModule = LogModuleNameEnum.POST, operateDesc = "新增职务分类") + @Log(operateType = OperateTypeEnum.ADD, operateModule = LogModuleNameEnum.POSTINFO, operateDesc = "新增职务分类") public int savePost(PostPO postPO) { int savePost = getPostService(user).savePost(postPO); writeOperateLog(new Object() { @@ -53,7 +53,7 @@ public class PostWrapper extends OrganizationWrapper { * @param postPO * @return */ - @Log(operateType = OperateTypeEnum.UPDATE, operateModule = LogModuleNameEnum.POST, operateDesc = "更新职务分类") + @Log(operateType = OperateTypeEnum.UPDATE, operateModule = LogModuleNameEnum.POSTINFO, operateDesc = "更新职务分类") public int updatePost(PostPO postPO) { PostPO postByID = getPostMapper().getPostByID(postPO.getId()); int updatePost = getPostService(user).updatePost(postPO); @@ -67,7 +67,7 @@ public class PostWrapper extends OrganizationWrapper { * * @param ids */ - @Log(operateType = OperateTypeEnum.DELETE, operateModule = LogModuleNameEnum.POST, operateDesc = "删除职务分类") + @Log(operateType = OperateTypeEnum.DELETE, operateModule = LogModuleNameEnum.POSTINFO, operateDesc = "删除职务分类") public int deleteByIds(Collection ids) { List postPOS = getPostMapper().getPostsByIds(ids); int deleteByIds = getPostService(user).deleteByIds(ids); diff --git a/src/com/engine/organization/wrapper/SequenceWrapper.java b/src/com/engine/organization/wrapper/SequenceWrapper.java index 0b52d331..fdfe22ff 100644 --- a/src/com/engine/organization/wrapper/SequenceWrapper.java +++ b/src/com/engine/organization/wrapper/SequenceWrapper.java @@ -91,7 +91,7 @@ public class SequenceWrapper extends OrganizationWrapper { * * @param ids */ - @Log(operateType = OperateTypeEnum.UPDATE, operateModule = LogModuleNameEnum.SEQUENCE, operateDesc = "删除岗位序列") + @Log(operateType = OperateTypeEnum.DELETE, operateModule = LogModuleNameEnum.SEQUENCE, operateDesc = "删除岗位序列") public int deleteByIds( Collection ids) { List sequencePOS = getSequenceMapper().getSequencesByIds(ids); int deleteByIds = getSequenceService(user).deleteByIds(ids);