소스 검색

流程图添加返回相关图片集合

lyhzzz 2 년 전
부모
커밋
1196900e14

+ 8 - 2
src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -85,10 +85,16 @@ public class RepairInfoService {
                 case 1 : //接单
                     OrderReceiving orderReceiving = orderReceivingService.getByRepairId(repairId);
                     repairLogVo.setOrderReceiving(orderReceiving);
+                    if(orderReceiving != null){
+                        repairLogVo.setImagesInfo(orderReceiving.getOrderFaultImg());
+                    }
                     break;
                 case 2 : //维修检测
-                    CheckRegisterVo checkRegisterVo = repairRegisterService.getCheckVoByRepairId(repairId);
-                    repairLogVo.setCheckRegisterVo(checkRegisterVo);
+                    RepairRegisterVo repairRegisterVo = repairRegisterService.getVoByRepairId(repairId);
+                    repairLogVo.setRepairRegisterVo(repairRegisterVo);
+                    if(repairRegisterVo != null){
+                        repairLogVo.setImagesInfo(repairRegisterVo.getCheckImg());
+                    }
                     break;
                 case 11 : case 12: case 13: //维修完毕
                     CustomerAddress customerAddress = customerAddressService.getByRepairId(repairId);

+ 12 - 1
src/main/java/com/fdkankan/sale/vo/response/RepairLogVo.java

@@ -1,17 +1,28 @@
 package com.fdkankan.sale.vo.response;
 
+import com.alibaba.fastjson.JSONArray;
 import com.fdkankan.sale.entity.*;
 import lombok.Data;
 
 @Data
 public class RepairLogVo extends RepairLog {
+
     private String sysUserName;
 
     private OrderReceiving orderReceiving;
 
-    private CheckRegisterVo checkRegisterVo;
+    private RepairRegisterVo repairRegisterVo;
 
     private Customer customer;
 
     private CustomerAddress customerAddress;
+
+    private JSONArray imagesInfo;
+
+    public JSONArray getImagesInfo() {
+        if(imagesInfo == null){
+            return new JSONArray();
+        }
+        return imagesInfo;
+    }
 }