employeeTrainingDAO
This commit is contained in:
@@ -165,8 +165,6 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
|
||||
EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
|
||||
|
||||
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard());
|
||||
|
||||
EmployeeTrainingDetailVO employeeTrainingVO = new EmployeeTrainingDetailVO();
|
||||
employeeTrainingVO.setRoleId(tempUserDetailDO.getRoleId());
|
||||
employeeTrainingVO.setMobile(tempUserDetailDO.getMobile());
|
||||
@@ -311,8 +309,6 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
EmployeeUserTrainingVO employeeUserTrainingVO = new EmployeeUserTrainingVO();
|
||||
TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
|
||||
|
||||
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard());
|
||||
|
||||
EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
|
||||
employeeUserTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
|
||||
employeeUserTrainingVO.setTrainingTeacherUserId(employeeTrainingDO.getTrainingTeacherUserId());
|
||||
@@ -341,7 +337,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(enterpriseUserDO.getUserId(), templateIdList);
|
||||
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getIdCard(), templateIdList);
|
||||
|
||||
Map<String, AssessmentDataDO> assessmentDataMap = new HashMap<>();
|
||||
assessmentDataDOList.forEach(item -> {
|
||||
@@ -350,7 +346,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
List<AssessmentTemplateDataVO> templateDataVOList = new ArrayList<>();
|
||||
assessmentTemplateDOList.forEach(item -> {
|
||||
AssessmentTemplateDataVO assessmentTemplateDataVO = new AssessmentTemplateDataVO();
|
||||
AssessmentDataDO assessmentDataDO = assessmentDataMap.get(item.getId() + CommonConstants.COLON + enterpriseUserDO.getUserId());
|
||||
AssessmentDataDO assessmentDataDO = assessmentDataMap.get(item.getId() + CommonConstants.COLON + tempUserDetailDO.getIdCard());
|
||||
if (assessmentDataDO != null) {
|
||||
assessmentTemplateDataVO.setGoalScore(assessmentDataDO.getScore());
|
||||
assessmentTemplateDataVO.setReason(assessmentDataDO.getReason());
|
||||
@@ -384,8 +380,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(userDetailId);
|
||||
EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(userDetailId);
|
||||
|
||||
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard());
|
||||
String userId = enterpriseUserDO.getUserId();
|
||||
String idCard = tempUserDetailDO.getIdCard();
|
||||
request.getList().forEach(item -> {
|
||||
AssessmentDataDO assessmentDataDO = null;
|
||||
if (item.getId() != null) {
|
||||
@@ -399,13 +394,13 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
} else {
|
||||
assessmentDataDO = new AssessmentDataDO();
|
||||
assessmentDataDO.setTemplateId(item.getTemplateId());
|
||||
assessmentDataDO.setAssessmentUserId(userId);
|
||||
assessmentDataDO.setAssessmentUserId(idCard);
|
||||
assessmentDataDO.setShopId(item.getShopId());
|
||||
assessmentDataDO.setQualified(item.getQualified());
|
||||
assessmentDataDAO.insertSelective(assessmentDataDO);
|
||||
}
|
||||
});
|
||||
Integer num = assessmentDataDAO.selectCount(userId, tempUserDetailDO.getShopId());
|
||||
Integer num = assessmentDataDAO.selectCount(idCard, tempUserDetailDO.getShopId());
|
||||
employeeTrainingDO.setAssessmentNum(num);
|
||||
if (num.equals(employeeTrainingDO.getAssessmentTotalNum())) {
|
||||
employeeTrainingDO.setAssessmentStatus(1);
|
||||
@@ -459,8 +454,6 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
AssessmentUserTrainingVO assessmentUserTrainingVO = new AssessmentUserTrainingVO();
|
||||
TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
|
||||
|
||||
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard());
|
||||
|
||||
EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
|
||||
assessmentUserTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
|
||||
assessmentUserTrainingVO.setTrainingStoreId(employeeTrainingDO.getTrainingStoreId());
|
||||
@@ -502,7 +495,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
|
||||
List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());
|
||||
|
||||
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(enterpriseUserDO.getUserId(), templateIdList);
|
||||
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getIdCard(), templateIdList);
|
||||
|
||||
Map<String, AssessmentDataDO> assessmentDataMap = new HashMap<>();
|
||||
assessmentDataDOList.forEach(item -> {
|
||||
@@ -511,7 +504,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
List<AssessmentTemplateDataVO> templateDataVOList = new ArrayList<>();
|
||||
assessmentTemplateDOList.forEach(item -> {
|
||||
AssessmentTemplateDataVO assessmentTemplateDataVO = new AssessmentTemplateDataVO();
|
||||
AssessmentDataDO assessmentDataDO = assessmentDataMap.get(item.getId() + CommonConstants.COLON + enterpriseUserDO.getUserId());
|
||||
AssessmentDataDO assessmentDataDO = assessmentDataMap.get(item.getId() + CommonConstants.COLON + tempUserDetailDO.getIdCard());
|
||||
if (assessmentDataDO != null) {
|
||||
assessmentTemplateDataVO.setGoalScore(assessmentDataDO.getScore());
|
||||
assessmentTemplateDataVO.setReason(assessmentDataDO.getReason());
|
||||
@@ -556,8 +549,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectById(request.getEmployeeTrainingId());
|
||||
TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(employeeTrainingDO.getXfsgUserDetailId());
|
||||
ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailDO.getShopId());
|
||||
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard());
|
||||
String userId = enterpriseUserDO.getUserId();
|
||||
String idCard = tempUserDetailDO.getIdCard();
|
||||
AtomicReference<Long> totalScore = new AtomicReference<>(0L);
|
||||
Integer templateType = AssessmentTemplateType.STORE_MANAGER.getCode();
|
||||
if(UserRoleEnum.XFSG_CLERK.getCode().equals(tempUserDetailDO.getRoleId())){
|
||||
@@ -567,14 +559,14 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
|
||||
List<Long> templateIdList = assessmentTemplateDOList.stream().map(AssessmentTemplateDO::getId).collect(Collectors.toList());
|
||||
|
||||
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(userId, templateIdList);
|
||||
List<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(idCard, templateIdList);
|
||||
request.getList().forEach(item -> {
|
||||
AssessmentDataDO assessmentDataDO = null;
|
||||
totalScore.set(totalScore.get() + item.getScore());
|
||||
if (item.getId() != null) {
|
||||
assessmentDataDO = assessmentDataDAO.selectByPrimaryKey(item.getId());
|
||||
} else {
|
||||
assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), userId, item.getShopId());
|
||||
assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), idCard, item.getShopId());
|
||||
}
|
||||
if (assessmentDataDO != null) {
|
||||
assessmentDataDO.setScore(item.getScore());
|
||||
@@ -587,7 +579,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
|
||||
assessmentDataDO.setShopId(item.getShopId());
|
||||
assessmentDataDO.setComments(item.getComments());
|
||||
assessmentDataDO.setScore(item.getScore());
|
||||
assessmentDataDO.setAssessmentUserId(userId);
|
||||
assessmentDataDO.setAssessmentUserId(idCard);
|
||||
assessmentDataDO.setPicture(item.getPicture());
|
||||
assessmentDataDO.setVideo(item.getVideo());
|
||||
assessmentDataDAO.insertSelective(assessmentDataDO);
|
||||
|
||||
Reference in New Issue
Block a user