From 2a61ea07817f1f1ee80cac145b7ff2bef5a00d00 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Sat, 10 Oct 2020 15:54:44 +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/dao/FlowRecordMapper.java |  2 ++
 .../flow/service/FlowRecordService.java       |  2 ++
 .../service/impl/FlowRecordServiceImpl.java   |  5 +++
 .../app/impl/ResultRecordServiceImpl.java     |  4 ++-
 src/main/resources/application-dev.yml        |  6 ++--
 .../mapper/flow/FlowRecordMapper.xml          | 35 +++++++++++++++++++
 6 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
index ccf2ec62..99a4bd10 100644
--- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
@@ -48,4 +48,6 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
 	List<FlowRecord> selectFlowRecordByResultRecordIdType(@Param("resultRecordId") Long resultRecordId, @Param("type") Integer type);
 
     List<FlowRecord> selectFlowRecordByResultRecordIdTypeStatus(@Param("recordResultId") Long recordResultId, @Param("type") Integer type, @Param("status") int status);
+
+	Long copyFlowRecord(FlowRecord flowRecord);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
index 33055d1b..9e5c519d 100644
--- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
+++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
@@ -50,4 +50,6 @@ public interface FlowRecordService extends IService<FlowRecord> {
 	List<FlowRecord> selectFlowRecordByResultRecordIdType(Long recordResultId, Integer type);
 
 	List<FlowRecord> selectFlowRecordByResultRecordIdTypeStatus(Long recordResultId, Integer type, int status);
+
+	Long copyFlowRecord(FlowRecord flowRecord);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
index ccaf4b24..57dd8f77 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
@@ -133,5 +133,10 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
 		return flowRecordMapper.selectFlowRecordByResultRecordIdTypeStatus(recordResultId,type,status);
 	}
 
+	@Override
+	public Long copyFlowRecord(FlowRecord flowRecord) {
+		return flowRecordMapper.copyFlowRecord(flowRecord);
+	}
+
 
 }
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 4234dd70..d192f7a7 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
@@ -374,13 +374,15 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             //删除月初目标
             resultRecordService.deleteResultRecordById2(oldResultRecordId);
             List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(oldResultRecordId);
+
             for(FlowRecord flowRecord : flowRecords){
                 flowRecord.setRecordId(resultRecordOld.getId());
                 flowRecord.setId(null);
                 flowRecord.setType(Constant.ONE);
                 //新增record
-                flowRecordService.insertFlowRecord(flowRecord);
+                flowRecordService.copyFlowRecord(flowRecord);
             }
+
             flowRecordService.initFlowRecord(resultRecordOld, roleId, recordType, "月未总结");
             resultRecordNew = resultRecordOld;
             List<ResultDetail> resultDetails = resultDetailService.selectByRecordId(recordId);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f3c0b9d9..fca703e3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,9 +3,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://172.16.157.238:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-            username: ldd_biz
-            password: Hello1234
+            url: jdbc:mysql://rm-bp1xhc66ruz72t68p.mysql.rds.aliyuncs.com:3306/lz_manger?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+            username: lz_manger
+            password: N8zfBwhOC
             initial-size: 10
             max-active: 100
             min-idle: 10
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index 4d89b4c2..f715e1a4 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -72,6 +72,41 @@
         )
     </insert>
 
+    <insert id="copyFlowRecord" parameterType="FlowRecord" useGeneratedKeys="true" keyProperty="id" >
+        insert into lz_flow_record(
+        <if test="departmentLevel != null">department_level, </if>
+        <if test="recordId != null">record_id, </if>
+        <if test="approvalStaffId != null">approval_staff_id, </if>
+        <if test="approvalStaffName != null">approval_staff_name, </if>
+        <if test="flowName != null">flow_name, </if>
+        <if test="recordStaffId != null">record_staff_id, </if>
+        <if test="flowId != null">flow_id, </if>
+        <if test="flowIndex != null">flow_index, </if>
+        <if test="status != null">status, </if>
+        <if test="flowStaffIdRole != null">flow_staff_id_role, </if>
+        <if test="statusName != null">status_name, </if>
+        <if test="type != null">type, </if>
+        is_delete,
+        gmt_create,
+        gmt_modified
+        )values(
+        <if test="departmentLevel != null">#{ departmentLevel}, </if>
+        <if test="recordId != null">#{ recordId}, </if>
+        <if test="approvalStaffId != null">#{ approvalStaffId}, </if>
+        <if test="approvalStaffName != null">#{ approvalStaffName}, </if>
+        <if test="flowName != null">#{ flowName}, </if>
+        <if test="recordStaffId != null">#{ recordStaffId}, </if>
+        <if test="flowId != null">#{ flowId}, </if>
+        <if test="flowIndex != null">#{ flowIndex}, </if>
+        <if test="status != null">#{ status}, </if>
+        <if test="flowStaffIdRole != null">#{ flowStaffIdRole}, </if>
+        <if test="statusName != null">#{ statusName}, </if>
+        <if test="type != null">#{ type}, </if>
+        0,
+        #{ gmtCreate},
+        #{ gmtModified}
+        )
+    </insert>
 
     <update id="updateFlowRecordById" parameterType="FlowRecord" >
         update