Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java

@@ -334,9 +334,18 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			}
 
 
-
 			if(flowChartDetailRecord.getOptType().intValue() == ChartOptType.APPOINT.getCode()){//指定人员的
 
+				String roles = null;
+				if(flowChartRoles != null && flowChartRoles.size() > 0){//
+					roles = flowChartRoles.stream().map(new Function<FlowChartRole, String>() {
+						@Override
+						public String apply(FlowChartRole flowChartRole) {
+							return flowChartRole.getRoleId().toString();
+						}
+					}).collect(Collectors.joining(","));
+
+				}
 
 				String[] optIds = flowChartDetailRecord.getOptIds().split(",");
 
@@ -352,24 +361,21 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 					flowApprovalRole.setType(flowChartDetailRecord.getOptType());
 					flowApprovalRoles.add(flowApprovalRole);
 					flowApprovalRole.setStepIndex(stepIndex);
-					if(flowChartDetailRecord.getStepType().intValue() == 0){
+					if(roles != null){
-						//依次
-						stepIndex++;
-					}
-
-					if(flowChartRoles != null && flowChartRoles.size() > 0){//设置必备权限
-						String roles = flowChartRoles.stream().map(new Function<FlowChartRole, String>() {
-							@Override
-							public String apply(FlowChartRole flowChartRole) {
-								return flowChartRole.getRoleId().toString();
-							}
-						}).collect(Collectors.joining(","));
 						if(flowApprovalRole.getRoleId() == null || flowApprovalRole.getRoleId().length() == 0){
 							flowApprovalRole.setRoleId(roles);
 						}else{
 							flowApprovalRole.setRoleId(flowApprovalRole.getRoleId() + "," + roles);
 						}
 					}
+
+
+					if(flowChartDetailRecord.getStepType().intValue() == 0){
+						//依次
+						stepIndex++;
+					}
+
+
 				}
 				//stepIndex++;
 				if(flowApprovalRole != null){
@@ -377,7 +383,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				}
 
 			}else{
-				if(flowChartDetailRecord.getOptType().intValue() == ChartOptType.SELF.getCode()) {//指定人员的
+				if(flowChartDetailRecord.getOptType().intValue() == ChartOptType.SELF.getCode()) {//参与人员为自己的
 					//获取被考核人的必备权限
 					if (selfMustRole.containsKey(flow.getChartId())) {
 						flowChartRoles.addAll(selfMustRole.get(flow.getChartId()));
@@ -396,7 +402,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				flowApprovalRoles.add(flowApprovalRole);
 				flowApprovalRole.setStepIndex(stepIndex);
 
-				if(flowChartRoles != null && flowChartRoles.size() > 0){//设置必备权限
+				if(flowChartRoles != null && flowChartRoles.size() > 0){//
 					String roles = flowChartRoles.stream().map(new Function<FlowChartRole, String>() {
 						@Override
 						public String apply(FlowChartRole flowChartRole) {

src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java

@@ -116,6 +116,9 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 			}
 			ResultModel resultModel = new ResultModel();
 			BeanUtils.copyProperties(itemReq, resultModel);
+			if(resultModel.getMaxCount() == null){
+				resultModel.setMaxCount(10000);
+			}
 			resultModel.setCalculateId(resultModelDetailReq.getCalculateId());
 			resultModel.setGradeGroupId(resultModelDetailReq.getGradeGroupId());
 			resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus());

src/main/java/com/lz/modules/performance/controller/ResultModelController.java

@@ -53,6 +53,9 @@ public class ResultModelController {
             resultModelDetailReq.setGradeGroupId(dto.getGradeGroupId());
             ResultModelItemReq itemReq = new ResultModelItemReq();
             BeanUtils.copyProperties(dto, itemReq);
+            if(dto.getMaxCount().intValue() == 10000){
+                itemReq.setMaxCount(null);
+            }
             List<ResultTagetLibItemReq> req = resultTagetLibService.selectResultTagetLibByModelReqId(dto.getId());
             itemReq.setTagetLibItems(req);
             modelItems.add(itemReq);