From 4c131847c58a3a5aa06b0dbf485eb59f55ee2e87 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 29 Sep 2020 11:36:11 +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/app/controller/ResultRecordController.java    | 2 ++
 .../com/lz/modules/sys/service/app/ResultRecordService.java  | 1 +
 .../sys/service/app/impl/ResultRecordServiceImpl.java        | 5 +++--
 src/main/resources/mapper/flow/FlowRecordMapper.xml          | 5 ++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index a5ea5b79..5a419324 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -254,6 +254,8 @@ public class ResultRecordController extends AbstractController {
                 String target = "审批通过";
                 if (resultComment.getStatus() == 5) {
                     target = "驳回";
+                }else if (resultComment.getStatus() == 6){
+                    target = "申述";
                 }
                 comment.setTarget(target);
                 comment.setKeyResult(resultComment.getComment());
diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
index 8949acd1..11101b50 100644
--- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
+++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
@@ -90,6 +90,7 @@ public interface ResultRecordService extends IService<ResultRecord> {
     ResultRecord selectResultRecordByStaffIdStatus(Long staffId, int status);
 
 	R reject( ResultRecord resultRecord,Integer status);
+
 	StaffEntity getApprovalStaff(ResultRecord resultRecord, String departmentLevel, List<StaffRoleDto> staffRoleDtos, Long roleId);
 
 	DepartmentsStaffRelateEntity getLeaderDepartmentsStaffRelateEntity(Long staffId);
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 12c71521..39545756 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
@@ -624,8 +624,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                     .put("to", approvalStaff)
                     .put("type", WorkMsgTypeEnum.URGING);
         }else if (req.getStatus() == 6){
-            // 向上级申述
-            resultRecordService.approval(req.getRecordResultId(), userId,req.getStatus(),false);
+            status = 6;
+            // 回滚代码
+            resultRecordService.reject(resultRecord,req.getStatus());
         }
         resultCommentService.addOrUpdateComment(req, userId, status,lastUsedFlowRecord);
         if(r != null){//下面推送消息
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index 1dc8819f..4d89b4c2 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -158,8 +158,11 @@
     <select id="selectFlowRecordByResultRecordIdType" resultType="com.lz.modules.flow.entity.FlowRecord">
         select * from lz_flow_record  where  is_delete = 0 and record_id = #{resultRecordId} and type = #{type}  and status = 0
     </select>
+
+
+
     <select id="selectFlowRecordByResultRecordIdTypeStatus" resultType="com.lz.modules.flow.entity.FlowRecord">
-         select * from lz_flow_record  where  is_delete = 0 and record_id = #{resultRecordId} and type = #{type}  and status = #{status}
+         select * from lz_flow_record  where  is_delete = 0 and record_id = #{recordResultId} and type = #{type}  and status = #{status}
     </select>