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-08-31 14:34:10 +08:00
parent 41f8cab245
commit 68901379fb
4 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -306,33 +306,31 @@ public class ResultRecordController extends AbstractController {
resultRecordService.updateResultRecordById(resultRecord); resultRecordService.updateResultRecordById(resultRecord);
} else if (req.getStatus() == 5) { // 驳回 } else if (req.getStatus() == 5) { // 驳回
status = 5; status = 5;
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(req.getRecordResultId()); List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(req.getRecordResultId());
ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordResultId()); ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordResultId());
if (flowRecords.size() > 0 && req.getRollbackFlowId() > 0) { if (flowRecords.size() >= 2) {
for (FlowRecord flowRecord : flowRecords) { FlowRecord secondFlowRecord = flowRecords.get(flowRecords.size() - 2);
if (flowRecord.getId().equals(req.getRollbackFlowId())) { resultRecord.setFlowStaffIdRole(secondFlowRecord.getFlowStaffIdRole());
resultRecord.setFlowStaffIdRole(flowRecord.getFlowStaffIdRole()); resultRecord.setStatus(req.getStatus());
resultRecord.setStatus(req.getStatus()); List<StaffRoleDto> list = JSONObject.parseArray(resultRecord.getFlowStaffIdRole(), StaffRoleDto.class);
flowRecord.getFlowStaffIdRole(); if (CollectionUtils.isNotEmpty(list)) {
List<StaffRoleDto> list = JSONObject.parseArray(resultRecord.getFlowStaffIdRole(), StaffRoleDto.class); StaffRoleDto staffRoleDto = list.get(0);
if (CollectionUtils.isNotEmpty(list)) { StaffEntity approvalStaff = staffService.selectStaffById(staffRoleDto.getStaffId());
StaffRoleDto staffRoleDto = list.get(0); resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null);
StaffEntity approvalStaff = staffService.selectStaffById(staffRoleDto.getStaffId()); resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null);
resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null);
resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null);
}
resultRecordService.updateResultRecordById(resultRecord);
}
if (flowRecord.getId() > req.getRollbackFlowId()) {
flowRecord.setStatus(1);
flowRecordService.updateFlowRecordById(flowRecord);
}
} }
resultRecordService.updateResultRecordById(resultRecord);
FlowRecord lastFlowRecord = flowRecords.get(flowRecords.size() - 1);
lastFlowRecord.setStatus(1);
flowRecordService.updateFlowRecordById(lastFlowRecord);
// 可能会被删除 // 可能会被删除
FlowRecord lastFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(req.getRecordResultId()); FlowRecord lastUsedFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(req.getRecordResultId());
lastFlowRecord.setGmtCreate(new Date()); lastUsedFlowRecord.setId(null);
lastFlowRecord.setGmtModified(new Date()); lastUsedFlowRecord.setGmtCreate(new Date());
flowRecordService.insertFlowRecord(lastFlowRecord);// 新插入一条提交记录 lastUsedFlowRecord.setGmtModified(new Date());
flowRecordService.insertFlowRecord(lastUsedFlowRecord);// 新插入一条提交记录
StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId()); StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId());
r = R.ok("成功") r = R.ok("成功")
@ -408,7 +406,7 @@ public class ResultRecordController extends AbstractController {
if (resultComment == null || !getUserId().equals(resultComment.getStaffId())) { if (resultComment == null || !getUserId().equals(resultComment.getStaffId())) {
resultComment = new ResultComment(); resultComment = new ResultComment();
} }
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(recordId, 0l); List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(recordId);
if (flowRecords != null && flowRecords.size() > 0) { if (flowRecords != null && flowRecords.size() > 0) {
FlowRecord flowRecord = flowRecords.get(flowRecords.size()-1); FlowRecord flowRecord = flowRecords.get(flowRecords.size()-1);
if(flowRecord.getApprovalStaffId().equals(getUserId())){ if(flowRecord.getApprovalStaffId().equals(getUserId())){

2
src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
View File

@ -39,7 +39,7 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
List<FlowRecord> selectFlowRecordByRecordId(@Param("recordId") Long recordId); List<FlowRecord> selectFlowRecordByRecordId(@Param("recordId") Long recordId);
List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(@Param("recordId") Long recordId, @Param("rollbackFlowId") Long rollbackFlowId); List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(@Param("recordId") Long recordId);
List<FlowRecord> selectFlowRecordByFlowId(@Param("recordId") Long recordId); List<FlowRecord> selectFlowRecordByFlowId(@Param("recordId") Long recordId);
} }

2
src/main/java/com/lz/modules/flow/service/FlowRecordService.java
View File

@ -41,7 +41,7 @@ public interface FlowRecordService extends IService<FlowRecord> {
void initFlowRecord(ResultRecord resultRecord , Long roleId , Integer type , String name); void initFlowRecord(ResultRecord resultRecord , Long roleId , Integer type , String name);
List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(Long recordResultId, Long rollbackFlowId); List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(Long recordResultId);
List<FlowRecord> selectFlowRecordByFlowId(Long recordId); List<FlowRecord> selectFlowRecordByFlowId(Long recordId);
} }

4
src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
View File

@ -106,8 +106,8 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
} }
@Override @Override
public List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(Long recordResultId, Long rollbackFlowId) { public List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(Long recordResultId) {
return flowRecordMapper.selectFlowRecordByResultRecordIdFlowId(recordResultId, rollbackFlowId); return flowRecordMapper.selectFlowRecordByResultRecordIdFlowId(recordResultId);
} }
@Override @Override