diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java index c4125d1fe..947877c4b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java @@ -2,6 +2,7 @@ package com.cf.imes.module.executor.service.ordercomponent; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; @@ -11,6 +12,7 @@ import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderComponentRespVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentListReqVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentPageReqVO; @@ -126,6 +128,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { public List getOrderTopComponentList(OrderDetailComponentListReqVO reqVO) { List orderComponentDOS = orderComponentMapper.selectList(new LambdaQueryWrapperX() .eq(OrderComponentDO::getOrderId, reqVO.getOrderId()) + .eq(OrderComponentDO::getPid, OrderComponentDO.PARENT_ID_ROOT) .likeIfPresent(OrderComponentDO::getName, reqVO.getName()) .eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus())); return BeanUtil.copyToList(orderComponentDOS, OrderComponentRespVO.class); @@ -158,7 +161,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { .eqIfPresent(OrderComponentDO::getDeleted, reqVO.isDeleted()) .likeIfPresent(OrderComponentDO::getName, reqVO.getName()) .eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus()) - .select(OrderComponentDO::getId, OrderComponentDO::getPid, OrderComponentDO::getName, OrderComponentDO::getCadViewFileId)); + .select(OrderComponentDO::getId, OrderComponentDO::getPid, OrderComponentDO::getName, OrderComponentDO::getCadViewFileId, OrderComponentDO::getProcessStatus)); List orderComponentRespVOS = BeanUtil.copyToList(topComponentList, OrderComponentRespVO.class); // 3、获取文件 fileHash @@ -570,5 +573,13 @@ public class OrderComponentServiceImpl implements OrderComponentService { return needDeleteIds; } - +// @Override +// public List getOrderComponentListOnOrders(List orderIds) { +// List orderComponentDOS = orderComponentMapper.selectList(new LambdaQueryWrapper() +// .in(OrderComponentDO::getOrderId, orderIds) +// .eq(OrderComponentDO::getDeleted, false) +// .eq(OrderComponentDO::getOrganId, SecurityFrameworkUtils.getUserOrganId()) +// .select(OrderComponentDO::getId, OrderComponentDO::getName, OrderComponentDO::getPid)); +// return BeanUtil.copyToList(orderComponentDOS, OrderComponentRespVO.class); +// } } \ No newline at end of file