|
|
@@ -4464,6 +4464,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
index++;
|
|
|
//审核流程显示
|
|
|
List<ReportLogDetail> detailList = logDetails.stream().filter(log -> log.getReportId().equals((Integer) map.get("id"))).collect(Collectors.toList());
|
|
|
+ List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
|
|
|
if (detailList.size() > 0) {
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
boolean isFirst = true;
|
|
|
@@ -4473,20 +4474,27 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
operateDate = operateDate.plusSeconds(offsetSeconds);
|
|
|
}
|
|
|
String time = dtf.format(operateDate);
|
|
|
- String msg= time+" " + audit.getMsg();
|
|
|
- /*String msg= "";
|
|
|
+ String msg= "";
|
|
|
if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
- if(audit.getMsg().contains("提交了")){
|
|
|
- audit.getMsg().indexOf("提");
|
|
|
- msg = time+" " + audit.getMsg();
|
|
|
- }else if(audit.getMsg().contains("审核通过了")){
|
|
|
- msg = time+" " + audit.getMsg();
|
|
|
- }else if(audit.getMsg().contains("驳回了")) {
|
|
|
- msg = time+" " + audit.getMsg();
|
|
|
+ Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(audit.getOperatorId())).findFirst();
|
|
|
+ if(first.isPresent()){
|
|
|
+ if(audit.getMsg().contains("提交了")){
|
|
|
+ int i = audit.getMsg().indexOf("提");
|
|
|
+ String substring = audit.getMsg().substring(0, i + 1);
|
|
|
+ msg = time+" " + audit.getMsg().replaceAll(substring,"$userName"+first.get().getCorpwxUserid()+"$");
|
|
|
+ }else if(audit.getMsg().contains("审核通过了")){
|
|
|
+ int i = audit.getMsg().indexOf("审");
|
|
|
+ String substring = audit.getMsg().substring(0, i + 1);
|
|
|
+ msg = time+" " + audit.getMsg().replaceAll(substring,"$userName"+first.get().getCorpwxUserid()+"$");
|
|
|
+ }else if(audit.getMsg().contains("驳回了")) {
|
|
|
+ int i = audit.getMsg().indexOf("驳");
|
|
|
+ String substring = audit.getMsg().substring(0, i + 1);
|
|
|
+ msg = time+" " + audit.getMsg().replaceAll(substring,"$userName"+first.get().getCorpwxUserid()+"$");
|
|
|
+ }
|
|
|
}
|
|
|
}else {
|
|
|
msg = time+" " + audit.getMsg();
|
|
|
- }*/
|
|
|
+ }
|
|
|
if (!isFirst) {
|
|
|
sb.append("->");
|
|
|
} else {
|
Min