日志添加测试Id

src/main/java/com/fdkankan/sale/entity/RepairLog.java

@@ -66,5 +66,7 @@ public class RepairLog implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("test_id")
+    private Integer testId;
 
 }

src/main/java/com/fdkankan/sale/service/IRepairLogService.java

@@ -18,6 +18,8 @@ public interface IRepairLogService extends IService<RepairLog> {
 
     RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,String remark);
 
+    RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,String remark,Integer testId);
+
     List<RepairLog> getByRepairIdAndStatus(String repairId, Integer status);
 
     List<RepairLog> getByRepairId(String repairId);

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -99,6 +99,15 @@ public class RepairInfoService {
                     if(repairRegisterVo != null){
                         repairLogVo.setImagesInfo(repairRegisterVo.getCheckImg());
                     }
+                case 6 : case 9:  //测试通过与测试不通过
+                    if(repairLogVo.getTestId() != null){
+                        RepairTest repairTest = repairTestService.getById(repairLogVo.getTestId());
+                        if(repairTest != null){
+                            repairLogVo.setRepairTest(repairTest);
+                            repairLogVo.setImagesInfo(repairTest.getResultImg());
+                        }
+                    }
+
                     break;
                 case 11 : case 12: case 13: //维修完毕
                     CustomerAddress customerAddress = customerAddressService.getByRepairId(repairId);

src/main/java/com/fdkankan/sale/service/impl/RepairLogServiceImpl.java

@@ -41,7 +41,19 @@ public class RepairLogServiceImpl extends ServiceImpl<IRepairLogMapper, RepairLo
         repairLog.setRepairStatus(repairStatus);
         repairLog.setSysUserId(sysUserId);
         repairLog.setRemark(remark);
-        repairLog.setUpdateTime(null);
+        this.save(repairLog);
+        repairService.updateRepairStatus(repairId,repairStatus);
+        return repairLog;
+    }
+
+    @Override
+    public RepairLog saveBySysUser(Long sysUserId, String repairId, Integer repairStatus, String remark, Integer testId) {
+        RepairLog repairLog = new RepairLog();
+        repairLog.setRepairId(repairId);
+        repairLog.setRepairStatus(repairStatus);
+        repairLog.setSysUserId(sysUserId);
+        repairLog.setRemark(remark);
+        repairLog.setTestId(testId);
         this.save(repairLog);
         repairService.updateRepairStatus(repairId,repairStatus);
         return repairLog;

src/main/java/com/fdkankan/sale/service/impl/RepairTesterService.java

@@ -61,12 +61,15 @@ public class RepairTesterService {
         entity.setResultStatus(testParam.getResultStatus());
         entity.setResultInfo(testParam.getResultInfo());
         entity.setResultImg(testParam.getResultImg());
+
         if(testParam.getResultStatus() == 0){
             entity.setPassTime(DateUtil.getDate());
-            repairLogService.saveBySysUser(userId,testParam.getRepairId(),9,"测试通过");
+            repairTestService.save(entity);
+            repairLogService.saveBySysUser(userId,testParam.getRepairId(),9,"测试通过",entity.getTestId());
         }else {
-            repairLogService.saveBySysUser(userId,testParam.getRepairId(),6,"测试不通过");
+            repairTestService.save(entity);
+            repairLogService.saveBySysUser(userId,testParam.getRepairId(),6,"测试不通过",entity.getTestId());
         }
-        repairTestService.save(entity);
+
     }
 }

src/main/java/com/fdkankan/sale/vo/response/RepairLogVo.java

@@ -17,6 +17,8 @@ public class RepairLogVo extends RepairLog {
 
     private CustomerAddress customerAddress;
 
+    private RepairTest repairTest;
+
     private JSONArray imagesInfo;
 
     public JSONArray getImagesInfo() {