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

记录操作日志

This commit is contained in:
dxfeng 2022-07-07 15:32:30 +08:00
parent e83e3b90fc
commit 7103eb0c73
10 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/organization/entity/logview/bo/AbstractEquator.java
View File

@ -32,6 +32,7 @@ public abstract class AbstractEquator implements Equator {
excludeFields.add("createTime");
excludeFields.add("updateTime");
excludeFields.add("deleteType");
excludeFields.add("staffNum");
}
/**

3
src/com/engine/organization/entity/logview/vo/LogViewVO.java
View File

@ -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")

1
src/com/engine/organization/enums/LogModuleNameEnum.java
View File

@ -10,7 +10,6 @@ public enum LogModuleNameEnum {
LEVEL("职等", 2),
GRADE("职级", 3),
SEQUENCE("岗位序列", 4),
POST("职务分类", 5),
POSTINFO("职务管理", 6),
GROUP("集团管理", 7),
COMPANY("分部管理", 8),

2
src/com/engine/organization/mapper/sequence/SequenceMapper.java
View File

@ -85,5 +85,5 @@ public interface SequenceMapper {
*/
int getCountByTag(@Param("tag") int tag);
List<SequencePO> getSequencesByIds(Collection<Long> ids);
List<SequencePO> getSequencesByIds(@Param("ids") Collection<Long> ids);
}

2
src/com/engine/organization/service/impl/CompServiceImpl.java
View File

@ -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);
}

3
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -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<JobPO> 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);
}

7
src/com/engine/organization/transmethod/LogViewTransMethod.java
View File

@ -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;
}
}

2
src/com/engine/organization/util/MenuBtn.java
View File

@ -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);

6
src/com/engine/organization/wrapper/PostWrapper.java
View File

@ -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<Long> ids) {
List<PostPO> postPOS = getPostMapper().getPostsByIds(ids);
int deleteByIds = getPostService(user).deleteByIds(ids);

2
src/com/engine/organization/wrapper/SequenceWrapper.java
View File

@ -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<Long> ids) {
List<SequencePO> sequencePOS = getSequenceMapper().getSequencesByIds(ids);
int deleteByIds = getSequenceService(user).deleteByIds(ids);