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 12e9bef4..5109f97f 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -42,4 +42,6 @@ public interface FlowRecordMapper extends BaseMapper { List selectFlowRecordByResultRecordIdFlowId(@Param("recordId") Long recordId); List selectFlowRecordByFlowId(@Param("recordId") Long recordId); + + FlowRecord selectLastFlowNoStatusRecordByRecordId(@Param("recordId") Long recordId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/FlowRecord.java b/src/main/java/com/lz/modules/flow/entity/FlowRecord.java index d4af8ac9..0b635bb7 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowRecord.java +++ b/src/main/java/com/lz/modules/flow/entity/FlowRecord.java @@ -9,7 +9,7 @@ import java.util.Date; * 菜单权限表 *

*流转记录表 * @author quyixiao -* @since 2020-08-21 +* @since 2020-09-03 */ @Data @@ -44,6 +44,8 @@ public class FlowRecord implements java.io.Serializable { private Integer status; // 员工&权限id private String flowStaffIdRole; + //状态名称 + private String statusName; /** * * @return @@ -254,6 +256,21 @@ public class FlowRecord implements java.io.Serializable { this.flowStaffIdRole = flowStaffIdRole; } + /** + * 状态名称 + * @return + */ + public String getStatusName() { + return statusName; + } + /** + * 状态名称 + * @param statusName + */ + public void setStatusName(String statusName) { + this.statusName = statusName; + } + @Override public String toString() { return "FlowRecord{" + @@ -271,6 +288,7 @@ public class FlowRecord implements java.io.Serializable { ",flowIndex=" + flowIndex + ",status=" + status + ",flowStaffIdRole=" + flowStaffIdRole + + ",statusName=" + statusName + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/enums/FlowRecordEnum.java b/src/main/java/com/lz/modules/flow/enums/FlowRecordEnum.java new file mode 100644 index 00000000..f71af01e --- /dev/null +++ b/src/main/java/com/lz/modules/flow/enums/FlowRecordEnum.java @@ -0,0 +1,26 @@ +package com.lz.modules.flow.enums; + + +public enum FlowRecordEnum { + APPROVAL("通过"), REJECT("驳回"),COMMIT("提交"), CONFIRM("确认中"), START("开始"), END("结束"),APPROVALING("审批中"); + + private String name; + + + FlowRecordEnum(String name) { + this.name = name; + } + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public static void main(String[] args) { + System.out.println(APPROVAL.getName()); + } +} 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 b1fd5ef3..f81778e3 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -44,4 +44,6 @@ public interface FlowRecordService extends IService { List selectFlowRecordByResultRecordIdFlowId(Long recordResultId); List selectFlowRecordByFlowId(Long recordId); + + FlowRecord selectLastFlowNoStatusRecordByRecordId(Long resultRecordId); } \ 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 66bed480..e018ea91 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 @@ -7,6 +7,7 @@ import com.lz.modules.app.service.StaffService; import com.lz.modules.app.utils.t.OneTuple; import com.lz.modules.flow.dao.FlowRecordMapper; import com.lz.modules.flow.entity.FlowRecord; +import com.lz.modules.flow.enums.FlowRecordEnum; import com.lz.modules.flow.model.StaffRoleDto; import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.sys.entity.app.ResultRecord; @@ -102,6 +103,7 @@ public class FlowRecordServiceImpl extends ServiceImpl flows = flowService.selectByFlowId(flowId); FlowRecord lastFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(resultRecordId); FlowRecord notFlowRecord = flowRecordService.selectNotApprovalStaffIdFlowRecords(resultRecord.getId()); @@ -385,6 +385,7 @@ public class ResultRecordServiceImpl extends ServiceImpl= approvalList.size()) { //表示流程己经结束 lastFlowRecord.setFlowName(mySelf.getName() + "-审批通过"); + lastFlowRecord.setStatusName(FlowRecordEnum.END.getName()); flowRecordService.updateCoverFlowRecordById(lastFlowRecord); resultRecordService.updateFlowStaffIdRoleToNull(resultRecord.getId());// 更新用户权限 return R.ok("流程审批结束") @@ -428,6 +429,18 @@ public class ResultRecordServiceImpl extends ServiceImpl + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, department_level AS departmentLevel, record_id AS recordId, approval_staff_id AS approvalStaffId, approval_staff_name AS approvalStaffName, flow_name AS flowName, record_staff_id AS recordStaffId, flow_id AS flowId, flow_index AS flowIndex, status AS status, flow_staff_id_role AS flowStaffIdRole + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, department_level AS departmentLevel, record_id AS recordId, approval_staff_id AS approvalStaffId, approval_staff_name AS approvalStaffName, flow_name AS flowName, record_staff_id AS recordStaffId, flow_id AS flowId, flow_index AS flowIndex, status AS status, flow_staff_id_role AS flowStaffIdRole, status_name AS statusName @@ -46,6 +47,7 @@ flow_index, status, flow_staff_id_role, + status_name, is_delete, gmt_create, gmt_modified @@ -60,6 +62,7 @@ #{ flowIndex}, #{ status}, #{ flowStaffIdRole}, + #{ statusName}, 0, now(), now() @@ -82,7 +85,8 @@ flow_id = #{flowId}, flow_index = #{flowIndex}, status = #{status}, - flow_staff_id_role = #{flowStaffIdRole} + flow_staff_id_role = #{flowStaffIdRole}, + status_name = #{statusName} ,gmt_modified = now() where id = #{id} @@ -104,7 +108,8 @@ flow_id = #{flowId}, flow_index = #{flowIndex}, status = #{status}, - flow_staff_id_role = #{flowStaffIdRole} + flow_staff_id_role = #{flowStaffIdRole}, + status_name = #{statusName} ,gmt_modified = now() where id = #{id} @@ -116,6 +121,9 @@ + + + @@ -138,6 +146,10 @@ select * from lz_flow_record where is_delete = 0 and record_id = #{recordId} + + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 52c8fa88..479cac29 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -63,7 +63,7 @@ public class MysqlMain { } List list = new ArrayList(); - list.add(new TablesBean("lz_result_detail")); + list.add(new TablesBean("lz_flow_record")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();