diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java index 74afac58..9fdaa285 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionStepInfo.java @@ -4,6 +4,7 @@ import java.util.Date; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; @@ -39,5 +40,7 @@ public class InspectionStepInfo extends Model { private Date updateTime; //更新人id private Integer updater; + @TableField(exist = false) + private String nickname; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionStepInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionStepInfoMapper.java index 4a0c1da7..7832b037 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionStepInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionStepInfoMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.iocoder.yudao.module.inspection.entity.InspectionStepInfo; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * (InspectionStepInfo)表数据库访问层 * @@ -13,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface InspectionStepInfoMapper extends BaseMapper { + List listByInspectionInfoId(Long inspectionInfoId); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionStepInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionStepInfoService.java index 86698b11..f39b7ad3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionStepInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/InspectionStepInfoService.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.inspection.service; import com.baomidou.mybatisplus.extension.service.IService; import cn.iocoder.yudao.module.inspection.entity.InspectionStepInfo; +import java.util.List; + /** * (InspectionStepInfo)表服务接口 * @@ -11,5 +13,6 @@ import cn.iocoder.yudao.module.inspection.entity.InspectionStepInfo; */ public interface InspectionStepInfoService extends IService { + List listByInspectionInfoId(Long inspectionInfoId); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index 314ac9b3..0270ca59 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -1482,7 +1482,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(InspectionStepInfo::getInspectionInfoId,inspectionInfoId).orderByAsc(InspectionStepInfo::getStepNum); queryWrapper.orderBy(true, false, InspectionStepInfo::getId); - List list = stepInfoService.list(queryWrapper); + List list = stepInfoService.listByInspectionInfoId(inspectionInfoId); if (CollectionUtil.isNotEmpty(list)){ res.setStepInfos(list); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStepInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStepInfoServiceImpl.java index 4634e3ec..6d981baf 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStepInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStepInfoServiceImpl.java @@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.inspection.mapper.InspectionStepInfoMapper; import cn.iocoder.yudao.module.inspection.service.InspectionStepInfoService; import org.springframework.stereotype.Service; +import java.util.List; + /** * (InspectionStepInfo)表服务实现类 * @@ -15,5 +17,9 @@ import org.springframework.stereotype.Service; @Service("inspectionStepInfoService") public class InspectionStepInfoServiceImpl extends ServiceImpl implements InspectionStepInfoService { + @Override + public List listByInspectionInfoId(Long inspectionInfoId) { + return baseMapper.listByInspectionInfoId(inspectionInfoId); + } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java index 0db10cbf..e4152001 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java @@ -325,6 +325,7 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl + + + + +