Selaa lähdekoodia

一览表只显示在用的管道

xy 5 päivää sitten
vanhempi
commit
adccababcd

+ 5 - 2
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12116_202400RecordOFData.java

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.service.dynamicOFData.pipe;
 package cn.start.tz.module.pressure2.service.dynamicOFData.pipe;
 
 
+import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbcol.DynamicTbColDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbcol.DynamicTbColDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
@@ -126,10 +127,12 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
                     result.put("projectName",equipPipeDO.getProjectName());
                     result.put("projectName",equipPipeDO.getProjectName());
                     result.put("certificateNo",equipPipeDO.getCertificateNo());
                     result.put("certificateNo",equipPipeDO.getCertificateNo());
 
 
-                    //管线信息
+                    //在用管线信息
                     List<PipeTaskOrderItemDetailDO> details = pipeTaskOrderItemDetailService.lambdaQuery().eq(PipeTaskOrderItemDetailDO::getOrderItemId,orderItemId).list();
                     List<PipeTaskOrderItemDetailDO> details = pipeTaskOrderItemDetailService.lambdaQuery().eq(PipeTaskOrderItemDetailDO::getOrderItemId,orderItemId).list();
                     if (!details.isEmpty()){
                     if (!details.isEmpty()){
-                        List<EquipPipeDetailDO> pipeDetails = equipPipeDetailMapper.selectByIds(details.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList())
+                        List<String> equipDetailIds = details.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList();
+                        List<EquipPipeDetailDO> pipeDetails = equipPipeDetailMapper.selectList(new LambdaQueryWrapperX<EquipPipeDetailDO>()
+                                .in(EquipPipeDetailDO::getId, equipDetailIds).eq(EquipPipeDetailDO::getUseStatus, 100))
                                 .stream()
                                 .stream()
 //                                .sorted((a, b) -> {
 //                                .sorted((a, b) -> {
 //                                    String pipeRegCodeA = a.getPipeRegCode() != null ? a.getPipeRegCode() : "";
 //                                    String pipeRegCodeA = a.getPipeRegCode() != null ? a.getPipeRegCode() : "";