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

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -3159,7 +3159,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         //因为多表关联 会有多个表都使用了id字段，  所以必须专门指定主表的Id
         IPage<CirculatedTaskPageVo> page = circulatedService.selectJoinListPage(ConventPage.getPage(dto), CirculatedTaskPageVo.class,
                 MPJWrappers.<WorkflowCirculated>lambdaJoin()
-                        .orderByDesc(WorkflowCirculated::getId)
+                        .orderByDesc(WorkflowCirculated::getCreateTime)
                         .like(StrUtil.isNotBlank(dto.getTaskName()), WorkflowCirculated::getTaskName, dto.getTaskName())
                         .like(StrUtil.isNotBlank(dto.getName()), WorkflowSchema::getName, dto.getName())
                         .like(StrUtil.isNotBlank(dto.getKeyword()), WorkflowSchema::getName, dto.getKeyword())
@@ -3182,9 +3182,9 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         List<Task> list = taskService.createTaskQuery().taskIdIn(taskIds).list();
         QueryWrapper<WorkflowExtra> workflowExtraQueryWrapper = new QueryWrapper<>();
         workflowExtraQueryWrapper
-                .select("t.process_id as process_id, MAX(t.current_progress) as current_progress")
-                .in("t.process_id", processIds)
-                .groupBy("t.process_id");
+                .select("process_id as process_id, MAX(current_progress) as current_progress")
+                .in("process_id", processIds)
+                .groupBy("process_id");
         List<WorkflowExtra> workflowExtraList = xjrWorkflowExtraMapper.selectList(workflowExtraQueryWrapper);
         for (CirculatedTaskPageVo record : page.getRecords()) {
             Optional<Task> thisTask = list.stream().filter(x -> x.getId().equals(record.getTaskId())).findFirst();
@@ -3305,7 +3305,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         List<MyProcessPageVo> result = new ArrayList<>(historicProcessInstances.size());
         if (processIds.size() > 0) {
 
-            List<WorkflowExtra> workflowExtras = workflowExtraMapper.selectList(Wrappers.lambdaQuery(WorkflowExtra.class).in(WorkflowExtra::getProcessId, processIds));
+            List<WorkflowExtra> workflowExtras = workflowExtraMapper.selectList(Wrappers.lambdaQuery(WorkflowExtra.class).in(WorkflowExtra::getProcessId, processIds).orderByDesc(WorkflowExtra::getStartTime));
 
             for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
 

src/main/resources/mapper/workflow/WorkflowExtraMapper.xml

@@ -28,6 +28,7 @@
                 #{taskId}
             </foreach>
         </if>
+    order by t.start_time DESC,
     </select>
 
 </mapper>