Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -5181,7 +5181,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             //获取旧的工作流-流程信息
             List<BpmTaskInfoDO> bpmTaskInfoDOS = bpmTaskInfoMapper.selectList(new LambdaQueryWrapperX<BpmTaskInfoDO>()
                     .eq(BpmTaskInfoDO::getBusinessType, 1)
-                    .eq(BpmTaskInfoDO::getBusinessId, itemReportDO.getId()));
+                    .eq(BpmTaskInfoDO::getBusinessId, itemReportDO.getId())
+                    .orderByDesc(BpmTaskInfoDO::getCreateTime));
             if (!CollUtil.isEmpty(bpmTaskInfoDOS)) {
                 bpmTaskInfoDOS.forEach(taskInfoDO -> {
                     BpmTaskRespDTO taskRespDTO = new BpmTaskRespDTO();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -3996,7 +3996,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             //获取旧的工作流-流程信息
             List<BpmTaskInfoDO> bpmTaskInfoDOS = bpmTaskInfoMapper.selectList(new LambdaQueryWrapperX<BpmTaskInfoDO>()
                     .eq(BpmTaskInfoDO::getBusinessType, 1)
-                    .eq(BpmTaskInfoDO::getBusinessId, itemReportDO.getId()));
+                    .eq(BpmTaskInfoDO::getBusinessId, itemReportDO.getId())
+                    .orderByDesc(BpmTaskInfoDO::getCreateTime));
             if (!CollUtil.isEmpty(bpmTaskInfoDOS)) {
                 bpmTaskInfoDOS.forEach(taskInfoDO -> {
                     BpmTaskRespDTO taskRespDTO = new BpmTaskRespDTO();