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 { List selectFlowRecordByResultRecordIdType(@Param("resultRecordId") Long resultRecordId, @Param("type") Integer type); List 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 { List selectFlowRecordByResultRecordIdType(Long recordResultId, Integer type); List 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 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 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 into lz_flow_record( + department_level, + record_id, + approval_staff_id, + approval_staff_name, + flow_name, + record_staff_id, + flow_id, + flow_index, + status, + flow_staff_id_role, + status_name, + type, + is_delete, + gmt_create, + gmt_modified + )values( + #{ departmentLevel}, + #{ recordId}, + #{ approvalStaffId}, + #{ approvalStaffName}, + #{ flowName}, + #{ recordStaffId}, + #{ flowId}, + #{ flowIndex}, + #{ status}, + #{ flowStaffIdRole}, + #{ statusName}, + #{ type}, + 0, + #{ gmtCreate}, + #{ gmtModified} + ) + update