wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-09-03 15:18:46 +08:00
commit a0f40182a9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
View File

@ -9,7 +9,7 @@ public enum WorkMsgTypeEnum {
//绩效提交审核的通知（自己提交给领导，自己提交给人事，人事提交给老板） //绩效提交审核的通知（自己提交给领导，自己提交给人事，人事提交给老板）
SUBMIT(0, "绩效提交", "去审核", "# 绩效提交\n ## @的绩效已经提交"), SUBMIT(0, "绩效提交", "去审核", "# 绩效提交\n ## @的绩效已经提交"),
//绩效打回审核的通知 //绩效打回审核的通知
REJECT(1, "绩效驳回", "去修改", "# 绩效驳回\n ## 你的绩效已经驳回"), REJECT(1, "绩效驳回", "去修改", "# 绩效驳回\n ## @的绩效已经驳回"),
//绩效通过领导审核的通知，这一步提交到HR，提交的type //绩效通过领导审核的通知，这一步提交到HR，提交的type
LEADER_PASS(2, "绩效已打分", "去提交给人事", "# 绩效已打分\n ## 你的绩效已经打分"), LEADER_PASS(2, "绩效已打分", "去提交给人事", "# 绩效已打分\n ## 你的绩效已经打分"),
//绩效通过人事，老板审核的最终审核通知 //绩效通过人事，老板审核的最终审核通知

11
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -507,6 +507,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
} else if (req.getStatus() == 5) { // 驳回 } else if (req.getStatus() == 5) { // 驳回
status = 5; status = 5;
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(req.getRecordResultId()); List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(req.getRecordResultId());
StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId());
StaffEntity approvalStaff = mySelf;
if (flowRecords.size() >= 2) { if (flowRecords.size() >= 2) {
FlowRecord secondFlowRecord = flowRecords.get(flowRecords.size() - 2); FlowRecord secondFlowRecord = flowRecords.get(flowRecords.size() - 2);
resultRecord.setFlowStaffIdRole(secondFlowRecord.getFlowStaffIdRole()); resultRecord.setFlowStaffIdRole(secondFlowRecord.getFlowStaffIdRole());
@ -514,7 +516,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
List<StaffRoleDto> list = JSONObject.parseArray(resultRecord.getFlowStaffIdRole(), StaffRoleDto.class); List<StaffRoleDto> list = JSONObject.parseArray(resultRecord.getFlowStaffIdRole(), StaffRoleDto.class);
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
StaffRoleDto staffRoleDto = list.get(0); StaffRoleDto staffRoleDto = list.get(0);
StaffEntity approvalStaff = staffService.selectStaffById(staffRoleDto.getStaffId()); approvalStaff = staffService.selectStaffById(staffRoleDto.getStaffId());
resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null); resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null);
resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null); resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null);
} }
@ -532,10 +534,13 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
lastUsedFlowRecord.setStatus(1); lastUsedFlowRecord.setStatus(1);
flowRecordService.insertFlowRecord(lastUsedFlowRecord);// 新插入一条提交记录 flowRecordService.insertFlowRecord(lastUsedFlowRecord);// 新插入一条提交记录
StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId()); if(mySelf.getId().longValue() == approvalStaff.getId().longValue()){//同一个人
mySelf.setName("你");//用于替换消息中的@符号。无其他任何作用，不保存
}
r = R.ok("成功") r = R.ok("成功")
.put("from", mySelf) .put("from", mySelf)
.put("to", mySelf) .put("to", approvalStaff)
.put("type", WorkMsgTypeEnum.REJECT); .put("type", WorkMsgTypeEnum.REJECT);
} }
} }