|
|
|
@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
@ -55,6 +56,9 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl<DeviceRepairApplyM
|
|
|
|
|
PageHelper.startPage(query.getPage(), query.getLimit());
|
|
|
|
|
}
|
|
|
|
|
List<DeviceRepairApplyStatusEnum> statuss = query.getStatuss();
|
|
|
|
|
if (CollectionUtil.isNotEmpty(statuss)){
|
|
|
|
|
statuss= new ArrayList<>();
|
|
|
|
|
}
|
|
|
|
|
DeviceRepairApplyStatusEnum status = query.getStatus();
|
|
|
|
|
if (status != null){
|
|
|
|
|
statuss.add(status);
|
|
|
|
|