From 1c2322f1b9e65798580d5fea84f115a3e4924e7f Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 5 Nov 2020 16:28:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?maxCount=E7=9A=84=E5=88=A4=E6=96=AD=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 cf35373d..e4bd1a33 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -414,6 +414,9 @@ public class ResultRecordController extends AbstractController { if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的 resultRecortModelDto.setWeight(null); } + if(resultRecortModelDto.getMaxCount().intValue() == 10000){//不限制数量 + resultRecortModelDto.setMaxCount(null); + } List detailDtos = resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType()); for (ResultDetailDto dto:detailDtos @@ -577,6 +580,9 @@ public class ResultRecordController extends AbstractController { ) { int index = 0; BigDecimal weight = BigDecimal.ZERO; + if(model.getDetailDtos().size() > model.getMaxCount().intValue()){ + return R.error(model.getName() + "维度指标不能超过" + model.getMaxCount()); + } for (ResultDetailDto detailDto:model.getDetailDtos() ) {//排序 ResultDetail resultDetail = new ResultDetail(); From 4decad63c17a0e5789f3b81e166115958ec1e159 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 5 Nov 2020 17:10:16 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=8E=BB=E6=8E=89=E5=AF=B9=E6=9D=83?= =?UTF-8?q?=E9=87=8D=E4=B9=8B=E5=92=8C=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 e4bd1a33..5a799c51 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -581,7 +581,7 @@ public class ResultRecordController extends AbstractController { int index = 0; BigDecimal weight = BigDecimal.ZERO; if(model.getDetailDtos().size() > model.getMaxCount().intValue()){ - return R.error(model.getName() + "维度指标不能超过" + model.getMaxCount()); + return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount()); } for (ResultDetailDto detailDto:model.getDetailDtos() ) {//排序 @@ -624,10 +624,10 @@ public class ResultRecordController extends AbstractController { } //下面不限权重的，计算权重之和是否超标 - if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 + /*if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 && weight.compareTo(model.getWeight()) == 1){ return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%"); - } + }*/ } //下面更新指标记录 if(inserts.size() > 0){ From 35fdbd38c233be72f19eb7ab10f35caeba9ff1fa Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 5 Nov 2020 17:19:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5a799c51..34c3de8e 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -580,7 +580,7 @@ public class ResultRecordController extends AbstractController { ) { int index = 0; BigDecimal weight = BigDecimal.ZERO; - if(model.getDetailDtos().size() > model.getMaxCount().intValue()){ + if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){ return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount()); } for (ResultDetailDto detailDto:model.getDetailDtos() From 660a4ebf5dbab63d4d708745c2b57b94d456c057 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Thu, 5 Nov 2020 17:36:27 +0800 Subject: [PATCH 4/6] =?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/flow/service/impl/StaffRoleServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index 4c95204d..4723ae33 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -371,12 +371,7 @@ public class StaffRoleServiceImpl extends ServiceImpl evaluationGroupInfos = staffRoleEvaluationGroupService.selectStaffRoleEvaluationGroupBy(roleModel.getId()); info.setEvaluationGroupInfos(evaluationGroupInfos); List all = staffMenuService.selectAll(); - List roots = staffMenuService.selectByParentId(0l); - for (StaffMenu root : roots) { - getStaffMenuInfo(root, all); - } - info.setStaffMenuInfos(roots); - + info.setStaffMenuInfos(all); List staffMenus = staffRoleMenuService.selectByRoleId(staffRole.getId()); List selectStaffMenuInfos = new ArrayList<>(); for (StaffMenu staffMenu : staffMenus) { From a183e27678b9b57153c5607290ee03c42b5d52e7 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 5 Nov 2020 18:18:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=98=AF=E5=A6=82=E6=9E=9C=E4=B8=8D=E4=BC=A0?= =?UTF-8?q?=E4=B8=8D=E8=B5=B0=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=BE=9D=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/performance/controller/FlowChartController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 394fa38c..d786a24f 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -157,10 +157,14 @@ public class FlowChartController { flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId()); flowChartDetailRecord.setStepIndex(index); + flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus()); if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){ updaes.add(flowChartDetailRecord); }else{ + if(flowChartDetailRecord.getStepType() == null){//添加时默认没有设置步骤类型，那么设置成一次 + flowChartDetailRecord.setStepType(0); + } inserts.add(flowChartDetailRecord); } if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){ From d4738c4da39b46c1a00709ea02af396ce7d05cba Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 5 Nov 2020 18:21:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/controller/FlowChartController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index d786a24f..2f066aba 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -157,14 +157,14 @@ public class FlowChartController { flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId()); flowChartDetailRecord.setStepIndex(index); - + if(flowChartDetailRecord.getStepType() == null){//添加时默认没有设置步骤类型，那么设置成一次 + flowChartDetailRecord.setStepType(0); + } flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus()); if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){ updaes.add(flowChartDetailRecord); }else{ - if(flowChartDetailRecord.getStepType() == null){//添加时默认没有设置步骤类型，那么设置成一次 - flowChartDetailRecord.setStepType(0); - } + inserts.add(flowChartDetailRecord); } if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){