Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-15 06:02:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

装配清单顶级部件查询接口补充pid=0条件

Browse Source
This commit is contained in:
gaoqr
2026-02-27 10:53:28 +08:00
parent 8439b57560
commit d825ce8f6d
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java
+13 -2
View File
@@ -2,6 +2,7 @@ package com.cf.imes.module.executor.service.ordercomponent;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; 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.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; 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.pojo.PageResult;
import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.Assert.AssertUtils;
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; 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.OrderComponentRespVO;
import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentListReqVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentListReqVO;
import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentPageReqVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentPageReqVO;
@@ -126,6 +128,7 @@ public class OrderComponentServiceImpl implements OrderComponentService {
public List<OrderComponentRespVO> getOrderTopComponentList(OrderDetailComponentListReqVO reqVO) { public List<OrderComponentRespVO> getOrderTopComponentList(OrderDetailComponentListReqVO reqVO) {
List<OrderComponentDO> orderComponentDOS = orderComponentMapper.selectList(new LambdaQueryWrapperX<OrderComponentDO>() List<OrderComponentDO> orderComponentDOS = orderComponentMapper.selectList(new LambdaQueryWrapperX<OrderComponentDO>()
.eq(OrderComponentDO::getOrderId, reqVO.getOrderId()) .eq(OrderComponentDO::getOrderId, reqVO.getOrderId())
.eq(OrderComponentDO::getPid, OrderComponentDO.PARENT_ID_ROOT)
.likeIfPresent(OrderComponentDO::getName, reqVO.getName()) .likeIfPresent(OrderComponentDO::getName, reqVO.getName())
.eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus())); .eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus()));
return BeanUtil.copyToList(orderComponentDOS, OrderComponentRespVO.class); return BeanUtil.copyToList(orderComponentDOS, OrderComponentRespVO.class);
@@ -158,7 +161,7 @@ public class OrderComponentServiceImpl implements OrderComponentService {
.eqIfPresent(OrderComponentDO::getDeleted, reqVO.isDeleted()) .eqIfPresent(OrderComponentDO::getDeleted, reqVO.isDeleted())
.likeIfPresent(OrderComponentDO::getName, reqVO.getName()) .likeIfPresent(OrderComponentDO::getName, reqVO.getName())
.eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus()) .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<OrderComponentRespVO> orderComponentRespVOS = BeanUtil.copyToList(topComponentList, OrderComponentRespVO.class); List<OrderComponentRespVO> orderComponentRespVOS = BeanUtil.copyToList(topComponentList, OrderComponentRespVO.class);
// 3、获取文件 fileHash // 3、获取文件 fileHash
@@ -570,5 +573,13 @@ public class OrderComponentServiceImpl implements OrderComponentService {
return needDeleteIds; return needDeleteIds;
} }
// @Override
// public List<OrderComponentRespVO> getOrderComponentListOnOrders(List<Long> orderIds) {
// List<OrderComponentDO> orderComponentDOS = orderComponentMapper.selectList(new LambdaQueryWrapper<OrderComponentDO>()
// .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);
// }
} }