From be7d3481ea9ab0f41fbb0d61232d16b4b1c661e0 Mon Sep 17 00:00:00 2001 From: bianyadong Date: Sat, 11 May 2024 16:43:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E8=81=8C=E4=BD=8D=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E8=80=83=E6=A0=B8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EmployeeTrainingServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java index b4cfc6cb3..de66cd777 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java @@ -12,6 +12,7 @@ import com.cool.store.entity.*; import com.cool.store.enums.AssessmentTemplateType; import com.cool.store.enums.ExamStatusEnum; import com.cool.store.enums.MessageEnum; +import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.video.ResourceStatusEnum; import com.cool.store.enums.video.UploadTypeEnum; import com.cool.store.exception.ServiceException; @@ -492,7 +493,12 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { Map regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId())); assessmentUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId())); - List assessmentTemplateDOList = assessmentTemplateDAO.listByType(AssessmentTemplateType.STORE_MANAGER.getCode()); + Integer templateType = AssessmentTemplateType.STORE_MANAGER.getCode(); + if(UserRoleEnum.XFSG_CLERK.getCode().equals(tempUserDetailDO.getRoleId())){ + templateType = AssessmentTemplateType.CLERK.getCode(); + } + + List assessmentTemplateDOList = assessmentTemplateDAO.listByType(templateType); List templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList()); @@ -553,8 +559,11 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard()); String userId = enterpriseUserDO.getUserId(); AtomicReference totalScore = new AtomicReference<>(0L); - - List assessmentTemplateDOList = assessmentTemplateDAO.listByType(AssessmentTemplateType.STORE_MANAGER.getCode()); + Integer templateType = AssessmentTemplateType.STORE_MANAGER.getCode(); + if(UserRoleEnum.XFSG_CLERK.getCode().equals(tempUserDetailDO.getRoleId())){ + templateType = AssessmentTemplateType.CLERK.getCode(); + } + List assessmentTemplateDOList = assessmentTemplateDAO.listByType(templateType); List templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());