From 81aa664cb358001b76c4894b4f1eaf8475ccf23a Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 30 Oct 2020 11:06:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/flow/model/GroupStaffs.java | 3 +- .../lz/modules/flow/model/StartGroups.java | 2 +- .../service/impl/FlowStartServiceImpl.java | 81 ++++++++++++------- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/model/GroupStaffs.java b/src/main/java/com/lz/modules/flow/model/GroupStaffs.java index 307a2a29..789ac5cd 100644 --- a/src/main/java/com/lz/modules/flow/model/GroupStaffs.java +++ b/src/main/java/com/lz/modules/flow/model/GroupStaffs.java @@ -1,11 +1,12 @@ package com.lz.modules.flow.model; +import com.lz.modules.flow.entity.EvaluationGroup; import lombok.Data; import java.util.List; //组，人员ids @Data public class GroupStaffs { - private Long groupId; + private EvaluationGroup evaluationGroup; private List staffIds; } diff --git a/src/main/java/com/lz/modules/flow/model/StartGroups.java b/src/main/java/com/lz/modules/flow/model/StartGroups.java index eb770c6b..fdd75add 100644 --- a/src/main/java/com/lz/modules/flow/model/StartGroups.java +++ b/src/main/java/com/lz/modules/flow/model/StartGroups.java @@ -7,5 +7,5 @@ import java.util.List; @Data public class StartGroups { private Long startId; - private List staffIds; + private List groups; } 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 a7f4f48a..53d10c46 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 @@ -10,10 +10,7 @@ import com.lz.modules.app.entity.StaffSimpleInfo; import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.*; -import com.lz.modules.flow.model.DepartManagers; -import com.lz.modules.flow.model.ResultModelDto; -import com.lz.modules.flow.model.ResultTagetLibDto; -import com.lz.modules.flow.model.StartGroups; +import com.lz.modules.flow.model.*; import com.lz.modules.flow.service.*; import com.lz.modules.performance.service.ResultTagetLibService; import com.lz.modules.sys.entity.app.ResultDetail; @@ -135,6 +132,28 @@ public class FlowStartServiceImpl extends ServiceImpl> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找 + for (GroupStaffs groupStaffs:startGroupStaffIds.getGroups() + ) { + List staffSimpleInfos = staffService.selectStaffSimpleInfos(groupStaffs.getStaffIds()); + if(staffSimpleInfos.size() == 0){ + R.error(groupStaffs.getEvaluationGroup().getName() + "——无有效考核人员"); + } + switch (start(groupStaffs.getEvaluationGroup(), flowStart, staffManages, staffSimpleInfos)){ + + case 1: + return R.error(groupStaffs.getEvaluationGroup().getName() + "——没有设置考核模板"); + case 2: + return R.error(groupStaffs.getEvaluationGroup().getName() + "——没有绩效流程节点"); + case 3: + return R.error(groupStaffs.getEvaluationGroup().getName() + "——没有设置考核流程"); + case 4: + return R.error(groupStaffs.getEvaluationGroup().getName() + "——没有设置绩效管理人员"); + case 5: + return R.error(groupStaffs.getEvaluationGroup().getName() + "——初始化考核流程失败"); + } + } + return R.ok(); } @@ -180,44 +199,45 @@ public class FlowStartServiceImpl extends ServiceImpl staffIds = evaluationGroupService.selectAllStaffSimpleInfoByGroupId(evaluationGroup); + + if(staffIds.size() == 0){ + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 + + return R.error(evaluationGroup.getName() + "——无有效考核人员"); + } + switch (start(evaluationGroup, flowStart, staffManages, staffIds)){ + case 1: - return R.error(evaluationGroup.getName() + "——无有效考核人员"); - case 2: return R.error(evaluationGroup.getName() + "——没有设置考核模板"); - case 3: + case 2: return R.error(evaluationGroup.getName() + "——没有绩效流程节点"); - case 4: + case 3: return R.error(evaluationGroup.getName() + "——没有设置考核流程"); - case 5: + case 4: return R.error(evaluationGroup.getName() + "——没有设置绩效管理人员"); - case 6: + case 5: return R.error(evaluationGroup.getName() + "——初始化考核流程失败"); } } return R.ok("发起成功").put("data", flowStart); } - private int start(EvaluationGroup evaluationGroup, FlowStart flowStart, Map> staffManages){ + private int start(EvaluationGroup evaluationGroup, FlowStart flowStart, + Map> staffManages, List staffIds){ - //下面初始化员工考核流程 - List staffIds = evaluationGroupService.selectAllStaffSimpleInfoByGroupId(evaluationGroup); - if(staffIds.size() == 0){ - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 - - return 1; - } List resultModelDtos = resultModelService.selectResultDtoByGroupId(evaluationGroup.getId()); if(resultModelDtos.size() == 0){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 - return 2; + return 1; } List flowCharts = flowChartService.selectFlowChartsByGroupId(evaluationGroup.getId()); if(flowCharts.size() == 0){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 - return 3; + return 2; } List flowChartDetailRecords = new ArrayList<>(); for (FlowChart chart:flowCharts @@ -229,7 +249,7 @@ public class FlowStartServiceImpl extends ServiceImpl chartNameMaps = flowCharts.stream().collect(Collectors.toMap(FlowChart::getId, FlowChart::getName));//流程节点与流程名称对应map，下面多次循环，减少数据库查找 @@ -249,15 +269,18 @@ public class FlowStartServiceImpl extends ServiceImpl resultTagetLibs = new ArrayList<>(); @@ -512,7 +535,7 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Fri, 30 Oct 2020 11:12:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/flow/service/impl/FlowStartServiceImpl.java | 6 +----- .../resources/mapper/flow/FlowChartDetailRecordMapper.xml | 3 +++ 2 files changed, 4 insertions(+), 5 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 53d10c46..03176ce6 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 @@ -128,10 +128,6 @@ public class FlowStartServiceImpl extends ServiceImpl staffSimpleInfos = staffService.selectStaffSimpleInfos(staffIds); - if(staffSimpleInfos.size() == 0){ - return R.error("无有效考核人员，考核人员已离职"); - }*/ Map> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找 for (GroupStaffs groupStaffs:startGroupStaffIds.getGroups() ) { @@ -154,7 +150,7 @@ public class FlowStartServiceImpl extends ServiceImpl + + + From 5288a78da0ec1390c5716e99dd11df15fbf46d9a Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 30 Oct 2020 11:49:26 +0800 Subject: [PATCH 4/5] =?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 --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- .../modules/sys/service/app/impl/ResultRecordServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 e6265239..b140f833 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -850,7 +850,7 @@ public class ResultRecordController extends AbstractController { /** * 删除 */ - // 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1&loginUserId=825&comment=xxx&menuName=bbb + // 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=267&status=1&comment=xxx&menuName=bbb // 跳过：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=4&menuName=bbb&flowRecordId=360 // 转交：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=8&menuName=bbb&flowRecordId=360&transferStaffId=294 @RequestMapping("/new/approval") 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 addfad95..62055e1a 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 @@ -861,7 +861,7 @@ public class ResultRecordServiceImpl extends ServiceImpl Date: Fri, 30 Oct 2020 11:54:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowStartServiceImpl.java | 22 ------------------- .../resources/mapper/generator/StaffDao.xml | 2 +- 2 files changed, 1 insertion(+), 23 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 5f28a574..34f7fc6f 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 @@ -251,18 +251,7 @@ public class FlowStartServiceImpl extends ServiceImpl staffManagers = staffService.selectStaffsByGroupId(evaluationGroup.getCopyId()); - /*if(!StringUtil.isEmpty(evaluationGroup.getManagerIds())){ - List mIds = Arrays.stream(evaluationGroup.getManagerIds().split(",")) - .map(new Function() { - @Override - public Long apply(String s) { - return Long.parseLong(s); - } - }).collect(Collectors.toList()); - //查找在职的管理人员 - staffManagers = staffService.selectOnJobByIds(mIds); - }*/ if(staffManagers == null || staffManagers.size() == 0){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 return 4; @@ -372,18 +361,7 @@ public class FlowStartServiceImpl extends ServiceImpl evaluationStartStaffs = new ArrayList<>(); - /*//下面初始化管理人员对应关系 - for (StaffEntity entity:staffManagers - ) { - EvaluationStartStaff evaluationStartStaff = new EvaluationStartStaff(); - evaluationStartStaff.setEvaluationId(evaluationGroup.getId()); - evaluationStartStaff.setEvaluationName(evaluationGroup.getName()); - evaluationStartStaff.setStaffId(entity.getId()); - evaluationStartStaff.setStartId(flowStart.getId()); - evaluationStartStaff.setType(CheckStaffType.MANAGER.getCode()); - evaluationStartStaffs.add(evaluationStartStaff); - }*/ //下面初始化参与人员 diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 9f372eb1..187511c6 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -541,7 +541,7 @@