From 93a29aad440b25568d9ca3ae50c73a931c98ace6 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 3 Nov 2020 15:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/flow/entity/FlowRecord.java    | 19 +++++++++++++++++++
 .../app/impl/ResultRecordServiceImpl.java     |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/src/main/java/com/lz/modules/flow/entity/FlowRecord.java b/src/main/java/com/lz/modules/flow/entity/FlowRecord.java
index f8a77c5f..f5c4a71f 100644
--- a/src/main/java/com/lz/modules/flow/entity/FlowRecord.java
+++ b/src/main/java/com/lz/modules/flow/entity/FlowRecord.java
@@ -68,6 +68,9 @@ public class FlowRecord implements java.io.Serializable {
     //flow_manager表中id
     @ApiModelProperty(value = "flow_manager表中id", name = "processId")
     private Long processId;
+    //当前是目标确认还是评分，0，目标制定，1，目标确认，2执行中，3，结果值录入，4，评分，5考核结束
+    @ApiModelProperty(value = "当前是目标确认还是评分，0，目标制定，1，目标确认，2执行中，3，结果值录入，4，评分，5考核结束", name = "flowProcess")
+    private Integer flowProcess;
     /**
      *  
      * @return
@@ -323,6 +326,21 @@ public class FlowRecord implements java.io.Serializable {
         this.processId = processId;
     }
 
+    /**
+     * 当前是目标确认还是评分，0，目标制定，1，目标确认，2执行中，3，结果值录入，4，评分，5考核结束 
+     * @return
+     */
+    public Integer getFlowProcess() {
+        return flowProcess;
+    }
+    /**
+     * 当前是目标确认还是评分，0，目标制定，1，目标确认，2执行中，3，结果值录入，4，评分，5考核结束 
+     * @param flowProcess
+     */
+    public void setFlowProcess(Integer flowProcess) {
+        this.flowProcess = flowProcess;
+    }
+
     @Override
     public String toString() {
         return "FlowRecord{" +
@@ -343,6 +361,7 @@ public class FlowRecord implements java.io.Serializable {
                 ",statusName=" + statusName +
                 ",type=" + type +
                 ",processId=" + processId +
+                ",flowProcess=" + flowProcess +
                 "}";
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 74b1017f..0f218852 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -801,6 +801,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             flowRecord.setFlowId(flowApprovalRole.getFlowId());
             FlowChart flowChart = flowService.selectFlowChartByChartId(flowApprovalRole.getFlowId());
             flowRecord.setProcessId(flowChart.getProcessId());
+            flowRecord.setFlowProcess(flowChart.getFlowProcess());
             String staffRole = StaffRoles.getStaffRole(staffEntity.getId(), StringUtil.strToLongs(flowApprovalRole.getRoleId()));
             if (i == 0) {
                 flowRecord.setStatus(FlowRecordStatusEnums.CURRENT_FLOW_STATUS.getStatus());
@@ -985,6 +986,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         }
         FlowChart currentFlowChart = flowService.selectFlowChartByChartId(currentFlowRecord.getFlowId());
         resultRecord.setFlowProcess(currentFlowChart.getFlowProcess());
+
         resultRecord.setFlowStaffIdRole(nextFlowRecords.size() == 1 ? currentFlowRecord.getFlowStaffIdRole() : null);
         resultRecord.setCurrentApprovalStaffId(nextFlowRecords.size() == 1 ? currentFlowRecord.getApprovalStaffId() : null);
         resultRecord.setCurrentApprovalStaffName(nextFlowRecords.size() == 1 ? currentFlowRecord.getApprovalStaffName() : null);