|
|
@@ -1,5 +1,6 @@
|
|
|
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.dal.dataobject.dynamictbcol.DynamicTbColDO;
|
|
|
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("certificateNo",equipPipeDO.getCertificateNo());
|
|
|
|
|
|
- //管线信息
|
|
|
+ //在用管线信息
|
|
|
List<PipeTaskOrderItemDetailDO> details = pipeTaskOrderItemDetailService.lambdaQuery().eq(PipeTaskOrderItemDetailDO::getOrderItemId,orderItemId).list();
|
|
|
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()
|
|
|
// .sorted((a, b) -> {
|
|
|
// String pipeRegCodeA = a.getPipeRegCode() != null ? a.getPipeRegCode() : "";
|