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

bug 修复

Browse Source
This commit is contained in:
bianyadong
2024-05-17 10:58:43 +08:00
parent f4eda7e473
commit 7e69b75466
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java
View File

@@ -38,9 +38,9 @@ public class AssessmentDataDAO {
return 0;
}
public List<AssessmentDataDO> selectList(Long shopId, String userId, List<Long> templateIdList) {
public List<AssessmentDataDO> selectList(String userId, List<Long> templateIdList) {
Example example = new Example(AssessmentDataDO.class);
example.createCriteria().andEqualTo("assessmentUserId", userId).andEqualTo("shopId", shopId).andIn("templateId", templateIdList);
example.createCriteria().andEqualTo("assessmentUserId", userId).andIn("templateId", templateIdList);
return assessmentDataMapper.selectByExample(example);
}

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

@@ -356,7 +356,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
List<AssessmentTemplateDO> assessmentTemplateDOList = assessmentTemplateDAO.listByType(AssessmentTemplateType.TRAINER.getCode());
List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getShopId(), enterpriseUserDO.getUserId(), templateIdList);
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(enterpriseUserDO.getUserId(), templateIdList);
Map<String, AssessmentDataDO> assessmentDataMap = new HashMap<>();
assessmentDataDOList.forEach(item -> {
@@ -523,7 +523,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getShopId(), enterpriseUserDO.getUserId(), templateIdList);
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(enterpriseUserDO.getUserId(), templateIdList);
Map<String, AssessmentDataDO> assessmentDataMap = new HashMap<>();
assessmentDataDOList.forEach(item -> {
@@ -589,7 +589,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getShopId(), userId, templateIdList);
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(userId, templateIdList);
request.getList().forEach(item -> {
AssessmentDataDO assessmentDataDO = null;
totalScore.set(totalScore.get() + item.getScore());

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java
View File

@@ -167,7 +167,7 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
tempUserDetailInfoVO.setIdCardNegativeUrl(tempUserDetailDO.getIdCardNegativeUrl());
tempUserDetailInfoVO.setIdCardPositiveUrl(tempUserDetailDO.getIdCardPositiveUrl());
tempUserDetailInfoVO.setHealthCertificateUrl(tempUserDetailDO.getHealthCertificateUrl());
tempUserDetailInfoVO.setRegisterTime(new Date());
tempUserDetailInfoVO.setRegisterTime(tempUserDetailDO.getRegisterTime());
return tempUserDetailInfoVO;
}