内部上报--履约进度表--关联异常信息--打印日志-3

performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java

@@ -169,15 +169,19 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                         item.setTaskCompleteRatio(taskCompleteRatio);
                     }
                     // 通过订单关联订单异常上报信息
-                    if(StringUtils.isNotBlank(item.getAbnormalRemark())
-                            && StringUtils.isNotBlank(item.getOrderNo())
+                    if(StringUtils.isNotBlank(item.getOrderNo())
                             && internalReportRouteExceptionMap.containsKey(item.getOrderNo()) ) {
                         // 履约进度表中异常备注同步该订单的内部【异常上报】信息，多次上报与编辑中的异常备注间，用”/“进行分割
                         // 拼接远程调用的异常信息
                         StringBuilder stringBuilder = new StringBuilder();
-                        stringBuilder.append(item.getAbnormalRemark())
-                                .append("/")
-                                .append(internalReportRouteExceptionMap.get(item.getOrderNo()));
+                        if (StringUtils.isNotBlank(item.getAbnormalRemark())) {
+                            stringBuilder.append(item.getAbnormalRemark())
+                                    .append("/")
+                                    .append(internalReportRouteExceptionMap.get(item.getOrderNo()));
+                        } else {
+                            stringBuilder.append(internalReportRouteExceptionMap.get(item.getOrderNo()));
+                        }
+                        // 赋值异常备注
                         item.setAbnormalRemark(stringBuilder.toString());
                     }
                 }
@@ -715,7 +719,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         log.info("通过远程代用clx-order服务获取reportRouteExceptionMap--String{}", JSONObject.toJSONString(
                 reportRouteExceptionMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
                 entry -> entry.getValue().stream().map(InternalReportRouteExceptionFeignVO::getExceptionInfo)
-                        .collect(Collectors.joining(","))))));
+                        .collect(Collectors.joining("/"))))));
 
             // 构建map集合，key为订单编号，value为异常上报信息
         return reportRouteExceptionMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,