Răsfoiți Sursa

流程信息根据是否查询驳回后的流程,修改排序

陈长荣 6 zile în urmă
părinte
comite
86dc147d02

+ 7 - 4
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowAuditServiceImpl.java

@@ -21,15 +21,18 @@ public class FlowAuditServiceImpl extends ServiceImpl<FlowAuditMapper, FlowAudit
 
     @Override
     public List<FlowAudit> auditList(Long flowId, String flowType, boolean afterReject) {
-        List<FlowAudit> auditList = list(new LambdaQueryWrapper<>(FlowAudit.class)
+        LambdaQueryWrapper<FlowAudit> wrapper = new LambdaQueryWrapper<>(FlowAudit.class)
                 .eq(FlowAudit::getFlowId, flowId)
                 .eq(StrUtil.isNotBlank(flowType), FlowAudit::getFlowType, flowType)
-                .eq(FlowAudit::getDeleted, WhetherEnum.NO.getCode())
-                .orderByAsc(FlowAudit::getId));
+                .eq(FlowAudit::getDeleted, WhetherEnum.NO.getCode());
         if (!afterReject) {
-            return auditList;
+            //返回所有流程信息,按时间正序返回
+            wrapper.orderByAsc(FlowAudit::getId);
+            return list(wrapper);
         }
 
+        //返回驳回后的流程信息,按时间倒序返回
+        List<FlowAudit> auditList = list(wrapper.orderByDesc(FlowAudit::getId));
         Optional<FlowAudit> opt = auditList.stream().filter(audit -> StrConstant.NO.equals(audit.getAuditResult())).findFirst();
         if (opt.isPresent()) {
             FlowAudit rejectedAudit = opt.get();