From 07023f79d2cb4f776258ce2c43918132a5f300bb Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 11 Nov 2020 10:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E8=80=83=E6=A0=B8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=83=A8=E5=88=86=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/service/impl/FlowStartServiceImpl.java | 16 +++++++++++++++- 1 file changed, 15 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 ed7e347d..d148234a 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 @@ -20,6 +20,7 @@ import com.lz.modules.sys.entity.app.ResultDetail; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultDetailService; import com.lz.modules.sys.service.app.ResultRecordService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -41,6 +42,7 @@ import java.util.stream.Collectors; */ @Service +@Slf4j public class FlowStartServiceImpl extends ServiceImpl implements FlowStartService { @@ -130,8 +132,10 @@ public class FlowStartServiceImpl extends ServiceImpl staffSimpleInfos = staffService.selectStaffSimpleInfos(groupStaffs.getStaffIds()); if(staffSimpleInfos.size() == 0){ + log.info("无有效考核人员"); R.error(groupStaffs.getEvaluationGroup().getName() + "——无有效考核人员"); } switch (start(groupStaffs.getEvaluationGroup(), flowStart, staffManages, staffSimpleInfos, mustRole, selfMustRole)){ @@ -165,8 +170,10 @@ public class FlowStartServiceImpl extends ServiceImpl staffIds = evaluationGroupService.selectAllStaffSimpleInfoByGroupId(evaluationGroup); if(staffIds.size() == 0){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 - + log.info("无有效考核人员"); return R.error(evaluationGroup.getName() + "——无有效考核人员"); } if(flowStart.getIsDelete() != null){//已经发起过的 @@ -260,6 +268,7 @@ public class FlowStartServiceImpl extends ServiceImpl resultModelDtos = resultModelService.selectResultDtoByGroupId(evaluationGroup.getId()); if(resultModelDtos.size() == 0){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 + log.info("没有设置考核模板"); return 1; } List flowCharts = flowChartService.selectFlowChartsByGroupId(evaluationGroup.getId()); if(flowCharts.size() == 0){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 + log.info("无有效绩效流程节点"); return 2; } List flowChartDetailRecords = new ArrayList<>(); @@ -312,6 +323,7 @@ public class FlowStartServiceImpl extends ServiceImpl chartNameMaps = @@ -322,6 +334,7 @@ public class FlowStartServiceImpl extends ServiceImpl