suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

不同职位不同考核数据

Browse Source
This commit is contained in:
bianyadong
2024-05-11 16:43:43 +08:00
parent 4d4ecedd31
commit be7d3481ea
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.cool.store.entity.*;
import com.cool.store.enums.AssessmentTemplateType; import com.cool.store.enums.AssessmentTemplateType;
import com.cool.store.enums.ExamStatusEnum; import com.cool.store.enums.ExamStatusEnum;
import com.cool.store.enums.MessageEnum; 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.ResourceStatusEnum;
import com.cool.store.enums.video.UploadTypeEnum; import com.cool.store.enums.video.UploadTypeEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
@@ -492,7 +493,12 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId())); Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId()));
assessmentUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId())); assessmentUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId()));
List<AssessmentTemplateDO> 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<AssessmentTemplateDO> assessmentTemplateDOList = assessmentTemplateDAO.listByType(templateType);
List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList()); List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());
@@ -553,8 +559,11 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard()); EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard());
String userId = enterpriseUserDO.getUserId(); String userId = enterpriseUserDO.getUserId();
AtomicReference<Long> totalScore = new AtomicReference<>(0L); AtomicReference<Long> totalScore = new AtomicReference<>(0L);
Integer templateType = AssessmentTemplateType.STORE_MANAGER.getCode();
List<AssessmentTemplateDO> assessmentTemplateDOList = assessmentTemplateDAO.listByType(AssessmentTemplateType.STORE_MANAGER.getCode()); if(UserRoleEnum.XFSG_CLERK.getCode().equals(tempUserDetailDO.getRoleId())){
templateType = AssessmentTemplateType.CLERK.getCode();
}
List<AssessmentTemplateDO> assessmentTemplateDOList = assessmentTemplateDAO.listByType(templateType);
List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList()); List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());