From 8c1b7d5186a1505a1827e4b5a91d564133a711de Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Sun, 27 Sep 2020 16:05:26 +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

---
 .../com/lz/modules/sys/dao/app/ResultRecordMapper.java     | 2 ++
 .../lz/modules/sys/service/app/ResultRecordService.java    | 1 +
 .../sys/service/app/impl/ResultRecordServiceImpl.java      | 7 ++++++-
 src/main/resources/mapper/app/ResultRecordMapper.xml       | 6 ++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
index 823ff78b..530693fb 100644
--- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
+++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
@@ -39,6 +39,8 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     int deleteResultRecordById(@Param("id") Long id);
 
+    int deleteResultRecordById2(@Param("id") Long id);
+
 
     List<ResultRecord> selectByCondition(@Param("page") IPage page, @Param("req") ResultRecordReq req);
 
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 ef5f1553..540a4606 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
@@ -45,6 +45,7 @@ public interface ResultRecordService extends IService<ResultRecord> {
 
 
 	int deleteResultRecordById(Long id);
+	int deleteResultRecordById2(Long id);
 
 	R queryPage(ResultRecordReq params, SysUserEntity user);
 
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 945b50e3..82d34c42 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
@@ -150,6 +150,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         return resultRecordMapper.deleteResultRecordById(id);
     }
 
+    @Override
+    public int deleteResultRecordById2(Long id) {
+        return resultRecordMapper.deleteResultRecordById2(id);
+    }
+
     @Override
     public R queryPage(ResultRecordReq params, SysUserEntity user) {
         List<String> departmentIds = new ArrayList<>();
@@ -353,7 +358,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             resultRecordOld.setFlowStaffIdRole(resultDetailService.initRole(resultRecordOld.getStaffId(), roleId));
             resultRecordService.insertResultRecord(resultRecordOld);
             //删除月初目标
-            resultRecordService.deleteResultRecordById(oldResultRecordId);
+            resultRecordService.deleteResultRecordById2(oldResultRecordId);
             List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(oldResultRecordId);
             for(FlowRecord flowRecord : flowRecords){
                 flowRecord.setRecordId(resultRecordOld.getId());
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index 5e2c7236..fd8e9750 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -135,6 +135,12 @@
     </update>
 
 
+    <update id="deleteResultRecordById2" parameterType="java.lang.Long">
+        update lz_result_record set is_delete = 2 where id=#{id} limit 1
+    </update>
+
+
+
 
 
     <select id="selectByCondition" resultType="com.lz.modules.sys.entity.app.ResultRecord">