diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 5ae634c1..0d3d1add 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -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); } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 2b334e26..5633a0bd 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -369,7 +369,8 @@ public class ResultRecordServiceImpl extends ServiceImpl