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

employeeTrainingDAO

Browse Source
This commit is contained in:
苏竹红
2024-06-19 17:40:32 +08:00
parent fe76137e1a
commit 6840bcbfa4
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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