fix chart show

xlorne · xlorne · commit 103db2a4805d · 2024-11-28T15:55:32.000+08:00
diff --git a/admin-ui/src/components/Flow/flow/FlowDetail.tsx b/admin-ui/src/components/Flow/flow/FlowDetail.tsx
@@ -42,7 +42,7 @@ const FlowDetail: React.FC<FlowDetailProps> = (props) => {
                 )}
 
                 {/*仅当非发起流程时再展示审批意见框*/}
-                {FlowFormView && !flowData.isDone() && !flowData.isStartFlow() && (
+                {FlowFormView && flowData.showOpinion() && (
                     <div className="opinionForm">
                         <div>
                             <Divider>
diff --git a/admin-ui/src/components/Flow/flow/FlowHistoryLine.tsx b/admin-ui/src/components/Flow/flow/FlowHistoryLine.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import {UserOutlined} from "@ant-design/icons";
-import {Timeline} from "antd";
+import {Tag, Timeline} from "antd";
 import moment from "moment";
 import {FlowData} from "@/components/Flow/flow/data";
 
@@ -12,11 +12,35 @@ const FlowHistoryLine: React.FC<FlowHistoryLineProps> = (props) => {
     const flowData = props.flowData;
     const timelineData = flowData.getHistoryRecords();
     const items = timelineData.map((item: any, index: any) => {
+
+        const flowType = item.flowType;
+
+        const flowTypeLabel = ()=>{
+            if(flowType === "DONE"){
+                return (
+                    <Tag color="success">已审批</Tag>
+                );
+            }else if(flowType === "TODO"){
+                return (
+                    <Tag color="processing">待审批</Tag>
+                );
+            }else if(flowType === "CIRCULATE"){
+                return (
+                    <Tag color="cyan">已抄送</Tag>
+                )
+            }else if(flowType === "TRANSFER"){
+                return (
+                    <Tag color="blue">已转办</Tag>
+                )
+            }
+        }
+
         return {
             dot: <UserOutlined className="UserOutlined" />,
             children: (
                 <div>
-                    <div className="title">{flowData.getNode(item.nodeCode).name}</div>
+                    <div className="title">{flowData.getNode(item.nodeCode).name} </div>
+                    <div><span>状态：</span> <span>{flowTypeLabel()}</span></div>
                     <div>
                         <span>创建人：</span> <span>{item.currentOperator.name}</span>
                         {item.opinion && (
diff --git a/admin-ui/src/components/Flow/flow/FlowTabs.tsx b/admin-ui/src/components/Flow/flow/FlowTabs.tsx
@@ -38,7 +38,7 @@ const FlowTabs: React.FC<FlowTabsProps> = (props) => {
                     },
                     {
                         key: 'history',
-                        label: '流程历史',
+                        label: '流程记录',
                         children: (
                             <Skeleton loading={true}>
                                 <></>
@@ -73,9 +73,9 @@ const FlowTabs: React.FC<FlowTabsProps> = (props) => {
                     view={props.view}/>
             ),
         },
-        !flowData.isStartFlow() && {
+        flowData.showHistory() && {
             key: 'history',
-            label: '流程历史',
+            label: '流程记录',
             children: <FlowHistory flowData={flowData}/>,
         },
         {
diff --git a/admin-ui/src/components/Flow/flow/data.ts b/admin-ui/src/components/Flow/flow/data.ts
@@ -155,24 +155,18 @@ export class FlowData extends FlowWorkData {
     getNodeState = (code: string) => {
         const historyRecords = this.data.historyRecords || [];
 
-        const historyNodeCodes = historyRecords.map((record: any) => {
-            return record.nodeCode;
-        });
-
-        const currentNodeCode = this.data.flowNode.code;
-        if (currentNodeCode === code) {
-            if (this.isFinished()) {
-                return "done";
-            }
-            return "current";
-        }
 
-        if (historyNodeCodes.indexOf(code) !== -1) {
+        if (this.isFinished()) {
             return "done";
         }
 
-        if (this.isFinished()) {
-            return "done";
+        for(const record of historyRecords){
+            if(record.nodeCode === code){
+                if(record.flowType==='TODO'){
+                    return "wait";
+                }
+                return "done";
+            }
         }
 
         return "wait";
@@ -217,5 +211,16 @@ export class FlowData extends FlowWorkData {
         }
         return false;
     }
+
+    showHistory() {
+        if(this.isDone()){
+            return true;
+        }
+        return !this.isStartFlow();
+    }
+
+    showOpinion() {
+        return this.canHandle();
+    }
 }
 
diff --git a/example/example-application/src/main/java/com/codingapi/example/query/FlowRecordQueryController.java b/example/example-application/src/main/java/com/codingapi/example/query/FlowRecordQueryController.java
@@ -29,7 +29,7 @@ public class FlowRecordQueryController {
     @GetMapping("/list")
     public MultiResponse<FlowRecordEntity> list(SearchRequest searchRequest) {
         PageRequest pageRequest = PageRequest.of(searchRequest.getCurrent(), searchRequest.getPageSize(), Sort.by("id").descending());
-        return MultiResponse.of(flowRecordQuery.findAll(pageRequest));
+        return MultiResponse.of(flowRecordQuery.findAllFlowRecords(pageRequest));
     }
 
 
diff --git a/example/example-infra-flow/src/main/java/com/codingapi/example/jpa/FlowRecordEntityRepository.java b/example/example-infra-flow/src/main/java/com/codingapi/example/jpa/FlowRecordEntityRepository.java
@@ -33,16 +33,16 @@ public interface FlowRecordEntityRepository extends FastRepository<FlowRecordEnt
     @Query(value = "select r from FlowRecordEntity  r where r.currentOperatorId = ?1  and r.workCode = ?2 and r.read = false and r.flowStatus = 'RUNNING' order by r.id desc")
     Page<FlowRecordEntity> findUnReadByOperatorIdAndWorkCode(long operatorId, String workCode, PageRequest pageRequest);
 
-    @Query(value = "select r from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.flowType = 'DONE' order by r.id desc")
+    @Query(value = "select d from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.flowType = 'DONE' group by r.processId ) order by d.id desc")
     Page<FlowRecordEntity> findDoneByOperatorId(long operatorId, PageRequest pageRequest);
 
-    @Query(value = "select r from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.workCode = ?2 and r.flowType = 'DONE' order by r.id desc")
+    @Query(value = "select d from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.workCode = ?2 and r.flowType = 'DONE' group by r.processId)  order by d.id desc")
     Page<FlowRecordEntity> findDoneByOperatorIdAndworkCode(long operatorId, String workCode, PageRequest pageRequest);
 
-    @Query(value = "select r from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.preId = 0 and r.nodeCode = 'start' order by r.id desc")
+    @Query(value = "select d from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.preId = 0 and r.nodeCode = 'start'  group by r.processId) order by d.id desc")
     Page<FlowRecordEntity> findInitiatedByOperatorId(long operatorId, PageRequest pageRequest);
 
-    @Query(value = "select r from FlowRecordEntity  r where r.currentOperatorId = ?1  and r.workCode = ?2 and r.preId = 0 and r.nodeCode = 'start' order by r.id desc")
+    @Query(value = "select d from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r where r.currentOperatorId = ?1  and r.workCode = ?2 and r.preId = 0 and r.nodeCode = 'start'  group by r.processId) order by d.id desc")
     Page<FlowRecordEntity> findInitiatedByOperatorIdAndWorkCode(long operatorId, String workCode, PageRequest pageRequest);
 
     @Query(value = "select r from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.flowType = 'TODO' and r.flowStatus = 'RUNNING' and r.timeoutTime >0 and r.timeoutTime < ?2 order by r.id desc")
@@ -57,4 +57,8 @@ public interface FlowRecordEntityRepository extends FastRepository<FlowRecordEnt
     @Query(value = "select r from FlowRecordEntity  r where r.currentOperatorId = ?1 and r.workCode =?2 and r.flowType = 'TODO' and r.flowStatus = 'RUNNING' and r.postponedCount > 0 order by r.id desc")
     Page<FlowRecordEntity> findPostponedTodoByOperatorIdAndWorkCode(long operatorId, String workCode, PageRequest pageRequest);
 
+
+    @Query(value = "select d from FlowRecordEntity  d where d.id in (select max(r.id) from FlowRecordEntity  r group by r.processId ) order by d.id desc")
+    Page<FlowRecordEntity> findAllFlowRecords(PageRequest pageRequest);
+
 }
diff --git a/example/example-infra-flow/src/main/java/com/codingapi/example/query/FlowRecordQueryImpl.java b/example/example-infra-flow/src/main/java/com/codingapi/example/query/FlowRecordQueryImpl.java
@@ -20,7 +20,7 @@ public class FlowRecordQueryImpl implements FlowRecordQuery {
 
     @Override
     public Page<FlowRecord> findAll(PageRequest pageRequest) {
-        Page<FlowRecordEntity> page = flowRecordEntityRepository.findAll(pageRequest);
+        Page<FlowRecordEntity> page = flowRecordEntityRepository.findAllFlowRecords(pageRequest);
         return page.map(item->FlowRecordConvertor.convert(item,userRepository));
     }
 
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowDetailService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowDetailService.java
@@ -64,7 +64,7 @@ public FlowDetail detail(long recordId, IFlowOperator currentOperator) {
             }
         }
 
-        return new FlowDetail(flowRecord, snapshot, flowWork, flowRecords, operators, currentOperator != null && flowRecord.isOperator(currentOperator));
+        return new FlowDetail(flowRecord, snapshot, flowWork, flowRecords, operators, currentOperator != null && flowRecord.isTodo() && flowRecord.isOperator(currentOperator));
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class FlowRecordQueryController {`
`29`	`29`	`@GetMapping("/list")`
`30`	`30`	`public MultiResponse<FlowRecordEntity> list(SearchRequest searchRequest) {`
`31`	`31`	`PageRequest pageRequest = PageRequest.of(searchRequest.getCurrent(), searchRequest.getPageSize(), Sort.by("id").descending());`
`32`		`- return MultiResponse.of(flowRecordQuery.findAll(pageRequest));`
	`32`	`+ return MultiResponse.of(flowRecordQuery.findAllFlowRecords(pageRequest));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class FlowRecordQueryImpl implements FlowRecordQuery {`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public Page<FlowRecord> findAll(PageRequest pageRequest) {`
`23`		`- Page<FlowRecordEntity> page = flowRecordEntityRepository.findAll(pageRequest);`
	`23`	`+ Page<FlowRecordEntity> page = flowRecordEntityRepository.findAllFlowRecords(pageRequest);`
`24`	`24`	`return page.map(item->FlowRecordConvertor.convert(item,userRepository));`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public FlowDetail detail(long recordId, IFlowOperator currentOperator) {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- return new FlowDetail(flowRecord, snapshot, flowWork, flowRecords, operators, currentOperator != null && flowRecord.isOperator(currentOperator));`
	`67`	`+ return new FlowDetail(flowRecord, snapshot, flowWork, flowRecords, operators, currentOperator != null && flowRecord.isTodo() && flowRecord.isOperator(currentOperator));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`