保内维修

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

@@ -115,8 +115,15 @@ public class RepairPersonnelService {
         HashMap<Integer,Integer> partIdMap = new HashMap<>();
         registerParts.forEach(entity -> partIdMap.putIfAbsent(entity.getPartId(),entity.getId()));
 
-        repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_QUOTED.status(),"维修登记");
-
+        Integer repairStatus = RepairStatusEnum.TO_BE_QUOTED.status();
+        if(repairRegister.getDefineDamage() == 0 && repair.getWarrantyType() == 0){
+            if(param.getPartList().size() >0){
+                repairStatus = RepairStatusEnum.TO_BE_PREPARED.status();
+            }else {
+                repairStatus = RepairStatusEnum.TO_BE_REPAIRED.status();
+            }
+        }
+        repairLogService.saveBySysUser(userId,repair.getRepairId(),repairStatus,"维修登记");
         this.addRepairPart(param.getPartList(),repair,repairRegister,partIdMap);
 
         repairFaultService.delByRepairId(repair.getRepairId());

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

@@ -74,7 +74,11 @@ public class RepairTesterService {
         if(testParam.getResultStatus() == 0){
             entity.setPassTime(DateUtil.getDate());
             repairTestService.save(entity);
-            repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_PAID.status(),"测试通过",entity.getTestId());
+            if(repair.getWarrantyType() == 0 ){
+                repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),"测试通过",entity.getTestId());
+            }else {
+                repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_PAID.status(),"测试通过",entity.getTestId());
+            }
         }else {
             repairTestService.save(entity);
             repairLogService.saveBySysUser(userId,testParam.getRepairId(),RepairStatusEnum.TO_BE_REPAIRED.status(),"测试不通过",entity.getTestId());