|
|
@@ -20,6 +20,9 @@ import com.ydtech.modules.ser.utils.PositionUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.List;
|
|
|
+import java.util.Objects;
|
|
|
+
|
|
|
@Service
|
|
|
public class SerRescueOrderServiceImpl extends ServiceImpl<SerRescueOrderMapper, RescueOrder>
|
|
|
implements SerRescueOrderService {
|
|
|
@@ -109,7 +112,11 @@ public class SerRescueOrderServiceImpl extends ServiceImpl<SerRescueOrderMapper,
|
|
|
queryWrapper.eq(RescueOrder::getServeCode, rescueTypeEnum != null ? rescueTypeEnum.getDesc() : null);
|
|
|
}
|
|
|
|
|
|
- Page pageData = baseMapper.selectPage(page, queryWrapper);
|
|
|
+ Page<RescueOrder> pageData = baseMapper.selectPage(page, queryWrapper);
|
|
|
+ pageData.getRecords().forEach(item -> {
|
|
|
+ item.setOrderState(Objects.requireNonNull(OderStateEnum.getOderStateEnum(item.getOrderState())).getDesc());
|
|
|
+ item.setServeCode(Objects.requireNonNull(RescueTypeEnum.getRescueTypeEnum(item.getServeCode())).getDesc());
|
|
|
+ });
|
|
|
return pageData;
|
|
|
}
|
|
|
}
|