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

提交修改 g

Browse Source
This commit is contained in:
quyixiao 2020-08-26 09:49:07 +08:00
commit 6298717ff0
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,7 +318,8 @@ public class ResultRecordController extends AbstractController {
r = R.ok("成功")
.put("from", mySelf)
.put("to", mySelf)
.put("type", WorkMsgTypeEnum.REJECT);
.put("type", WorkMsgTypeEnum.REJECT)
.put("count", 1);
}
}
resultCommentService.addOrUpdateComment(req, getUserId(), status);
@ -328,8 +329,14 @@ public class ResultRecordController extends AbstractController {
StaffEntity toSelf = (StaffEntity)r.get("to");
WorkMsgTypeEnum workMsgTypeEnum = (WorkMsgTypeEnum)r.get("type");
String url = domain + "/management/dingtalklogin?url=";//免登接口
String jump = domain + "/management/recorddetail?id=" + req.getRecordResultId()
+ "&recordType=3" ;//跳转接口
String jump;
if((int)r.get("count") == 1){//一个提交
jump = domain + "/management/recorddetail?id=" + req.getRecordResultId()
+ "&recordType=3" ;//跳转接口
}else{//批量提交
jump = domain + "/management/result-record-lzresultrecordapp";//跳转接口
}
jump = URLEncoder.encode(jump);
String msg = dingtalkBusiness.sendWorkMSGByEntity(appid, mySelf, toSelf, workMsgTypeEnum, url + jump);
}

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

@ -369,7 +369,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return R.ok("流程审批结束")
.put("from", staff)
.put("to", staff)
.put("type", WorkMsgTypeEnum.PASS);
.put("type", WorkMsgTypeEnum.PASS)
.put("count", 1);
}
FlowRecord flowRecord = new FlowRecord();
@ -421,7 +422,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return R.ok("提交审批成功")
.put("from", staff)
.put("to", approvalStaff)
.put("type", WorkMsgTypeEnum.SUBMIT);
.put("type", WorkMsgTypeEnum.SUBMIT)
.put("count", staffRoleDtos.size());
}
@Override