diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java index 8a1791abf..813f7a105 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java @@ -38,9 +38,9 @@ public class AssessmentDataDAO { return 0; } - public List selectList(Long shopId, String userId, List templateIdList) { + public List selectList(String userId, List 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); } 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 d243ff305..2135783c0 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 @@ -356,7 +356,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { List assessmentTemplateDOList = assessmentTemplateDAO.listByType(AssessmentTemplateType.TRAINER.getCode()); List templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList()); - List assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getShopId(), enterpriseUserDO.getUserId(), templateIdList); + List assessmentDataDOList = assessmentDataDAO.selectList(enterpriseUserDO.getUserId(), templateIdList); Map assessmentDataMap = new HashMap<>(); assessmentDataDOList.forEach(item -> { @@ -523,7 +523,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { List templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList()); - List assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getShopId(), enterpriseUserDO.getUserId(), templateIdList); + List assessmentDataDOList = assessmentDataDAO.selectList(enterpriseUserDO.getUserId(), templateIdList); Map assessmentDataMap = new HashMap<>(); assessmentDataDOList.forEach(item -> { @@ -589,7 +589,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { List templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList()); - List assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getShopId(), userId, templateIdList); + List assessmentDataDOList = assessmentDataDAO.selectList(userId, templateIdList); request.getList().forEach(item -> { AssessmentDataDO assessmentDataDO = null; totalScore.set(totalScore.get() + item.getScore()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index c741107c0..a85a1846f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -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; }