From 00ed287025841becc817584e81ab292b65c5df44 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Thu, 20 Aug 2020 15:08:56 +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/app/controller/TestController.java | 6 ------ .../com/lz/modules/app/entity/StaffEntity.java | 4 ---- .../com/lz/modules/app/resp/ResultRecordResp.java | 14 ++------------ .../impl/DepartmentsStaffRelateServiceImpl.java | 2 +- .../modules/app/service/impl/StaffServiceImpl.java | 1 - .../flow/service/impl/RecordAuthServiceImpl.java | 3 +-- .../service/app/impl/ResultRecordServiceImpl.java | 4 ++-- .../resources/mapper/app/ResultRecordMapper.xml | 2 +- .../resources/mapper/flow/FlowDepartmentMapper.xml | 2 +- 9 files changed, 8 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index 18f4f6b3..02c19cce 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -63,12 +63,6 @@ public class TestController { } } - - - - - - @RequestMapping("/test/relate") public void relate(){ List list = departmentsStaffRelateService.selectAll(); diff --git a/src/main/java/com/lz/modules/app/entity/StaffEntity.java b/src/main/java/com/lz/modules/app/entity/StaffEntity.java index 9146c6a3..c04b2820 100644 --- a/src/main/java/com/lz/modules/app/entity/StaffEntity.java +++ b/src/main/java/com/lz/modules/app/entity/StaffEntity.java @@ -109,10 +109,6 @@ public class StaffEntity implements Serializable { * 工号 */ private String jobNumber; - /** - * 是否为领导 不存入staff表中 - * */ - private Integer isLeader; //密码 diff --git a/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java b/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java index 8aca047d..3346ff4a 100644 --- a/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java +++ b/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java @@ -34,16 +34,6 @@ public class ResultRecordResp { private String departmentName; - public String getStatusStr() { - if (this.status == 0) { - return "新建"; - } else if (this.status == 1) { - return "审批中"; - } else if (this.status == 2) { - return "拒绝"; - } else if (this.status == 3) { - return "审批通过"; - } - return ""; - } + private Integer type ; + } diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java index 733d3454..676d97b8 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java @@ -45,7 +45,7 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl impleme staffEntity.setUnionId(staffBo.getUnionId()); staffEntity.setAvatar(staffBo.getAvatar()); staffEntity.setJobNumber(staffBo.getEmployeeNo()); - staffEntity.setIsLeader(staffBo.getIsLeader()); return staffEntity; } diff --git a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java index b44c36e4..2404036f 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java @@ -33,7 +33,6 @@ public class RecordAuthServiceImpl extends ServiceImpl list = JSONObject.parseArray(flowStaffIdRole, StaffRoleDto.class); if (CollectionUtils.isNotEmpty(list)) { - staffEntityMap = list.stream().collect(Collectors.toMap(StaffRoleDto::getStaffId, StaffRoleDto::getRole)); + staffEntityMap = list.stream().collect(Collectors.toMap(StaffRoleDto::getStaffId, StaffRoleDto::getRoleId)); } } return staffEntityMap; 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 0bdc6ae5..f98137b0 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 @@ -124,6 +124,7 @@ public class ResultRecordServiceImpl extends ServiceImpl(setStaffId); } } + if(StringUtil.isNotBlank(params.getName())){ List staffEntities = staffService.selectByName(params.getName()); if(CollectionUtils.isNotEmpty(staffEntities)){ @@ -133,9 +134,8 @@ public class ResultRecordServiceImpl extends ServiceImpl resultRecordMapper.selectByCondition(page, params) diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index c6b540ab..38c51b7c 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -130,11 +130,11 @@ #{item} + and staff_id = #{req.staffId} order by id desc - - select * from lz_flow_department where is_delete = 0 and taff_id = #{staffId} limit 1 + select * from lz_flow_department where is_delete = 0 and staff_id = #{staffId} limit 1