diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java index 40b87b9..2a4c719 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java @@ -148,4 +148,9 @@ public class PointInfoVo extends TenantEntity implements Serializable { //@ExcelProperty(value = "故障地点") @ExcelIgnore private String faultLocation; + + /** + * 用于显示改点位是否存在故障,并且上报过 + */ + private Boolean flag; } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java index 1bce297..1ada8ae 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java @@ -1,29 +1,27 @@ package org.dromara.platform.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.dromara.platform.domain.ProjectCategoryPoint; -import org.dromara.platform.domain.WorkOrderInfo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.platform.domain.PointInfo; +import org.dromara.platform.domain.bo.PointInfoBo; import org.dromara.platform.domain.bo.ProjectCategoryPointBo; -import org.dromara.platform.domain.vo.DailyInspectionReportVo; +import org.dromara.platform.domain.vo.PointInfoVo; import org.dromara.platform.domain.vo.PointSelectVo; import org.dromara.platform.domain.vo.ProjectCategoryPointVo; +import org.dromara.platform.mapper.PointInfoMapper; +import org.dromara.platform.service.IPointInfoService; import org.dromara.platform.service.IProjectCategoryPointService; -import org.dromara.platform.service.IProjectInfoService; +import org.dromara.platform.service.IWorkOrderInfoService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import org.dromara.platform.domain.bo.PointInfoBo; -import org.dromara.platform.domain.vo.PointInfoVo; -import org.dromara.platform.domain.PointInfo; -import org.dromara.platform.mapper.PointInfoMapper; -import org.dromara.platform.service.IPointInfoService; import java.util.*; import java.util.concurrent.*; @@ -37,6 +35,7 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service +@Slf4j public class PointInfoServiceImpl implements IPointInfoService { private final PointInfoMapper baseMapper; @@ -44,7 +43,7 @@ public class PointInfoServiceImpl implements IPointInfoService { private IProjectCategoryPointService projectCategoryPointService; @Resource - private IProjectInfoService projectInfoService; + private IWorkOrderInfoService workOrderInfoService; /** @@ -69,8 +68,17 @@ public class PointInfoServiceImpl implements IPointInfoService { */ @Override public TableDataInfo queryPageList(PointInfoBo bo, PageQuery pageQuery) { + Set faultLocationList = workOrderInfoService.getFaultLocationList(null); LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = baseMapper.selectVoPage(pageQuery.build(), lqw).getRecords(); + for (PointInfoVo record : records) { + if (faultLocationList.contains(record.getPointName())){ + record.setFlag(false); + log.info("该故障地点:{} 正在维修!", record.getPointName()); + } + } + result.setRecords(records); return TableDataInfo.build(result); }