Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -97,7 +97,8 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         IPage<InspectionFile> result = inspectionFileMapper.selectPage(page, Wrappers.<InspectionFile>lambdaQuery()
                 .eq(InspectionFile::getInspectionId, query.getInspectionId())
                 .eq(InspectionFile::getMark, 1)
-                .eq(InspectionFile::getStatus, 5));
+                .eq(InspectionFile::getStatus, 5)
+                .orderByDesc(InspectionFile::getCheckTime));
         IPage<InspectionFileInfoVo> pageData = getInspectionFileInfoVoIPage(inspection, result);
 
         return JsonResult.success(pageData);
@@ -139,7 +140,8 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         IPage<InspectionFile> result = inspectionFileMapper.selectPage(page, Wrappers.<InspectionFile>lambdaQuery()
                 .eq(InspectionFile::getInspectionId, query.getInspectionId())
                 .eq(InspectionFile::getMark, 1)
-                .eq(InspectionFile::getStatus, 15));
+                .eq(InspectionFile::getStatus, 15)
+                .orderByDesc(InspectionFile::getCheckTime));
         IPage<InspectionFileInfoVo> pageData = getInspectionFileInfoVoIPage(inspection, result);
 
         return JsonResult.success(pageData);
@@ -182,7 +184,8 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         IPage<InspectionFile> result = inspectionFileMapper.selectPage(page, Wrappers.<InspectionFile>lambdaQuery()
                 .eq(InspectionFile::getInspectionId, query.getInspectionId())
                 .eq(InspectionFile::getMark, 1)
-                .eq(InspectionFile::getStatus, 10));
+                .eq(InspectionFile::getStatus, 10)
+                .orderByDesc(InspectionFile::getCheckTime));
         IPage<InspectionFileInfoVo> pageData = getInspectionFileInfoVoIPage(inspection, result);
 
         return JsonResult.success(pageData);

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -199,7 +199,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     .like(StringUtils.isNotEmpty(user.getId()), WorkOrder::getAssignUser, user.getId())
                     .eq(WorkOrder::getTenantId, tenantId)
                     .between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime())
-                    .eq(WorkOrder::getMark, 1));
+                    .eq(WorkOrder::getMark, 1)
+                    .orderByDesc(WorkOrder::getCreateTime));
             if (null == workPageData.getRecords()) {
                 return null;
             }
@@ -402,7 +403,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     .eq(WorkOrder::getStatus, 15)
                     .eq(WorkOrder::getTenantId, tenantId)
                     .between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime())
-                    .eq(WorkOrder::getMark, 1));
+                    .eq(WorkOrder::getMark, 1)
+                    .orderByDesc(WorkOrder::getCreateTime));
             //设置每条工单对应的已完成问题数量 问题状态为25问题已处理
             List<WorkOrderInfoVo> collect = workPageData.getRecords().stream().map(s -> {
                 WorkOrderInfoVo vo = new WorkOrderInfoVo();
@@ -450,7 +452,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     .like(StringUtils.isNotEmpty(user.getId()), WorkOrder::getAssignUser, user.getId())
                     .eq(WorkOrder::getTenantId, tenantId)
                     .between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime())
-                    .eq(WorkOrder::getMark, 1));
+                    .eq(WorkOrder::getMark, 1)
+                    .orderByDesc(WorkOrder::getCreateTime));
             //设置每条工单对应的状态问题数量
             List<WorkOrderInfoVo> collect1 = workPageData1.getRecords().stream().map(g -> {
                 WorkOrderInfoVo vo = new WorkOrderInfoVo();