补上误删的工作事项

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5450,6 +5450,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             audit.setOperatorId(splitItems[0]);
                             audit.setOperateDate(operateDate);
                             audit.setMsg(splitItems[2]);
+                            String auditMsg = audit.getMsg();
 
                             if (company.getIsInternational() == 1) {
                                 operateDate = operateDate.plusSeconds(offsetSeconds);
@@ -5459,22 +5460,27 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             if(needCorpWxTranslate){
                                 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);
-                                        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);
-                                        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);
-                                        msg = time+" " + audit.getMsg().replaceAll(substring,"\\$userName="+first.get().getCorpwxUserid()+"\\$");
+                                    String corpwxUserId = first.get().getCorpwxUserid();
+                                    if (auditMsg.contains(corpwxUserId)) {
+                                        if(auditMsg.contains("提交了")){
+                                            int i = auditMsg.indexOf("提");
+                                            String substring = auditMsg.substring(0, i);
+                                            msg = time+" " + auditMsg.replace(substring,"\\$userName="+corpwxUserId+"\\$");
+                                        }else if(auditMsg.contains("审核通过了")){
+                                            int i = auditMsg.indexOf("审");
+                                            String substring = auditMsg.substring(0, i);
+                                            msg = time+" " + auditMsg.replace(substring,"\\$userName="+corpwxUserId+"\\$");
+                                        }else if(auditMsg.contains("驳回了")) {
+                                            int i = auditMsg.indexOf("驳");
+                                            String substring = auditMsg.substring(0, i);
+                                            msg = time+" " + auditMsg.replace(substring,"\\$userName="+corpwxUserId+"\\$");
+                                        }
+                                    } else {
+                                        msg = time+" " + auditMsg;
                                     }
                                 }
                             }else {
-                                msg = time+" " + audit.getMsg();
+                                msg = time+" " + auditMsg;
                             }
                             if (!isFirst) {
                                 sb.append("->");
@@ -5486,6 +5492,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                     item.add(sb.toString());
                 }
+                item.add((String) map.get("content"));
                 if(stateKey==1){
                     Integer state = (Integer) map.get("state");
                     switch (state){