From 9dd1b91771c7e75d532f868fe1c1b61bc86ae903 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 11 Nov 2020 16:54:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E7=BB=A9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/flow/service/EvaluationGroupService.java | 1 + .../flow/service/impl/EvaluationGroupServiceImpl.java | 5 +++++ .../lz/modules/flow/service/impl/FlowStartServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java index 3e3a4513..2a6c15d4 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java +++ b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java @@ -58,4 +58,5 @@ public interface EvaluationGroupService extends IService { String getEvaluationCopyIdsByEvaluationIds(String evaluationIds,Long startId); + EvaluationGroup selectEvaluationGroupByCopyId(Long copyId, Long startId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index 7dd6d7ee..fcd7b045 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -402,4 +402,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl Date: Wed, 11 Nov 2020 17:10:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AD=E9=80=94?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=8F=82=E4=B8=8E=E7=BB=A9=E6=95=88=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowStartServiceImpl.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index fee3f5bf..8789120e 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -149,8 +149,8 @@ public class FlowStartServiceImpl extends ServiceImpl> staffManages, List staffIds, - Map> mustRole, Map> selfMustRole){ + Map> mustRole, Map> selfMustRole, boolean isInsert){ List resultModelDtos = resultModelService.selectResultDtoByGroupId(evaluationGroup.getId()); @@ -341,7 +341,7 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Wed, 11 Nov 2020 17:13:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/flow/service/impl/FlowStartServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 8789120e..dcd0f9c6 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -341,7 +341,7 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Wed, 11 Nov 2020 17:43:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowStartServiceImpl.java | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index dcd0f9c6..cba4b3fd 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -379,7 +379,7 @@ public class FlowStartServiceImpl extends ServiceImpl evaluationStartStaffs = new ArrayList<>(); + //下面初始化参与人员 + for (StaffSimpleInfo staffInfo:staffIds + ) { + staffInfo.setStartId(flowStart.getId()); + + EvaluationStartStaff evaluationStartStaff = new EvaluationStartStaff(); + evaluationStartStaff.setEvaluationId(evaluationGroup.getId()); + evaluationStartStaff.setEvaluationName(evaluationGroup.getName()); + evaluationStartStaff.setStaffId(staffInfo.getId()); + evaluationStartStaff.setStartId(flowStart.getId()); + evaluationStartStaff.setDepartmentId(staffInfo.getDepartmentId()); + evaluationStartStaff.setType(CheckStaffType.STAFF.getCode()); + evaluationStartStaffs.add(evaluationStartStaff); + + + //初始化lz_result_records数据 + ResultRecord resultRecord = new ResultRecord(); + resultRecord.setDepartmentId(staffInfo.getDepartmentId()); + resultRecord.setDepartmentName(staffInfo.getDepartmentName()); + resultRecord.setStaffId(staffInfo.getId()); + resultRecord.setStaffName(staffInfo.getName()); + resultRecord.setType(1);//设置为提交目标 + resultRecord.setStatus(0);//设置为新建 + resultRecord.setStartId(flowStart.getId()); + resultRecord.setEvaluationId(evaluationGroup.getId()); + resultRecord.setFlowProcess(0);//设置为目标制定 + + //设置当前审批员工id current_approval_staff_id + resultRecord.setCurrentApprovalStaffId(staffInfo.getId()); + //设置当前审批员工姓名 current_approval_staff_name + resultRecord.setCurrentApprovalStaffName(staffInfo.getName()); + + resultRecordService.insertResultRecord(resultRecord); + staffInfo.setRecordId(resultRecord.getId()); + //下面生成实际的考核流程 + resultRecordService.initFlowRecord(resultRecord.getId()); + } + evaluationStartStaffService.insertEvaluationStartStaffs(evaluationStartStaffs); + return 0; } From 4d52ed743295b5ddd77848d72366a7128374950b Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 12 Nov 2020 09:40:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E9=A2=86=E5=AF=BC=E6=97=B6=EF=BC=8C=E4=BB=8E=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E9=87=8C=E9=9D=A2=E6=89=BE=E4=BA=BA?= =?UTF-8?q?=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 7 ++++--- src/main/java/com/lz/modules/app/dao/StaffDao.java | 2 ++ src/main/java/com/lz/modules/app/service/StaffService.java | 2 ++ .../com/lz/modules/app/service/impl/StaffServiceImpl.java | 5 +++++ .../lz/modules/flow/service/impl/FlowStartServiceImpl.java | 2 +- src/main/resources/mapper/generator/StaffDao.xml | 7 +++++++ 6 files changed, 21 insertions(+), 4 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 b14f6f35..0b932a69 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -387,9 +387,10 @@ public class ResultRecordController extends AbstractController { staffs.addAll(departManagers.getManagers()); } } - /*if(staffs.size() == 0){ - return R.error("找不到有效的评分人，设置的评分人不存在"); - }*/ + if(staffs.size() == 0){ + log.info("无法找到评分人员，开始找绩效管理人员"); + staffs = staffService.findManger(resultRecord.getId(), 4); + } for (StaffEntity staff:staffs ) { diff --git a/src/main/java/com/lz/modules/app/dao/StaffDao.java b/src/main/java/com/lz/modules/app/dao/StaffDao.java index 70f7b8c8..8a367679 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java @@ -98,4 +98,6 @@ public interface StaffDao extends BaseMapper { List selectNamesByIds(@Param("list") List sIds); List selectStaffsByGroupId(@Param("copyId") Long copyId); + + List findManger(@Param("recordId") Long recordId, @Param("flowProcess") int flowProcess); } diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java index dad4c18f..936f6f45 100644 --- a/src/main/java/com/lz/modules/app/service/StaffService.java +++ b/src/main/java/com/lz/modules/app/service/StaffService.java @@ -103,5 +103,7 @@ public interface StaffService extends IService { List selectNamesByIds(List sIds); //获取绩效考核管理员 List selectStaffsByGroupId(Long copyId); + + List findManger(Long recordId, int flowProcess); } diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index d2a37b33..a15333aa 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -529,5 +529,10 @@ public class StaffServiceImpl extends ServiceImpl impleme return staffDao.selectStaffsByGroupId(copyId); } + @Override + public List findManger(Long recordId, int flowProcess){ + return staffDao.findManger(recordId, flowProcess); + } + } diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index cba4b3fd..d1420cdd 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -383,7 +383,7 @@ public class FlowStartServiceImpl extends ServiceImpl + +