From f1b01745cf51a9c8283a6fdf438b24f4d70b3f55 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 26 Oct 2020 10:22:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9A=90=E8=97=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/performance/controller/FlowStartController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
index d3031e1f..002b9886 100644
--- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
@@ -269,8 +269,8 @@ public class FlowStartController {
                              flowApprovalRoles.add(flowApprovalRole);
                              flowApprovalRole.setStepIndex(stepIndex);
                          }
-                         stepIndex++;
                      }
+                     stepIndex++;
                  }else{
                      String[] roleIds = flowChartDetailRecord.getRoleIds().split(",");
                      for (String roleId:roleIds

From 9b9abc0f2efb95fa3ddc68686685d71017cc9400 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 26 Oct 2020 10:29:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=B0=8F=E6=B5=81=E7=A8=8B=E6=97=B6=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E4=BF=9D=E5=AD=98=E5=85=B3=E9=97=AD=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/performance/controller/FlowChartController.java  | 2 ++
 src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
index 2fc31be5..0eb0cd4b 100644
--- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
@@ -150,12 +150,14 @@ public class FlowChartController {
                 flowChartDetailRecord.setChartId(flowChartDetailRecordListReq.getId());
                 flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId());
                 flowChartDetailRecord.setStepIndex(index);
+                flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus());
                 if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){
                     updaes.add(flowChartDetailRecord);
                 }else{
                     inserts.add(flowChartDetailRecord);
                 }
                 if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){
+                    //本节点没有删除，那么顺序++
                     index++;
                 }
 
diff --git a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
index 499d9267..0206b2a5 100644
--- a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml
@@ -110,7 +110,7 @@
     </update>
 
     <select id="selectFlowChartDetailRecordByGroupIdAndChartId" resultType="FlowChartDetailRecord" >
-        select * from lz_flow_chart_detail_record  where evaluation_group_id=#{groupId} and chart_id = #{chartId} and is_delete = 0 order by step_index desc
+        select * from lz_flow_chart_detail_record  where evaluation_group_id=#{groupId} and chart_id = #{chartId} and is_delete = 0 order by step_index asc
     </select>
 
     <select id="selectFlowChartDetailRecordByGroupId" resultType="FlowChartDetailRecord" >

From 138a298c436bee6cbf6279172a998950bb79446f Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 26 Oct 2020 10:58:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BD=93=E8=8E=B7=E5=8F=96=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=97=B6=E7=9A=84=E5=BC=80=E5=90=AF=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/performance/controller/FlowChartController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
index 0eb0cd4b..88d7e406 100644
--- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
@@ -67,7 +67,7 @@ public class FlowChartController {
 
                     for (FlowChartDetailRecord record:flowChartDetailRecords
                     ) {
-                        flowChartDetailRecordListDto.setStatus(dto.getStatus());
+                        flowChartDetailRecordListDto.setStatus(record.getStatus());
                         FlowChartDetailRecordSimpleDto detailRecordSimpleDto = new FlowChartDetailRecordSimpleDto();
 
                         BeanUtils.copyProperties(record, detailRecordSimpleDto);