修改任务反馈

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -1480,11 +1480,18 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     String[] info = item.getInfo().split("/photos:");
                     String photoUrl = info[1];
                     StringBuffer stringBuffer = new StringBuffer();
+
                     if (photoUrl.contains(",")){
                         List<String> list = Arrays.asList(photoUrl.split(","));
-                        list.forEach(photo-> stringBuffer .append("<img src=\""+photo+"\""+"width=\""+"251\""+"height=\""+"251\""+"/>"));
-                        instructionsZHDto.setContent("<div>"+info[0]+stringBuffer+"</div>");
+                        list.forEach(photo-> stringBuffer .append("<img   src=\""+photo+"\"/>"));
+                        instructionsZHDto.setContent("<div>"+info[0]+"</div><div>"+stringBuffer +"</div>");
+                    }else{
+                        instructionsZHDto.setContent("<div>"+info[0]+"</div>"+"<div><img src=\""+info[1]+"\"/></div>");
+
                     }
+
+
+
                 }
                 instructionsZHDto.setCompany("现场反馈");
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyResourcesServiceImpl.java

@@ -119,7 +119,7 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
             }
             String carInfo = "车辆信息（" + fireTeam.getName() + " + " + powerTransferCompanyResources.getResourcesName() + " + " + powerTransferCompanyResources.getResourcesNum() + "）：";
             String info = "";
-            info = StrUtil.isNotBlank(remarks) ? carInfo + remarks + " + " + Objects.requireNonNull(FireCarStatusEnum.getEnum(code)).getName() : carInfo + Objects.requireNonNull(FireCarStatusEnum.getEnum(code)).getName();
+            info = StrUtil.isNotBlank(remarks) ? carInfo + remarks + " + " +"<span style=\"color: #fe0c0c \" >"+Objects.requireNonNull(FireCarStatusEnum.getEnum(code)).getName() +"</span>" : carInfo + "<span style=\"color: #fe0c0c \" >"+Objects.requireNonNull(FireCarStatusEnum.getEnum(code)).getName()+"</span>";
             JcSituationDetail jcSituationDetail = new JcSituationDetail();
             jcSituationDetail.setAlertCalledId(alertCalledId);
             jcSituationDetail.setInfoType("车辆反馈");