|
@@ -21,6 +21,8 @@ import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import javax.swing.text.EditorKit;
|
|
|
+import javax.swing.text.html.parser.Entity;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -186,8 +188,14 @@ public class RepairPersonnelService {
|
|
|
if(repair.getStatus() !=6){
|
|
|
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());
|
|
|
- repairLogService.saveBySysUser(userId,repair.getRepairId(),7,"维修完成");
|
|
|
|
|
|
}
|
|
|
|