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

rjuq whnt

Browse Source
This commit is contained in:
quyixiao 2020-08-26 11:23:32 +08:00
commit 86f21463d4
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,8 +319,7 @@ public class ResultRecordController extends AbstractController {
r = R.ok("成功") r = R.ok("成功")
.put("from", mySelf) .put("from", mySelf)
.put("to", mySelf) .put("to", mySelf)
.put("type", WorkMsgTypeEnum.REJECT) .put("type", WorkMsgTypeEnum.REJECT);
.put("count", 1);
} }
} }
resultCommentService.addOrUpdateComment(req, getUserId(), status); resultCommentService.addOrUpdateComment(req, getUserId(), status);
@ -330,11 +329,24 @@ public class ResultRecordController extends AbstractController {
StaffEntity mySelf = (StaffEntity)r.get("from"); StaffEntity mySelf = (StaffEntity)r.get("from");
StaffEntity toSelf = (StaffEntity)r.get("to"); StaffEntity toSelf = (StaffEntity)r.get("to");
WorkMsgTypeEnum workMsgTypeEnum = (WorkMsgTypeEnum)r.get("type"); WorkMsgTypeEnum workMsgTypeEnum = (WorkMsgTypeEnum)r.get("type");
sendWorkMSG(mySelf, toSelf, workMsgTypeEnum, req.getRecordResultId(), 1);
return R.ok("成功");
}
return r;
}
return R.ok("成功");
//return r != null ? r : R.ok("成功");
}
private void sendWorkMSG(StaffEntity mySelf, StaffEntity toSelf, WorkMsgTypeEnum workMsgTypeEnum
, Long recordResultId, int count){
String url = domain + "/management/dingtalklogin?url=";//免登接口 String url = domain + "/management/dingtalklogin?url=";//免登接口
String jump; String jump;
if((int)r.get("count") == 1){//一个提交 if(count == 1){//一个提交
logger.info("单个提交推送消息"); logger.info("单个提交推送消息");
jump = domain + "/management/recorddetail?id=" + req.getRecordResultId() jump = domain + "/management/recorddetail?id=" + recordResultId
+ "&recordType=3" ;//跳转接口 + "&recordType=3" ;//跳转接口
}else{//批量提交 }else{//批量提交
logger.info("批量提交推送消息"); logger.info("批量提交推送消息");
@ -344,14 +356,6 @@ public class ResultRecordController extends AbstractController {
jump = URLEncoder.encode(jump); jump = URLEncoder.encode(jump);
String msg = dingtalkBusiness.sendWorkMSGByEntity(appid, mySelf, toSelf, workMsgTypeEnum, url + jump); String msg = dingtalkBusiness.sendWorkMSGByEntity(appid, mySelf, toSelf, workMsgTypeEnum, url + jump);
logger.info("发送钉钉工作消息{}", msg); logger.info("发送钉钉工作消息{}", msg);
return R.ok("成功");
}
return r;
}
return R.ok("成功");
//return r != null ? r : R.ok("成功");
} }
/** /**

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

@ -326,7 +326,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
if (CollectionUtils.isEmpty(resultDetails)) { if (CollectionUtils.isEmpty(resultDetails)) {
return R.error("请先添加业绩。"); return R.error("请先添加业绩。");
} }
double sum = resultDetails.parallelStream().filter(p -> p.getType() == 1).mapToDouble(p -> NumberUtil.objToDoubleWithDefault(p.getCheckWeight(), 0d)).sum(); double sum = resultDetails.stream().filter(p -> p.getType() == 1).mapToDouble(p -> NumberUtil.objToDoubleWithDefault(p.getCheckWeight(), 0d)).sum();
if (sum < 0.7) { if (sum < 0.7) {
return R.error("recordId为[" + recordId + "]业绩权重之和必需等于0.7。"); return R.error("recordId为[" + recordId + "]业绩权重之和必需等于0.7。");
} }
@ -374,8 +374,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return R.ok("流程审批结束") return R.ok("流程审批结束")
.put("from", staff) .put("from", staff)
.put("to", staff) .put("to", staff)
.put("type", WorkMsgTypeEnum.PASS) .put("type", WorkMsgTypeEnum.PASS);
.put("count", 1);
} }
FlowRecord flowRecord = new FlowRecord(); FlowRecord flowRecord = new FlowRecord();
@ -434,8 +433,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return R.ok("提交审批成功") return R.ok("提交审批成功")
.put("from", staff) .put("from", staff)
.put("to", approvalStaff) .put("to", approvalStaff)
.put("type", WorkMsgTypeEnum.SUBMIT) .put("type", WorkMsgTypeEnum.SUBMIT);
.put("count", staffRoleDtos.size());
} }
@Override @Override