瀏覽代碼

没有需要回收的备件时,跳过回收步骤

lyhzzz 2 年之前
父節點
當前提交
7d76dadff7
共有 1 個文件被更改,包括 9 次插入1 次删除
  1. 9 1
      src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

+ 9 - 1
src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -21,6 +21,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.swing.text.EditorKit;
+import javax.swing.text.html.parser.Entity;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -186,8 +188,14 @@ public class RepairPersonnelService {
         if(repair.getStatus() !=6){
         if(repair.getStatus() !=6){
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
         }
         }
+        List<PriceList> priceListList = priceListService.getByRepairId(repair.getRepairId());
+        List<PriceList> collect = priceListList.stream().filter(entity -> entity.getRecoveryStatus() == 0).collect(Collectors.toList());
+        if(collect.size() >0){
+            repairLogService.saveBySysUser(userId,repair.getRepairId(),8,"维修完成");
+        }else {
+            repairLogService.saveBySysUser(userId,repair.getRepairId(),7,"维修完成");
+        }
         repairRegisterService.repairOver(repair.getRepairId(),param.getRemark());
         repairRegisterService.repairOver(repair.getRepairId(),param.getRemark());
-        repairLogService.saveBySysUser(userId,repair.getRepairId(),7,"维修完成");
 
 
     }
     }