管道顺序

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipedetail/vo/EquipPipeDetailSaveReqVO.java

@@ -197,4 +197,9 @@ public class EquipPipeDetailSaveReqVO {
      */
     private String workpressure;
 
+    /**
+     * 排序
+     */
+    private String sort;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/equippipedetail/EquipPipeDetailDO.java

@@ -253,4 +253,9 @@ public class EquipPipeDetailDO extends BaseDO {
      */
     private String useno;
 
+    /**
+     * 排序
+     */
+    private String sort;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/equippipedetail/EquipPipeDetailMapper.java

@@ -67,7 +67,8 @@ public interface EquipPipeDetailMapper extends BaseMapperX<EquipPipeDetailDO> {
                 .eqIfPresent(EquipPipeDetailDO::getYearInspectionConclusion, reqVO.getYearInspectionConclusion())
                 .eqIfPresent(EquipPipeDetailDO::getYearInspectionIssues, reqVO.getYearInspectionIssues())
                 .betweenIfPresent(EquipPipeDetailDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(EquipPipeDetailDO::getId));
+//                .orderByDesc(EquipPipeDetailDO::getId));
+                .orderByDesc(EquipPipeDetailDO::getSort));
     }
 
     List<EquipPipeSchedulingPipesDetailRespVO> selectPlanPipesDetailPage(String id, EquipPipeSchedulingPageReqVO equipPipeSchedulingPageReqVO);
@@ -123,6 +124,7 @@ public interface EquipPipeDetailMapper extends BaseMapperX<EquipPipeDetailDO> {
                 .set(EquipPipeDetailDO::getCommissioningDate, equipPipeDetailDO.getCommissioningDate())
                 .set(EquipPipeDetailDO::getPipeCategory, equipPipeDetailDO.getPipeCategory())
                 .set(EquipPipeDetailDO::getPipeType, equipPipeDetailDO.getPipeType())
+                .set(EquipPipeDetailDO::getSort, equipPipeDetailDO.getSort())
                 .eq(EquipPipeDetailDO::getId, equipPipeDetailDO.getId()));
     }
 }

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

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -118,11 +119,12 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
                     if (!details.isEmpty()){
                         List<EquipPipeDetailDO> pipeDetails = equipPipeDetailMapper.selectByIds(details.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList())
                                 .stream()
-                                .sorted((a, b) -> {
-                                    String pipeRegCodeA = a.getPipeRegCode() != null ? a.getPipeRegCode() : "";
-                                    String pipeRegCodeB = b.getPipeRegCode() != null ? b.getPipeRegCode() : "";
-                                    return pipeRegCodeA.compareTo(pipeRegCodeB);
-                                })
+//                                .sorted((a, b) -> {
+//                                    String pipeRegCodeA = a.getPipeRegCode() != null ? a.getPipeRegCode() : "";
+//                                    String pipeRegCodeB = b.getPipeRegCode() != null ? b.getPipeRegCode() : "";
+//                                    return pipeRegCodeA.compareTo(pipeRegCodeB);
+//                                })
+                                .sorted(Comparator.comparing(EquipPipeDetailDO::getSort))
                                 .toList();
                         if (!pipeDetails.isEmpty()){
                             List<String> nos = new ArrayList<>();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipedetail/EquipPipeDetailServiceImpl.java

@@ -96,7 +96,7 @@ public class EquipPipeDetailServiceImpl extends ServiceImpl<EquipPipeDetailMappe
     public List<EquipPipeDetailRespVO> getEquipPipeDetailByEquipPipeId(String equipPipeId) {
         // 显式创建LambdaQueryWrapper对象来避免sqlFirst错误
         LambdaQueryWrapper<EquipPipeDetailDO> queryWrapper = new LambdaQueryWrapper<>();
-        List<EquipPipeDetailDO> list = list(queryWrapper.eq(EquipPipeDetailDO::getEquipPipeId, equipPipeId));
+        List<EquipPipeDetailDO> list = list(queryWrapper.eq(EquipPipeDetailDO::getEquipPipeId, equipPipeId).orderByDesc(EquipPipeDetailDO::getSort));
         return BeanUtils.toBean(list, EquipPipeDetailRespVO.class);
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/synchronization/SynchronizationServiceImpl.java

@@ -988,6 +988,7 @@ public class SynchronizationServiceImpl implements SynchronizationService {
         String pipeCategory = findDictValueByLabel(systemEquipPipeType, pipeDetailDto.PIPE_CATEGORY);
         equipPipeDetailDO.setPipeCategory(pipeCategory);
         equipPipeDetailDO.setPipeType(pipeDetailDto.PIPE_TYPE);
+        equipPipeDetailDO.setSort(pipeDetailDto.SERIAL_NO);
         return equipPipeDetailDO;
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/synchronization/dto/PipeDetailDto.java

@@ -173,4 +173,9 @@ public class PipeDetailDto {
      * 管道品种
      */
     public String PIPE_TYPE;
+
+    /**
+     * 序号
+     */
+    public String SERIAL_NO;
 }