From f93210b175aad11ca5df6db819cecd205e46b134 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 26 Aug 2020 10:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=E7=9E=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 1 + .../lz/modules/app/req/ResultRecordReq.java | 4 +++ .../modules/sys/entity/app/ResultRecord.java | 22 ++++++++++++++++ .../app/impl/ResultRecordServiceImpl.java | 18 ++++++++++--- .../mapper/app/ResultRecordMapper.xml | 25 ++++++++++++++----- src/test/java/com/lz/mysql/MysqlMain.java | 2 +- 6 files changed, 62 insertions(+), 10 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 0d3d1add..0360f5df 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -187,6 +187,7 @@ public class ResultRecordController extends AbstractController { listAuth = recordAuthService.selectAuthInfo(staffRoleMap.get(getUserId())); auth = recordAuthService.getAuth(listAuth); } + List resultDetails = resultDetailService.selectByRecordId(resultRecord.getId()); BigDecimal sumWenHuaJiaZhiGuan = BigDecimal.ZERO; BigDecimal sumYeJi = BigDecimal.ZERO; diff --git a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java index e0107ffa..ba5e7afe 100644 --- a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java +++ b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java @@ -37,4 +37,8 @@ public class ResultRecordReq { private Long rollbackFlowId; private List statusList ; private String statusStr; + private Long approvalStaffId; + + + } diff --git a/src/main/java/com/lz/modules/sys/entity/app/ResultRecord.java b/src/main/java/com/lz/modules/sys/entity/app/ResultRecord.java index b2b2ef11..b3ba6bba 100644 --- a/src/main/java/com/lz/modules/sys/entity/app/ResultRecord.java +++ b/src/main/java/com/lz/modules/sys/entity/app/ResultRecord.java @@ -48,6 +48,12 @@ public class ResultRecord implements java.io.Serializable { private String departmentName; //员工姓名 private String staffName; + + //当前审批的员工 id + private Long currentApprovalStaffId; + //当前审批的员工名，以逗号隔开 + private String currentApprovalStaffName; + /** * * @return @@ -277,6 +283,22 @@ public class ResultRecord implements java.io.Serializable { this.staffName = staffName; } + public Long getCurrentApprovalStaffId() { + return currentApprovalStaffId; + } + + public void setCurrentApprovalStaffId(Long currentApprovalStaffId) { + this.currentApprovalStaffId = currentApprovalStaffId; + } + + public String getCurrentApprovalStaffName() { + return currentApprovalStaffName; + } + + public void setCurrentApprovalStaffName(String currentApprovalStaffName) { + this.currentApprovalStaffName = currentApprovalStaffName; + } + @Override public String toString() { return "ResultRecord{" + 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 5633a0bd..b42e5e85 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 @@ -164,6 +164,9 @@ public class ResultRecordServiceImpl extends ServiceImpl resultRecordMapper.selectByConditionByLeader(page, params) ); - List resultRecords = pageUtils.getList(); if (CollectionUtils.isNotEmpty(resultRecords)) { List list = new ArrayList<>(); @@ -365,6 +367,9 @@ public class ResultRecordServiceImpl extends ServiceImpl staffRoles = staffRoleService.selectByRole(departmentLevel); + for (StaffRole staffRole : staffRoles) { List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); Map departmentIdMap = departmentsService.selectUserAllDepartmentIds(resultRecord.getDepartmentId()); for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) { String value = departmentIdMap.get(staffRoleDepartment.getDepartmentId()); if (StringUtil.isNotBlank(value)) { - StaffRoleDto staffRoleDto = new StaffRoleDto(staffRole.getStaffId(), TypeRoleDto.getRoleId(staffRole.getTypeRoleIds(),resultRecord.getType())); + StaffRoleDto staffRoleDto = new StaffRoleDto(staffRole.getStaffId(), TypeRoleDto.getRoleId(staffRole.getTypeRoleIds(), resultRecord.getType())); staffRoleDtos.add(staffRoleDto); } } } - if (staffRoleDtos.size() == 1) { //表示只有一个审批的用户 + + if (staffRoleDtos.size() >= 1) { //表示只有一个审批的用户 approvalStaff = staffService.selectStaffById(staffRoleDtos.get(0).getStaffId()); } } else { @@ -410,14 +417,19 @@ public class ResultRecordServiceImpl extends ServiceImpl + + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, month_time AS monthTime, status AS status, last_score AS lastScore, all_score AS allScore, remark AS remark, staff_id AS staffId, type AS type, flow_staff_id_role AS flowStaffIdRole, department_id AS departmentId, department_name AS departmentName, staff_name AS staffName + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, month_time AS monthTime, status AS status, last_score AS lastScore, all_score AS allScore, remark AS remark, staff_id AS staffId, type AS type, flow_staff_id_role AS flowStaffIdRole, department_id AS departmentId, department_name AS departmentName, staff_name AS staffName, current_approval_staff_id AS currentApprovalStaffId, current_approval_staff_name AS currentApprovalStaffName @@ -48,6 +50,8 @@ department_id, department_name, staff_name, + current_approval_staff_id, + current_approval_staff_name, is_delete, gmt_create, gmt_modified @@ -63,6 +67,8 @@ #{ departmentId}, #{ departmentName}, #{ staffName}, + #{ currentApprovalStaffId}, + #{ currentApprovalStaffName}, 0, now(), now() @@ -86,7 +92,9 @@ flow_staff_id_role = #{flowStaffIdRole}, department_id = #{departmentId}, department_name = #{departmentName}, - staff_name = #{staffName} + staff_name = #{staffName}, + current_approval_staff_id = #{currentApprovalStaffId}, + current_approval_staff_name = #{currentApprovalStaffName} ,gmt_modified = now() where id = #{id} @@ -109,7 +117,9 @@ flow_staff_id_role = #{flowStaffIdRole}, department_id = #{departmentId}, department_name = #{departmentName}, - staff_name = #{staffName} + staff_name = #{staffName}, + current_approval_staff_id = #{currentApprovalStaffId}, + current_approval_staff_name = #{currentApprovalStaffName} ,gmt_modified = now() where id = #{id} @@ -120,6 +130,7 @@ + - update lz_result_record set flow_staff_id_role = '[]',status = 4 where id = #{id} + update lz_result_record set flow_staff_id_role = '[]',status = 4,current_approval_staff_id = null ,current_approval_staff_name = null where id = #{id}