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

修复被拒待办任务清理

Browse Source
This commit is contained in:
wulin 2020-11-20 11:34:16 +08:00
parent caaf6f75ce
commit e5496346bf
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/lz/config/ShiroConfig.java
View File

@ -54,7 +54,6 @@ public class ShiroConfig {
filterMap.put("/file/**", "anon"); filterMap.put("/file/**", "anon");
filterMap.put("/test/**", "anon"); filterMap.put("/test/**", "anon");
filterMap.put("/druid/**", "anon"); filterMap.put("/druid/**", "anon");
filterMap.put("/user/lzresultrecord/new/resultRecordDetail/**", "anon");
filterMap.put("/app/**", "anon"); filterMap.put("/app/**", "anon");
filterMap.put("/sys/login", "anon"); filterMap.put("/sys/login", "anon");
filterMap.put("/sys/sendSMS", "anon"); filterMap.put("/sys/sendSMS", "anon");

25
src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
View File

@ -241,13 +241,14 @@ public class DingtalkBusiness {
StaffSimpleInfo fromStaff = staffService.selectStaffSimpleInfo(resultRecord.getStaffId()); StaffSimpleInfo fromStaff = staffService.selectStaffSimpleInfo(resultRecord.getStaffId());
fromStaff.setResultRecord(resultRecord); fromStaff.setResultRecord(resultRecord);
fromStaff.setFlowStart(flowStart); fromStaff.setFlowStart(flowStart);
List<StaffSimpleInfo> toStaffids; List<StaffSimpleInfo> toStaffids = new ArrayList<>();
toStaffids.add(fromStaff);
sendWorkMSGWithAsyn(null, toStaffids, WorkMsgTypeEnum.PROCESS.getType());
if(type == WorkMsgTypeEnum.REJECT.getType()){//被拒 if(type == WorkMsgTypeEnum.REJECT.getType()){//被拒
toStaffids = new ArrayList<>();
toStaffids.add(fromStaff); sendWorkMSGWithAsyn(null, toStaffids, WorkMsgTypeEnum.REJECT.getType());
sendWorkMSGWithAsyn(fromStaff, toStaffids, WorkMsgTypeEnum.REJECT.getType());
}else{ }else{
List<FlowRecord> flowRecords = /*List<FlowRecord> flowRecords =
flowRecordService.selectFlowRecordByRecordIdStatus(resultRecordId, 2); flowRecordService.selectFlowRecordByRecordIdStatus(resultRecordId, 2);
List<Long> ids = flowRecords.stream().map(new Function<FlowRecord, Long>() { List<Long> ids = flowRecords.stream().map(new Function<FlowRecord, Long>() {
@Override @Override
@ -260,8 +261,8 @@ public class DingtalkBusiness {
) { ) {
simpleInfo.setResultRecord(resultRecord); simpleInfo.setResultRecord(resultRecord);
simpleInfo.setFlowStart(flowStart); simpleInfo.setFlowStart(flowStart);
} }*/
sendWorkMSGWithAsyn(fromStaff, toStaffids, WorkMsgTypeEnum.PROCESS.getType()); sendWorkMSGWithAsyn(null, toStaffids, WorkMsgTypeEnum.PROCESS.getType());
} }
@ -547,8 +548,14 @@ public class DingtalkBusiness {
if(flowRecords.size() == 0){//任务结束了 if(flowRecords.size() == 0){//任务结束了
flowRecords = flowRecordService.selectLastFlowRecordsById(info.getResultRecord().getId()); flowRecords = flowRecordService.selectLastFlowRecordsById(info.getResultRecord().getId());
}else{ }else{
flowRecords = flowRecordService.selectLastFlowRecordsByIdAndFlowIndex(info.getResultRecord().getId() if(workMsgTypeEnum.getType() == WorkMsgTypeEnum.REJECT.getType()){//被拒
, flowRecords.get(0).getFlowIndex().intValue() - 1);//获取上一步的数据 flowRecords = flowRecordService.selectLastFlowRecordsByIdAndFlowIndex(info.getResultRecord().getId()
, flowRecords.get(0).getFlowIndex().intValue() + 1);//获取下一步的数据
}else{
flowRecords = flowRecordService.selectLastFlowRecordsByIdAndFlowIndex(info.getResultRecord().getId()
, flowRecords.get(0).getFlowIndex().intValue() - 1);//获取上一步的数据
}
} }
logger.info("查询到可能需要更新的待办任务数量{}", flowRecords.size()); logger.info("查询到可能需要更新的待办任务数量{}", flowRecords.size());
if(flowRecords.size() > 0){ if(flowRecords.size() > 0){