|
@@ -252,6 +252,10 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
|
|
|
if(selfOrgan.getIsAllowArrangeExam()==0&&examOrganizationRelation.getIsAllowArrangeExam()==1){
|
|
|
throw new BizException("暂无权限");
|
|
|
}
|
|
|
+ if(Objects.nonNull(examOrganizationRelation.getIsAllowArrangeExam())&&examOrganizationRelation.getIsAllowArrangeExam()==0){
|
|
|
+ List<Integer> childOrganIds = organizationService.getChildOrganIds(organizationRelation.getOrganId(), false);
|
|
|
+ examOrganizationRelationDao.updateOrganAllowArrangeExamStatus(organizationRelation.getExaminationBasicId().longValue(), 0, childOrganIds);
|
|
|
+ }
|
|
|
examOrganizationRelationDao.update(examOrganizationRelation);
|
|
|
}
|
|
|
|
|
@@ -358,6 +362,10 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
|
|
|
examOrganStatistics=new ExamOrganStatisticsDto();
|
|
|
}
|
|
|
|
|
|
+ if(Objects.isNull(examOrganStatistics.getSettlementType())){
|
|
|
+ examOrganStatistics.setIsAllowArrangeExam(1);
|
|
|
+ }
|
|
|
+
|
|
|
examOrganStatistics.setExamLifecycleLogs(examLifecycleLogDao.findWithExam(examId));
|
|
|
|
|
|
Map<String, BigDecimal> dayTransAmount=new LinkedHashMap<>();
|