From e11327f837fa12fe84fed14af3552a005c8da93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?=
 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Date: Mon, 19 Jan 2026 07:05:53 +0000
Subject: [PATCH] Merge #27 into master from cc_20260116_fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat:实训数据去除

* cc_20260116_fix: (3 commits squashed)

  - feat:培训去掉身份证校验

  - fix:带出新管家信息

  - feat:实训数据去除

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/27
---
 .../main/resources/mapper/BigRegionMapper.xml |    1 +
 .../XfsgTrainingPersonSyncListener.java       |  302 ++--
 .../service/EmployeeTrainingService.java      |   42 +-
 .../impl/BuildInformationServiceImpl.java     |    4 +-
 .../impl/EmployeeTrainingServiceImpl.java     | 1248 ++++++++---------
 .../impl/TempUserDetailServiceImpl.java       |   26 +-
 .../webb/EmployeeTrainingController.java      |  214 +--
 .../webc/MiniEmployeeTrainingController.java  |    4 +-
 8 files changed, 909 insertions(+), 932 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
index b54a851df..d3047d0a1 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
@@ -72,6 +72,7 @@
         and join_mode = #{joinMode}
       </if>
     </where>
+    limit 1
   </select>
   <select id="queryBigRegion" resultType="com.cool.store.dto.region.BigRegionDTO">
     select *
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java
index 35fe92252..0ccf83651 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java
@@ -56,163 +56,163 @@ public class XfsgTrainingPersonSyncListener implements MessageListener {
 
     @Override
     public Action consume(Message message, ConsumeContext context) {
-        String text = new String(message.getBody());
-        if(StringUtils.isBlank(text)){
-            log.info("消息体为空,tag:{},messageId:{}",message.getTag(),message.getMsgID());
-            return Action.CommitMessage;
-        }
-        String lockKey = "XfsgTrainingPersonSyncListener:" + message.getMsgID();
-        boolean lock = redisUtilPool.setNxExpire(lockKey, message.getMsgID(), CommonConstants.NORMAL_LOCK_TIMES);
-        if(lock){
-            try {
-//                switch (RocketMqTagEnum.getByTag(message.getTag())){
-//                    case SYNC_TRAINING_PERSON:
-//                        syncXfsgTrainingPerson(text);
-//                        break;
-//                    case SYNC_TRAINING_SHOP_PERSON:
-//                        syncXfsgTrainingShopPerson(text);
-//                        break;
-//                }
-            }catch (Exception e){
-                log.error("XfsgTrainingPersonSyncListener consume error",e);
-                return Action.ReconsumeLater;
-            }finally {
-                redisUtilPool.delKey(lockKey);
-            }
-            log.info("消费成功,tag:{},messageId:{},reqBody={}",message.getTag(),message.getMsgID(),text);
-            return Action.CommitMessage;
-        }
+//        String text = new String(message.getBody());
+//        if(StringUtils.isBlank(text)){
+//            log.info("消息体为空,tag:{},messageId:{}",message.getTag(),message.getMsgID());
+//            return Action.CommitMessage;
+//        }
+//        String lockKey = "XfsgTrainingPersonSyncListener:" + message.getMsgID();
+//        boolean lock = redisUtilPool.setNxExpire(lockKey, message.getMsgID(), CommonConstants.NORMAL_LOCK_TIMES);
+//        if(lock){
+//            try {
+////                switch (RocketMqTagEnum.getByTag(message.getTag())){
+////                    case SYNC_TRAINING_PERSON:
+////                        syncXfsgTrainingPerson(text);
+////                        break;
+////                    case SYNC_TRAINING_SHOP_PERSON:
+////                        syncXfsgTrainingShopPerson(text);
+////                        break;
+////                }
+//            }catch (Exception e){
+//                log.error("XfsgTrainingPersonSyncListener consume error",e);
+//                return Action.ReconsumeLater;
+//            }finally {
+//                redisUtilPool.delKey(lockKey);
+//            }
+//            log.info("消费成功,tag:{},messageId:{},reqBody={}",message.getTag(),message.getMsgID(),text);
+//            return Action.CommitMessage;
+//        }
         return Action.ReconsumeLater;
     }
 
     public void syncXfsgTrainingPerson(String text) {
-        log.info("syncXfsgTrainingPerson, reqBody={}", text);
-        SyncXfsgTrainingPersonInfoDTO request = JSONObject.parseObject(text, SyncXfsgTrainingPersonInfoDTO.class);
-        if(StringUtils.isAnyBlank(request.getStoreNum(), request.getJobnumber(), request.getIdCard())){
-            log.info("syncXfsgTrainingPerson参数缺失={}", text);
-            return;
-        }
-        // 系统建店完成一定有门店编码？？？
-        ShopInfoDO shopInfoDO = shopInfoDAO.selectByStoreNum(request.getStoreNum());
-        if(shopInfoDO == null){
-            log.info("门店编码对应的店铺信息不存在storeNum:{}", request.getStoreNum());
-            return;
-        }
-        TempUserDetailDO checkTempUserDetailDO = tempUserDetailDAO.selectByIdCard(request.getIdCard());
-        // 系统已建店,并且身份证号信息不存在
-        if(checkTempUserDetailDO == null){
-            StaffBaseInfoDTO staffBaseInfoDTO = xfsgEhrService.getUserInfoByCode(request.getJobnumber());
-            log.info("培训人员主数据信息：staffBaseInfoDTO:{}", JSONObject.toJSONString(staffBaseInfoDTO));
-            if(staffBaseInfoDTO != null){
-//                TempUserDetailDO tempUserDetailDO = fillTempUserDetailDO(shopInfoDO, staffBaseInfoDTO);
-//                tempUserDetailDAO.insertSelective(tempUserDetailDO);
-            }
-        }else if(checkTempUserDetailDO != null &&
-                (checkTempUserDetailDO.getShopId() == 0L || checkTempUserDetailDO.getShopId() != shopInfoDO.getId())){
-            // 已录入，但是没有店铺id
-            checkTempUserDetailDO.setLineId(shopInfoDO.getLineId());
-            checkTempUserDetailDO.setShopId(shopInfoDO.getId());
-            checkTempUserDetailDO.setRegionId(shopInfoDO.getRegionId());
-            tempUserDetailDAO.updateByPrimaryKeySelective(checkTempUserDetailDO);
-        }else {
-            log.info("培训人员身份证信息已存在idCard:{}", checkTempUserDetailDO.getIdCard());
-            return;
-        }
+//        log.info("syncXfsgTrainingPerson, reqBody={}", text);
+//        SyncXfsgTrainingPersonInfoDTO request = JSONObject.parseObject(text, SyncXfsgTrainingPersonInfoDTO.class);
+//        if(StringUtils.isAnyBlank(request.getStoreNum(), request.getJobnumber(), request.getIdCard())){
+//            log.info("syncXfsgTrainingPerson参数缺失={}", text);
+//            return;
+//        }
+//        // 系统建店完成一定有门店编码？？？
+//        ShopInfoDO shopInfoDO = shopInfoDAO.selectByStoreNum(request.getStoreNum());
+//        if(shopInfoDO == null){
+//            log.info("门店编码对应的店铺信息不存在storeNum:{}", request.getStoreNum());
+//            return;
+//        }
+//        TempUserDetailDO checkTempUserDetailDO = tempUserDetailDAO.selectByIdCard(request.getIdCard());
+//        // 系统已建店,并且身份证号信息不存在
+//        if(checkTempUserDetailDO == null){
+//            StaffBaseInfoDTO staffBaseInfoDTO = xfsgEhrService.getUserInfoByCode(request.getJobnumber());
+//            log.info("培训人员主数据信息：staffBaseInfoDTO:{}", JSONObject.toJSONString(staffBaseInfoDTO));
+//            if(staffBaseInfoDTO != null){
+////                TempUserDetailDO tempUserDetailDO = fillTempUserDetailDO(shopInfoDO, staffBaseInfoDTO);
+////                tempUserDetailDAO.insertSelective(tempUserDetailDO);
+//            }
+//        }else if(checkTempUserDetailDO != null &&
+//                (checkTempUserDetailDO.getShopId() == 0L || checkTempUserDetailDO.getShopId() != shopInfoDO.getId())){
+//            // 已录入，但是没有店铺id
+//            checkTempUserDetailDO.setLineId(shopInfoDO.getLineId());
+//            checkTempUserDetailDO.setShopId(shopInfoDO.getId());
+//            checkTempUserDetailDO.setRegionId(shopInfoDO.getRegionId());
+//            tempUserDetailDAO.updateByPrimaryKeySelective(checkTempUserDetailDO);
+//        }else {
+//            log.info("培训人员身份证信息已存在idCard:{}", checkTempUserDetailDO.getIdCard());
+//            return;
+//        }
 
     }
 
-    private TempUserDetailDO fillTempUserDetailDO(ShopInfoDO shopInfoDO, StaffBaseInfoDTO staffBaseInfoDTO) {
-        TempUserDetailDO tempUserDetailDO = new TempUserDetailDO();
-        tempUserDetailDO.setLineId(shopInfoDO.getLineId());
-        tempUserDetailDO.setShopId(shopInfoDO.getId());
-        tempUserDetailDO.setRegionId(shopInfoDO.getRegionId());
-        tempUserDetailDO.setMobile(staffBaseInfoDTO.getPhone());
-        tempUserDetailDO.setUsername(staffBaseInfoDTO.getName());
-        tempUserDetailDO.setSex(staffBaseInfoDTO.getSex());
-        if(StringUtils.isNotBlank(staffBaseInfoDTO.getAge())){
-            tempUserDetailDO.setAge(Integer.valueOf(staffBaseInfoDTO.getAge()));
-        }
-        tempUserDetailDO.setIdCard(staffBaseInfoDTO.getIdCard());
-        tempUserDetailDO.setStatus(1);
-//        tempUserDetailDO.setEducational(fillEducational(staffBaseInfoDTO.getHighestDegree()));
-        tempUserDetailDO.setRoleId(fillRoleId(staffBaseInfoDTO.getJobName()));
-        tempUserDetailDO.setIdCardNegativeUrl(staffBaseInfoDTO.getEmblemPhoto());
-        tempUserDetailDO.setIdCardPositiveUrl(staffBaseInfoDTO.getIdNumPhoto());
-        tempUserDetailDO.setHealthCertificateUrl(staffBaseInfoDTO.getHealthCertificate());
-        tempUserDetailDO.setRegisterTime(new Date());
-        if(StringUtils.isNotBlank(staffBaseInfoDTO.getEntryDate())){
-            tempUserDetailDO.setRegisterTime(DateUtils.parseDate(staffBaseInfoDTO.getEntryDate()));
-        }
-        tempUserDetailDO.setSubmitTime(new Date());
-        tempUserDetailDO.setSource("sync");
-        return tempUserDetailDO;
-    }
-
-    public void syncXfsgTrainingShopPerson(String text) {
-        log.info("syncXfsgTrainingShopPerson, reqBody={}", text);
-        ShopInfoDO shopInfoDO = JSONObject.parseObject(text, ShopInfoDO.class);
-        if(StringUtils.isAnyBlank(shopInfoDO.getStoreNum())){
-            log.info("syncXfsgTrainingShopPerson={}", text);
-            return;
-        }
-
-        StoreDO storeDO = storeDao.getByStoreNum(shopInfoDO.getStoreNum());
-
-        if(storeDO == null){
-            log.info("syncXfsgTrainingShopPerson门店不存在={}", text);
-            return;
-        }
-
-        RegionDO regionDO = regionDao.getRegionByStoreId(storeDO.getStoreId());
-
-        if(regionDO == null){
-            log.info("syncXfsgTrainingShopPerson区域不存在={}", text);
-            return;
-        }
-
-        List<EnterpriseUserDO> enterpriseUserDOList = enterpriseUserDAO.getUserListByRegionId(regionDO.getId());
-
-        enterpriseUserDOList.forEach(enterpriseUserDO -> {
-            // 拉取培训人员
-            SyncXfsgTrainingPersonInfoDTO syncXfsgTrainingPersonInfoDTO = SyncXfsgTrainingPersonInfoDTO.builder()
-                    .jobnumber(enterpriseUserDO.getJobnumber())
-                    .idCard(enterpriseUserDO.getThirdOaUniqueFlag())
-                    .storeNum(storeDO.getStoreNum())
-                    .build();
-            this.syncXfsgTrainingPerson(JSONObject.toJSONString(syncXfsgTrainingPersonInfoDTO));
-        });
-
-    }
-
-    // 学历 0-小学 1-初中 2-高中   3-中专  4-大专   5-本科   6-硕士  7-硕士以上
-    private Integer fillEducational(String highestDegree) {
-        if("小学".equals(highestDegree)){
-            return 0;
-        }else if("初中".equals(highestDegree)){
-            return 1;
-        }else if("高中".equals(highestDegree)){
-            return 2;
-        }else if("中专".equals(highestDegree)){
-            return 3;
-        }else if("大专".equals(highestDegree)){
-            return 4;
-        }else if("本科".equals(highestDegree)){
-            return 5;
-        }else if("硕士".equals(highestDegree)){
-            return 6;
-        }else if("硕士以上".equals(highestDegree)){
-            return 7;
-        }
-        return null;
-    }
-
-    private Long fillRoleId(String jobName) {
-        if(UserRoleEnum.XFSG_CLERK.getDesc().equals(jobName)){
-            return UserRoleEnum.XFSG_CLERK.getCode();
-        }else if(UserRoleEnum.XFSG_SHOPOWNER.getDesc().equals(jobName)){
-            return UserRoleEnum.XFSG_SHOPOWNER.getCode();
-        }
-        return UserRoleEnum.XFSG_CLERK.getCode();
-    }
+//    private TempUserDetailDO fillTempUserDetailDO(ShopInfoDO shopInfoDO, StaffBaseInfoDTO staffBaseInfoDTO) {
+//        TempUserDetailDO tempUserDetailDO = new TempUserDetailDO();
+//        tempUserDetailDO.setLineId(shopInfoDO.getLineId());
+//        tempUserDetailDO.setShopId(shopInfoDO.getId());
+//        tempUserDetailDO.setRegionId(shopInfoDO.getRegionId());
+//        tempUserDetailDO.setMobile(staffBaseInfoDTO.getPhone());
+//        tempUserDetailDO.setUsername(staffBaseInfoDTO.getName());
+//        tempUserDetailDO.setSex(staffBaseInfoDTO.getSex());
+//        if(StringUtils.isNotBlank(staffBaseInfoDTO.getAge())){
+//            tempUserDetailDO.setAge(Integer.valueOf(staffBaseInfoDTO.getAge()));
+//        }
+//        tempUserDetailDO.setIdCard(staffBaseInfoDTO.getIdCard());
+//        tempUserDetailDO.setStatus(1);
+////        tempUserDetailDO.setEducational(fillEducational(staffBaseInfoDTO.getHighestDegree()));
+//        tempUserDetailDO.setRoleId(fillRoleId(staffBaseInfoDTO.getJobName()));
+//        tempUserDetailDO.setIdCardNegativeUrl(staffBaseInfoDTO.getEmblemPhoto());
+//        tempUserDetailDO.setIdCardPositiveUrl(staffBaseInfoDTO.getIdNumPhoto());
+//        tempUserDetailDO.setHealthCertificateUrl(staffBaseInfoDTO.getHealthCertificate());
+//        tempUserDetailDO.setRegisterTime(new Date());
+//        if(StringUtils.isNotBlank(staffBaseInfoDTO.getEntryDate())){
+//            tempUserDetailDO.setRegisterTime(DateUtils.parseDate(staffBaseInfoDTO.getEntryDate()));
+//        }
+//        tempUserDetailDO.setSubmitTime(new Date());
+//        tempUserDetailDO.setSource("sync");
+//        return tempUserDetailDO;
+//    }
+//
+//    public void syncXfsgTrainingShopPerson(String text) {
+//        log.info("syncXfsgTrainingShopPerson, reqBody={}", text);
+//        ShopInfoDO shopInfoDO = JSONObject.parseObject(text, ShopInfoDO.class);
+//        if(StringUtils.isAnyBlank(shopInfoDO.getStoreNum())){
+//            log.info("syncXfsgTrainingShopPerson={}", text);
+//            return;
+//        }
+//
+//        StoreDO storeDO = storeDao.getByStoreNum(shopInfoDO.getStoreNum());
+//
+//        if(storeDO == null){
+//            log.info("syncXfsgTrainingShopPerson门店不存在={}", text);
+//            return;
+//        }
+//
+//        RegionDO regionDO = regionDao.getRegionByStoreId(storeDO.getStoreId());
+//
+//        if(regionDO == null){
+//            log.info("syncXfsgTrainingShopPerson区域不存在={}", text);
+//            return;
+//        }
+//
+//        List<EnterpriseUserDO> enterpriseUserDOList = enterpriseUserDAO.getUserListByRegionId(regionDO.getId());
+//
+//        enterpriseUserDOList.forEach(enterpriseUserDO -> {
+//            // 拉取培训人员
+//            SyncXfsgTrainingPersonInfoDTO syncXfsgTrainingPersonInfoDTO = SyncXfsgTrainingPersonInfoDTO.builder()
+//                    .jobnumber(enterpriseUserDO.getJobnumber())
+//                    .idCard(enterpriseUserDO.getThirdOaUniqueFlag())
+//                    .storeNum(storeDO.getStoreNum())
+//                    .build();
+//            this.syncXfsgTrainingPerson(JSONObject.toJSONString(syncXfsgTrainingPersonInfoDTO));
+//        });
+//
+//    }
+//
+//    // 学历 0-小学 1-初中 2-高中   3-中专  4-大专   5-本科   6-硕士  7-硕士以上
+//    private Integer fillEducational(String highestDegree) {
+//        if("小学".equals(highestDegree)){
+//            return 0;
+//        }else if("初中".equals(highestDegree)){
+//            return 1;
+//        }else if("高中".equals(highestDegree)){
+//            return 2;
+//        }else if("中专".equals(highestDegree)){
+//            return 3;
+//        }else if("大专".equals(highestDegree)){
+//            return 4;
+//        }else if("本科".equals(highestDegree)){
+//            return 5;
+//        }else if("硕士".equals(highestDegree)){
+//            return 6;
+//        }else if("硕士以上".equals(highestDegree)){
+//            return 7;
+//        }
+//        return null;
+//    }
+//
+//    private Long fillRoleId(String jobName) {
+//        if(UserRoleEnum.XFSG_CLERK.getDesc().equals(jobName)){
+//            return UserRoleEnum.XFSG_CLERK.getCode();
+//        }else if(UserRoleEnum.XFSG_SHOPOWNER.getDesc().equals(jobName)){
+//            return UserRoleEnum.XFSG_SHOPOWNER.getCode();
+//        }
+//        return UserRoleEnum.XFSG_CLERK.getCode();
+//    }
 
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java
index 8baa5705b..d7be6212b 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java
@@ -16,25 +16,25 @@ import java.util.List;
  */
 public interface EmployeeTrainingService {
 
-    PageInfo<EmployeeTrainingVO> employeeTrainingList(String userId, EmployeeTrainingRequest request);
-
-    EmployeeTrainingDetailVO employeeTrainingDetail(Long id);
-
-    void distribution(EmployeeTrainingDetailRequest request);
-
-    List<EmployeeTrainingVO> trainingListByShopId(Long shopId);
-
-    PageInfo<EmployeeTrainingVO> trainerUserList(String userId, Integer status, Integer pageNum, Integer pageSize);
-
-    EmployeeUserTrainingVO trainerUserDetail(Long id);
-
-    void trainerUserCommit(EmployeeTrainingCommitListRequest request);
-
-    PageInfo<EmployeeTrainingVO> assessmentUserList(String userId, EmployeeAssessmentRequest request);
-
-    AssessmentUserTrainingVO assessmentUserDetail(Long id);
-
-    void turn(Long id, String userId, String turnUserId);
-
-    void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo userId);
+//    PageInfo<EmployeeTrainingVO> employeeTrainingList(String userId, EmployeeTrainingRequest request);
+//
+//    EmployeeTrainingDetailVO employeeTrainingDetail(Long id);
+//
+//    void distribution(EmployeeTrainingDetailRequest request);
+//
+//    List<EmployeeTrainingVO> trainingListByShopId(Long shopId);
+//
+//    PageInfo<EmployeeTrainingVO> trainerUserList(String userId, Integer status, Integer pageNum, Integer pageSize);
+//
+//    EmployeeUserTrainingVO trainerUserDetail(Long id);
+//
+//    void trainerUserCommit(EmployeeTrainingCommitListRequest request);
+//
+//    PageInfo<EmployeeTrainingVO> assessmentUserList(String userId, EmployeeAssessmentRequest request);
+//
+//    AssessmentUserTrainingVO assessmentUserDetail(Long id);
+//
+//    void turn(Long id, String userId, String turnUserId);
+//
+//    void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo userId);
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
index 650adcc0b..e8446e4dd 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
@@ -237,8 +237,8 @@ public class BuildInformationServiceImpl implements BuildInformationService {
         }
         //根据映射关系默认带出新管家组织
         if (StringUtils.isBlank(response.getXgjRegionName())) {
-            Integer joinMode = shopInfo.getJoinMode() == 3 ? CommonConstants.ONE : CommonConstants.ZERO;
-            BigRegionDO bigRegionDO = bigRegionDAO.queryOrgInfoByBigRegionAndJoinMode(shopInfo.getRegionId(), joinMode);
+            //2026之后 新管家组织不会根据加盟模式 只有一套
+            BigRegionDO bigRegionDO = bigRegionDAO.queryOrgInfoByBigRegionAndJoinMode(shopInfo.getRegionId(), 0);
             if (Objects.nonNull(bigRegionDO)) {
                 response.setXgjRegionId(bigRegionDO.getOrgId());
                 response.setXgjRegionName(bigRegionDO.getOrgName());
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 497aa11b0..9cc9e5aa8 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
@@ -44,629 +44,629 @@ import java.util.stream.Collectors;
 @Service
 public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
 
-    @Resource
-    private SysRoleService sysRoleService;
-
-    @Resource
-    private UserAuthMappingService userAuthMappingService;
-
-    @Resource
-    private EmployeeTrainingDAO employeeTrainingDAO;
-
-    @Resource
-    private RegionService regionService;
-
-    @Resource
-    private RegionDao regionDao;
-
-    @Resource
-    private TempUserDetailDAO tempUserDetailDAO;
-
-    @Resource
-    private ShopInfoDAO shopInfoDAO;
-
-    @Resource
-    private EnterpriseUserDAO enterpriseUserDAO;
-
-    @Resource
-    private StoreDao storeDAO;
-
-    @Resource
-    private AssessmentTemplateDAO assessmentTemplateDAO;
-
-    @Resource
-    private AssessmentDataDAO assessmentDataDAO;
-
-    @Resource
-    private RedisUtilPool redisUtilPool;
-
-    @Resource
-    private XfsgEhrService xfsgEhrService;
-
-    @Resource
-    private LineInfoDAO lineInfoDAO;
-
-    @Resource
-    private CommonService commonService;
-
-    @Resource
-    private ShopStageInfoDAO shopStageInfoDAO;
-
-    @Resource
-    private PreparationService preparationService;
-
-    @Override
-    public PageInfo<EmployeeTrainingVO> employeeTrainingList(String userId, EmployeeTrainingRequest request) {
-        List<String> authRegionIdList = new ArrayList<>();
-        if (!sysRoleService.checkIsAdmin(userId)) {
-            authRegionIdList = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
-        }
-        if (CollectionUtils.isNotEmpty(request.getRegionIdList())) {
-            if (request.getRegionIdList().contains(CommonConstants.ROOT_DEPT_ID_STR)) {
-                request.setRegionIdList(null);
-            } else {
-                request.setRegionIdList(regionService.getSubRegionIdsByRegionIds(request.getRegionIdList()));
-            }
-        }
-        List<String> storeNumList = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(request.getStoreIdList())){
-            storeNumList = storeDAO.getStoreNumByStoreIds(request.getStoreIdList());
-            if(CollectionUtils.isEmpty(storeNumList)){
-                return new PageInfo<>();
-            }
-        }
-        PageHelper.startPage(request.getPageNum(), request.getPageSize());
-        List<EmployeeTrainingVO> list = employeeTrainingDAO.employeeTrainingList(request.getKeyWord(), request.getRegionIdList(), authRegionIdList, request.getAssignFlag(),
-                DateUtils.parseLongDateToStr(request.getBeginTime()),
-                DateUtils.parseLongDateToStr(request.getEndTime()), storeNumList,
-                request.getTheoreticalExamStatus(), request.getPracticalExamStatus(), request.getAssessmentStatus(), request.getAssignStoreFlag());
-        if (CollectionUtils.isEmpty(list)) {
-            return new PageInfo<>(list);
-        }
-
-        List<Long> regionIds = list.stream().map(EmployeeTrainingVO::getRegionId).distinct().collect(Collectors.toList());
-
-        List<Long> lineIdList = list.stream().map(EmployeeTrainingVO::getLineId).distinct().collect(Collectors.toList());
-
-        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).distinct().collect(Collectors.toList());
-
-        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
-        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
-
-        List<String> userIdList = list.stream().map(EmployeeTrainingVO::getTrainingTeacherUserId).distinct().collect(Collectors.toList());
-
-
-        List<String> practicalUserIdList = list.stream().map(EmployeeTrainingVO::getPracticalAssessmentUserId).distinct().collect(Collectors.toList());
-
-        if (CollectionUtils.isNotEmpty(practicalUserIdList)) {
-            userIdList.addAll(practicalUserIdList);
-        }
-
-        List<PlanLineDTO> lineInfoList = lineInfoDAO.getLines(lineIdList);
-        Map<Long, String> lineInfoMap = lineInfoList.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, PlanLineDTO::getUsername));
-
-        Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(userIdList);
-
-        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
-
-        list.forEach(item -> {
-            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
-            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
-            item.setTrainingTeacherUserName(userNameMap.get(item.getTrainingTeacherUserId()));
-            item.setPracticalAssessmentUserName(userNameMap.get(item.getPracticalAssessmentUserId()));
-            item.setFranchiseeName(lineInfoMap.get(item.getLineId()));
-        });
-        return new PageInfo<>(list);
-    }
-
-    @Override
-    public EmployeeTrainingDetailVO employeeTrainingDetail(Long id) {
-        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
-
-        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
-
-        EmployeeTrainingDetailVO employeeTrainingVO = new EmployeeTrainingDetailVO();
-        employeeTrainingVO.setRoleId(tempUserDetailDO.getRoleId());
-        employeeTrainingVO.setMobile(tempUserDetailDO.getMobile());
-        employeeTrainingVO.setUsername(tempUserDetailDO.getUsername());
-        employeeTrainingVO.setIdCard(tempUserDetailDO.getIdCard());
-        employeeTrainingVO.setId(tempUserDetailDO.getId());
-        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(tempUserDetailDO.getRegionId()));
-        employeeTrainingVO.setRegionNodeName(regionNameMap.get(tempUserDetailDO.getRegionId()));
-        employeeTrainingVO.setRegionId(tempUserDetailDO.getRegionId());
-        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailDO.getShopId());
-        employeeTrainingVO.setShopName(shopInfoDO.getShopName());
-        employeeTrainingVO.setShopId(tempUserDetailDO.getShopId());
-        employeeTrainingVO.setAssignFlag(Boolean.FALSE);
-        if(employeeTrainingDO != null){
-            employeeTrainingVO.setTrainingStartTime(employeeTrainingDO.getTrainingStartTime());
-            employeeTrainingVO.setTrainingEndTime(employeeTrainingDO.getTrainingEndTime());
-            employeeTrainingVO.setTrainingStoreId(employeeTrainingDO.getTrainingStoreId());
-            employeeTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
-            StoreDO storeDO = storeDAO.getByStoreId(employeeTrainingDO.getTrainingStoreId());
-            if (storeDO != null) {
-                employeeTrainingVO.setTrainingStoreName(storeDO.getStoreName());
-            }
-            employeeTrainingVO.setTrainingTeacherUserId(employeeTrainingDO.getTrainingTeacherUserId());
-            employeeTrainingVO.setTrainingTeacherUserName(enterpriseUserDAO.getUserName(employeeTrainingDO.getTrainingTeacherUserId()));
-            employeeTrainingVO.setAssessmentStatus(employeeTrainingDO.getAssessmentStatus());
-            employeeTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum());
-            employeeTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum());
-            employeeTrainingVO.setPracticalExamStatus(employeeTrainingDO.getPracticalExamStatus());
-            employeeTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore());
-            employeeTrainingVO.setEstimatedAssessmentTime(employeeTrainingDO.getEstimatedAssessmentTime());
-            employeeTrainingVO.setActualAssessmentTime(employeeTrainingDO.getActualAssessmentTime());
-            employeeTrainingVO.setPracticalAssessmentUserId(employeeTrainingDO.getPracticalAssessmentUserId());
-            employeeTrainingVO.setPracticalAssessmentUserName(enterpriseUserDAO.getUserName(employeeTrainingDO.getPracticalAssessmentUserId()));
-            employeeTrainingVO.setAssignFlag(employeeTrainingDO.getAssignFlag());
-            employeeTrainingVO.setShopId(employeeTrainingDO.getShopId());
-        }
-        return employeeTrainingVO;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void distribution(EmployeeTrainingDetailRequest request) {
-        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(request.getId());
-
-        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(request.getId());
-
-        if (employeeTrainingDO != null && employeeTrainingDO.getAssignFlag()) {
-            throw new ServiceException("已经分配培训，无法再次分配");
-        }
-        if (employeeTrainingDO == null) {
-            employeeTrainingDO = new EmployeeTrainingDO();
-        }
-        List<AssessmentTemplateDO> assessmentTemplateDOList = assessmentTemplateDAO.listByType(AssessmentTemplateType.TRAINER.getCode());
-
-        employeeTrainingDO.setAssignFlag(true);
-        employeeTrainingDO.setTrainingTeacherUserId(request.getTrainingTeacherUserId());
-        employeeTrainingDO.setTrainingStoreId(request.getTrainingStoreId());
-        employeeTrainingDO.setTrainingStartTime(request.getTrainingStartTime());
-        employeeTrainingDO.setTrainingEndTime(request.getTrainingEndTime());
-        employeeTrainingDO.setEstimatedAssessmentTime(request.getEstimatedAssessmentTime());
-        employeeTrainingDO.setAssessmentNum(0);
-        employeeTrainingDO.setAssessmentTotalNum(assessmentTemplateDOList.size());
-        employeeTrainingDO.setAssessmentStatus(0);
-        if (employeeTrainingDO.getId() == null) {
-            employeeTrainingDO.setXfsgUserDetailId(tempUserDetailDO.getId());
-            employeeTrainingDO.setRegionId(tempUserDetailDO.getRegionId());
-            employeeTrainingDO.setShopId(tempUserDetailDO.getShopId());
-            employeeTrainingDAO.insertSelective(employeeTrainingDO);
-        } else {
-            employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
-        }
-        Long shopId = tempUserDetailDO.getShopId();
-
-        //分配教练员之后初始化实训数据
-        List<AssessmentDataDO> assessmentDataDOList = new ArrayList<>();
-        assessmentTemplateDOList.forEach(assessmentTemplateDO -> {
-            AssessmentDataDO assessmentDataDO = new AssessmentDataDO();
-            assessmentDataDO.setTemplateId(assessmentTemplateDO.getId());
-            assessmentDataDO.setAssessmentUserId(tempUserDetailDO.getIdCard());
-            assessmentDataDO.setShopId(shopId);
-            assessmentDataDOList.add(assessmentDataDO);
-        });
-        assessmentDataDAO.batchInsertDO(assessmentDataDOList);
-
-
-        Map<String, String> messageMap = new HashMap<>();
-        messageMap.put("userName", tempUserDetailDO.getUsername());
-        messageMap.put("mobile", tempUserDetailDO.getMobile());
-        messageMap.put("registerTime", DateUtils.dateTime(tempUserDetailDO.getRegisterTime()));
-        messageMap.put("userDetailId", tempUserDetailDO.getId().toString());
-        commonService.sendMessage(Collections.singletonList(employeeTrainingDO.getTrainingTeacherUserId()), MessageEnum.MESSAGE_22, messageMap);
-    }
-
-    @Override
-    public List<EmployeeTrainingVO> trainingListByShopId(Long shopId) {
-
-        List<EmployeeTrainingVO> list = employeeTrainingDAO.trainingListByShopId(shopId, null, null);
-        if (CollectionUtils.isEmpty(list)) {
-            return list;
-        }
-        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
-        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
-        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
-
-        List<Long> regionIdList = list.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
-        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
-
-        list.forEach(item -> {
-            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
-            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
-            if(item.getAssessmentStatus() == null){
-                //培训未开始
-                item.setAssessmentStatus(-1);
-            }
-        });
-        return list;
-    }
-
-    @Override
-    public PageInfo<EmployeeTrainingVO> trainerUserList(String userId, Integer status, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<EmployeeTrainingVO> list = employeeTrainingDAO.trainingListByShopId(null, userId, status);
-        if (CollectionUtils.isEmpty(list)) {
-            return new PageInfo<>();
-        }
-        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
-        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
-        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
-
-        List<Long> regionIdList = list.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
-        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
-
-        list.forEach(item -> {
-            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
-            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
-        });
-        return new PageInfo<>(list);
-    }
-
-    @Override
-    public EmployeeUserTrainingVO trainerUserDetail(Long id) {
-        EmployeeUserTrainingVO employeeUserTrainingVO = new EmployeeUserTrainingVO();
-        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
-
-        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
-        employeeUserTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
-        employeeUserTrainingVO.setTrainingTeacherUserId(employeeTrainingDO.getTrainingTeacherUserId());
-        employeeUserTrainingVO.setTrainingStoreId(employeeTrainingDO.getTrainingStoreId());
-        employeeUserTrainingVO.setTrainingStartTime(employeeTrainingDO.getTrainingStartTime());
-        employeeUserTrainingVO.setTrainingEndTime(employeeTrainingDO.getTrainingEndTime());
-        employeeUserTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum());
-        employeeUserTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum());
-        employeeUserTrainingVO.setMobile(tempUserDetailDO.getMobile());
-        employeeUserTrainingVO.setRoleId(tempUserDetailDO.getRoleId());
-        employeeUserTrainingVO.setIdCard(tempUserDetailDO.getIdCard());
-        employeeUserTrainingVO.setId(tempUserDetailDO.getId());
-        employeeUserTrainingVO.setUsername(tempUserDetailDO.getUsername());
-        employeeUserTrainingVO.setRegionId(tempUserDetailDO.getRegionId());
-        employeeUserTrainingVO.setShopId(tempUserDetailDO.getShopId());
-        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailDO.getShopId());
-        if (shopInfoDO != null) {
-            employeeUserTrainingVO.setShopName(shopInfoDO.getShopName());
-        }
-        StoreDO storeDO = storeDAO.getByStoreId(employeeTrainingDO.getTrainingStoreId());
-        if (storeDO != null) {
-            employeeUserTrainingVO.setTrainingStoreName(storeDO.getStoreName());
-        }
-
-        employeeUserTrainingVO.setTrainingTeacherUserName(enterpriseUserDAO.getUserName(employeeTrainingDO.getTrainingTeacherUserId()));
-        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.getIdCard(), templateIdList);
-
-        Map<String, AssessmentDataDO> assessmentDataMap = new HashMap<>();
-        assessmentDataDOList.forEach(item -> {
-            assessmentDataMap.put(item.getTemplateId() + CommonConstants.COLON + item.getAssessmentUserId(), item);
-        });
-        List<AssessmentTemplateDataVO> templateDataVOList = new ArrayList<>();
-        assessmentTemplateDOList.forEach(item -> {
-            AssessmentTemplateDataVO assessmentTemplateDataVO = new AssessmentTemplateDataVO();
-            AssessmentDataDO assessmentDataDO = assessmentDataMap.get(item.getId() + CommonConstants.COLON + tempUserDetailDO.getIdCard());
-            if (assessmentDataDO != null) {
-                assessmentTemplateDataVO.setGoalScore(assessmentDataDO.getScore());
-                assessmentTemplateDataVO.setReason(assessmentDataDO.getReason());
-                assessmentTemplateDataVO.setComments(assessmentDataDO.getComments());
-                assessmentTemplateDataVO.setQualified(assessmentDataDO.getQualified());
-                assessmentTemplateDataVO.setAssessmentDataId(assessmentDataDO.getId());
-            }
-            assessmentTemplateDataVO.setScore(item.getScore());
-            assessmentTemplateDataVO.setTemplateName(item.getTemplateName());
-            assessmentTemplateDataVO.setTemplateRemarkList(Arrays.asList(item.getTemplateRemark().split(CommonConstants.COMMA)));
-            assessmentTemplateDataVO.setCategory(item.getCategory());
-            assessmentTemplateDataVO.setId(item.getId());
-            assessmentTemplateDataVO.setType(item.getType());
-            assessmentTemplateDataVO.setTemplateRequirements(item.getTemplateRequirements());
-            templateDataVOList.add(assessmentTemplateDataVO);
-        });
-        employeeUserTrainingVO.setTemplateDataList(templateDataVOList);
-        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId()));
-        employeeUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId()));
-        return employeeUserTrainingVO;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void trainerUserCommit(EmployeeTrainingCommitListRequest request) {
-        if (CollectionUtils.isEmpty(request.getList())) {
-            return;
-        }
-
-        Long userDetailId = request.getUserDetailId();
-        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(userDetailId);
-        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(userDetailId);
-
-        String idCard = tempUserDetailDO.getIdCard();
-        request.getList().forEach(item -> {
-            AssessmentDataDO assessmentDataDO = null;
-            if (item.getId() != null) {
-                assessmentDataDO = assessmentDataDAO.selectByPrimaryKey(item.getId());
-            } else {
-                assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), item.getUserDetailId(), item.getShopId());
-            }
-            if (assessmentDataDO != null) {
-                assessmentDataDO.setQualified(item.getQualified());
-                assessmentDataDAO.updateByPrimaryKeySelective(assessmentDataDO);
-            } else {
-                assessmentDataDO = new AssessmentDataDO();
-                assessmentDataDO.setTemplateId(item.getTemplateId());
-                assessmentDataDO.setAssessmentUserId(idCard);
-                assessmentDataDO.setShopId(item.getShopId());
-                assessmentDataDO.setQualified(item.getQualified());
-                assessmentDataDAO.insertSelective(assessmentDataDO);
-            }
-        });
-        Integer num = assessmentDataDAO.selectCount(idCard, tempUserDetailDO.getShopId());
-        employeeTrainingDO.setAssessmentNum(num);
-        if (num.equals(employeeTrainingDO.getAssessmentTotalNum())) {
-            employeeTrainingDO.setAssessmentStatus(1);
-        }
-        employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
-    }
-
-    @Override
-    public PageInfo<EmployeeTrainingVO> assessmentUserList(String userId, EmployeeAssessmentRequest request) {
-
-        List<String> requestStoreIdList = request.getStoreIdList();
-        Boolean isAdmin = sysRoleService.checkIsAdmin(userId);
-        if (CollectionUtils.isEmpty(requestStoreIdList) && StringUtils.isNotBlank(userId) && !isAdmin) {
-            requestStoreIdList = userAuthMappingService.getAuthStoreIdAndSubRegionIdByUserId(userId);
-            if(CollectionUtils.isEmpty(requestStoreIdList)){
-                return new PageInfo<>();
-            }
-        }
-        String practicalAssessmentUserId = userId;
-        //空意味着管理员
-        if(isAdmin){
-            practicalAssessmentUserId = null;
-        }
-
-        PageHelper.startPage(request.getPageNum(), request.getPageSize());
-        List<EmployeeTrainingVO> employeeTrainingVOList = employeeTrainingDAO
-                .assessmentUserList(request.getName(), practicalAssessmentUserId, request.getAssessmentStatus(),
-                DateUtils.parseLongDateToStr(request.getEstimatedAssessmentBeginTime()),
-                DateUtils.parseLongDateToStr(request.getEstimatedAssessmentEndTime()),
-                DateUtils.parseLongDateToStr(request.getActualAssessmentBeginTime()),
-                DateUtils.parseLongDateToStr(request.getActualAssessmentEndTime()), requestStoreIdList);
-        if (CollectionUtils.isEmpty(employeeTrainingVOList)) {
-            return new PageInfo<>(employeeTrainingVOList);
-        }
-        List<String> storeIdList = employeeTrainingVOList.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
-        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
-        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
-
-        List<Long> regionIdList = employeeTrainingVOList.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
-        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
-
-        employeeTrainingVOList.forEach(item -> {
-            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
-            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
-        });
-        return new PageInfo<>(employeeTrainingVOList);
-    }
-
-    @Override
-    public AssessmentUserTrainingVO assessmentUserDetail(Long id) {
-        AssessmentUserTrainingVO assessmentUserTrainingVO = new AssessmentUserTrainingVO();
-        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
-
-        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
-        assessmentUserTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
-        assessmentUserTrainingVO.setTrainingStoreId(employeeTrainingDO.getTrainingStoreId());
-        StoreDO storeDO = storeDAO.getByStoreId(employeeTrainingDO.getTrainingStoreId());
-        if (storeDO != null) {
-            assessmentUserTrainingVO.setTrainingStoreName(storeDO.getStoreName());
-        }
-        assessmentUserTrainingVO.setPracticalAssessmentUserId(employeeTrainingDO.getPracticalAssessmentUserId());
-        assessmentUserTrainingVO.setPracticalAssessmentUserName(enterpriseUserDAO.getUserName(employeeTrainingDO.getPracticalAssessmentUserId()));
-        assessmentUserTrainingVO.setMobile(tempUserDetailDO.getMobile());
-        assessmentUserTrainingVO.setRoleId(tempUserDetailDO.getRoleId());
-        assessmentUserTrainingVO.setIdCard(tempUserDetailDO.getIdCard());
-        assessmentUserTrainingVO.setActualAssessmentTime(employeeTrainingDO.getActualAssessmentTime());
-        assessmentUserTrainingVO.setEstimatedAssessmentTime(employeeTrainingDO.getEstimatedAssessmentTime());
-        assessmentUserTrainingVO.setUsername(tempUserDetailDO.getUsername());
-        assessmentUserTrainingVO.setAssessmentStatus(employeeTrainingDO.getAssessmentStatus());
-        assessmentUserTrainingVO.setShopId(tempUserDetailDO.getShopId());
-
-        assessmentUserTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum());
-        assessmentUserTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum());
-        assessmentUserTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore());
-        assessmentUserTrainingVO.setPracticalExamStatus(employeeTrainingDO.getPracticalExamStatus());
-        assessmentUserTrainingVO.setId(tempUserDetailDO.getId());
-        assessmentUserTrainingVO.setRegionId(tempUserDetailDO.getRegionId());
-        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(employeeTrainingDO.getShopId());
-        if (shopInfoDO != null) {
-            assessmentUserTrainingVO.setShopName(shopInfoDO.getShopName());
-        }
-
-        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId()));
-        assessmentUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId()));
-
-        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<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getIdCard(), templateIdList);
-
-        Map<String, AssessmentDataDO> assessmentDataMap = new HashMap<>();
-        assessmentDataDOList.forEach(item -> {
-            assessmentDataMap.put(item.getTemplateId() + CommonConstants.COLON + item.getAssessmentUserId(), item);
-        });
-        List<AssessmentTemplateDataVO> templateDataVOList = new ArrayList<>();
-        assessmentTemplateDOList.forEach(item -> {
-            AssessmentTemplateDataVO assessmentTemplateDataVO = new AssessmentTemplateDataVO();
-            AssessmentDataDO assessmentDataDO = assessmentDataMap.get(item.getId() + CommonConstants.COLON + tempUserDetailDO.getIdCard());
-            if (assessmentDataDO != null) {
-                assessmentTemplateDataVO.setGoalScore(assessmentDataDO.getScore());
-                assessmentTemplateDataVO.setReason(assessmentDataDO.getReason());
-                assessmentTemplateDataVO.setComments(assessmentDataDO.getComments());
-                assessmentTemplateDataVO.setQualified(assessmentDataDO.getQualified());
-                assessmentTemplateDataVO.setAssessmentDataId(assessmentDataDO.getId());
-                assessmentTemplateDataVO.setPicture(assessmentDataDO.getPicture());
-                assessmentTemplateDataVO.setVideo(assessmentDataDO.getVideo());
-            }
-            assessmentTemplateDataVO.setScore(item.getScore());
-            assessmentTemplateDataVO.setTemplateName(item.getTemplateName());
-            assessmentTemplateDataVO.setTemplateRemarkList(Arrays.asList(item.getTemplateRemark().split(CommonConstants.COMMA)));
-            assessmentTemplateDataVO.setCategory(item.getCategory());
-            assessmentTemplateDataVO.setId(item.getId());
-            assessmentTemplateDataVO.setType(item.getType());
-            assessmentTemplateDataVO.setCategory(item.getCategory());
-            assessmentTemplateDataVO.setTemplateRequirements(item.getTemplateRequirements());
-            assessmentTemplateDataVO.setCheckType(item.getCheckType());
-            templateDataVOList.add(assessmentTemplateDataVO);
-        });
-        assessmentUserTrainingVO.setTemplateDataList(templateDataVOList);
-        return assessmentUserTrainingVO;
-    }
-
-    @Override
-    public void turn(Long id, String userId, String turnUserId) {
-        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
-
-        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
-
-        employeeTrainingDO.setPracticalAssessmentUserId(turnUserId);
-
-        employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo user) {
-        if (CollectionUtils.isEmpty(request.getList())) {
-            return;
-        }
-        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectById(request.getEmployeeTrainingId());
-        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(employeeTrainingDO.getXfsgUserDetailId());
-        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailDO.getShopId());
-        String idCard = tempUserDetailDO.getIdCard();
-        AtomicReference<Long> totalScore = new AtomicReference<>(0L);
-        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<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(), idCard, item.getShopId());
-            }
-            if (assessmentDataDO != null) {
-                assessmentDataDO.setScore(item.getScore());
-                assessmentDataDO.setComments(item.getComments());
-                assessmentDataDO.setPicture(item.getPicture());
-                assessmentDataDO.setVideo(item.getVideo());
-            } else {
-                assessmentDataDO = new AssessmentDataDO();
-                assessmentDataDO.setTemplateId(item.getTemplateId());
-                assessmentDataDO.setShopId(item.getShopId());
-                assessmentDataDO.setComments(item.getComments());
-                assessmentDataDO.setScore(item.getScore());
-                assessmentDataDO.setAssessmentUserId(idCard);
-                assessmentDataDO.setPicture(item.getPicture());
-                assessmentDataDO.setVideo(item.getVideo());
-                assessmentDataDAO.insertSelective(assessmentDataDO);
-            }
-            assessmentDataDOList.add(assessmentDataDO);
-        });
-        checkVideoHandel(assessmentDataDOList);
-        assessmentDataDAO.batchInsertOrUpdate(assessmentDataDOList);
-
-        employeeTrainingDO.setPracticalAssessmentUserId(user.getUserId());
-        employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
-        if (totalScore.get().intValue() > CommonConstants.NINETY) {
-            employeeTrainingDO.setPracticalExamStatus(1);
-        } else {
-            employeeTrainingDO.setPracticalExamStatus(2);
-        }
-        employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
-        employeeTrainingDO.setActualAssessmentTime(new Date());
-
-
-        if (employeeTrainingDO.getPracticalExamStatus() == CommonConstants.TWO) {
-            employeeTrainingDO.setAssessmentStatus(CommonConstants.THREE);
-        }
-        if (employeeTrainingDO.getPracticalExamStatus() == 1) {
-            employeeTrainingDO.setAssessmentStatus(CommonConstants.TWO);
-        }
-        employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
-
-        //查询员工是否全部培训完成
-        Integer unCompleteNum = employeeTrainingDAO.unCompleteNum(employeeTrainingDO.getShopId());
-        if (unCompleteNum != null && unCompleteNum == 0) {
-            // 培训全部结束
-
-            //登记人员，培训状态由未开始到培训中
-//            ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(tempUserDetailDO.getShopId(), ShopSubStageEnum.SHOP_STAGE_6);
-//            if(shopStageInfoDO != null && shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60.getShopSubStageStatus())){
-//                shopStageInfoDAO.updateShopStageInfo(tempUserDetailDO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_61);
-//                //状态结束
-//                preparationService.whetherToOpenForAcceptance(tempUserDetailDO.getShopId());
+//    @Resource
+//    private SysRoleService sysRoleService;
+//
+//    @Resource
+//    private UserAuthMappingService userAuthMappingService;
+//
+//    @Resource
+//    private EmployeeTrainingDAO employeeTrainingDAO;
+//
+//    @Resource
+//    private RegionService regionService;
+//
+//    @Resource
+//    private RegionDao regionDao;
+//
+//    @Resource
+//    private TempUserDetailDAO tempUserDetailDAO;
+//
+//    @Resource
+//    private ShopInfoDAO shopInfoDAO;
+//
+//    @Resource
+//    private EnterpriseUserDAO enterpriseUserDAO;
+//
+//    @Resource
+//    private StoreDao storeDAO;
+//
+//    @Resource
+//    private AssessmentTemplateDAO assessmentTemplateDAO;
+//
+//    @Resource
+//    private AssessmentDataDAO assessmentDataDAO;
+//
+//    @Resource
+//    private RedisUtilPool redisUtilPool;
+//
+//    @Resource
+//    private XfsgEhrService xfsgEhrService;
+//
+//    @Resource
+//    private LineInfoDAO lineInfoDAO;
+//
+//    @Resource
+//    private CommonService commonService;
+//
+//    @Resource
+//    private ShopStageInfoDAO shopStageInfoDAO;
+//
+//    @Resource
+//    private PreparationService preparationService;
+//
+//    @Override
+//    public PageInfo<EmployeeTrainingVO> employeeTrainingList(String userId, EmployeeTrainingRequest request) {
+//        List<String> authRegionIdList = new ArrayList<>();
+//        if (!sysRoleService.checkIsAdmin(userId)) {
+//            authRegionIdList = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
+//        }
+//        if (CollectionUtils.isNotEmpty(request.getRegionIdList())) {
+//            if (request.getRegionIdList().contains(CommonConstants.ROOT_DEPT_ID_STR)) {
+//                request.setRegionIdList(null);
+//            } else {
+//                request.setRegionIdList(regionService.getSubRegionIdsByRegionIds(request.getRegionIdList()));
 //            }
-
-            Map<String, String> messageMap = new HashMap<>();
-            messageMap.put("storeName", shopInfoDO.getShopName());
-            LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(tempUserDetailDO.getLineId());
-        }
-    }
-
-    private void checkVideoHandel(List<AssessmentDataDO> assessmentDataDOList) {
-        if (CollectionUtils.isEmpty(assessmentDataDOList)) {
-            return;
-        }
-        for (AssessmentDataDO assessmentDataDO : assessmentDataDOList) {
-            SmallVideoInfoDTO smallVideoInfo = JSONObject.parseObject(assessmentDataDO.getVideo(), SmallVideoInfoDTO.class);
-            if (smallVideoInfo != null && CollectionUtils.isNotEmpty(smallVideoInfo.getVideoList())) {
-                String callbackCache;
-                SmallVideoDTO smallVideoCache;
-                SmallVideoParam smallVideoParam;
-                for (SmallVideoDTO smallVideo : smallVideoInfo.getVideoList()) {
-                    //如果转码完成
-                    if (smallVideo.getStatus() != null && smallVideo.getStatus() >= ResourceStatusEnum.TRANSCODE_FINISH.getValue()) {
-                        continue;
-                    }
-                    callbackCache = redisUtilPool.getString(RedisConstant.VIDEO_CALLBACK_CACHE + smallVideo.getVideoId());
-                    if (StringUtils.isNotBlank(callbackCache)) {
-                        smallVideoCache = JSONObject.parseObject(callbackCache, SmallVideoDTO.class);
-                        if (smallVideoCache != null && smallVideoCache.getStatus() != null && smallVideoCache.getStatus() >= 3) {
-                            BeanUtils.copyProperties(smallVideoCache, smallVideo);
-                        } else {
-                            smallVideoParam = new SmallVideoParam();
-                            setNotCompleteCache(smallVideoParam, smallVideo, assessmentDataDO.getId());
-                        }
-                    } else {
-                        smallVideoParam = new SmallVideoParam();
-                        setNotCompleteCache(smallVideoParam, smallVideo, assessmentDataDO.getId());
-                    }
-                }
-                assessmentDataDO.setVideo(JSONObject.toJSONString(smallVideoInfo));
-            }
-        }
-    }
-
-    public void setNotCompleteCache(SmallVideoParam smallVideoParam, SmallVideoDTO smallVideo, Long businessId) {
-        smallVideoParam.setVideoId(smallVideo.getVideoId());
-        smallVideoParam.setUploadType(UploadTypeEnum.ASSESSMENT_DATA_CONTENT.getValue());
-        smallVideoParam.setBusinessId(businessId);
-        smallVideoParam.setUploadTime(new Date());
-        //存入未转码完成的map，vod回调的时候使用
-        redisUtilPool.hashSet(RedisConstant.VIDEO_NOT_COMPLETE_CACHE, smallVideo.getVideoId(), JSONObject.toJSONString(smallVideoParam));
-    }
+//        }
+//        List<String> storeNumList = new ArrayList<>();
+//        if(CollectionUtils.isNotEmpty(request.getStoreIdList())){
+//            storeNumList = storeDAO.getStoreNumByStoreIds(request.getStoreIdList());
+//            if(CollectionUtils.isEmpty(storeNumList)){
+//                return new PageInfo<>();
+//            }
+//        }
+//        PageHelper.startPage(request.getPageNum(), request.getPageSize());
+//        List<EmployeeTrainingVO> list = employeeTrainingDAO.employeeTrainingList(request.getKeyWord(), request.getRegionIdList(), authRegionIdList, request.getAssignFlag(),
+//                DateUtils.parseLongDateToStr(request.getBeginTime()),
+//                DateUtils.parseLongDateToStr(request.getEndTime()), storeNumList,
+//                request.getTheoreticalExamStatus(), request.getPracticalExamStatus(), request.getAssessmentStatus(), request.getAssignStoreFlag());
+//        if (CollectionUtils.isEmpty(list)) {
+//            return new PageInfo<>(list);
+//        }
+//
+//        List<Long> regionIds = list.stream().map(EmployeeTrainingVO::getRegionId).distinct().collect(Collectors.toList());
+//
+//        List<Long> lineIdList = list.stream().map(EmployeeTrainingVO::getLineId).distinct().collect(Collectors.toList());
+//
+//        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).distinct().collect(Collectors.toList());
+//
+//        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
+//        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
+//
+//        List<String> userIdList = list.stream().map(EmployeeTrainingVO::getTrainingTeacherUserId).distinct().collect(Collectors.toList());
+//
+//
+//        List<String> practicalUserIdList = list.stream().map(EmployeeTrainingVO::getPracticalAssessmentUserId).distinct().collect(Collectors.toList());
+//
+//        if (CollectionUtils.isNotEmpty(practicalUserIdList)) {
+//            userIdList.addAll(practicalUserIdList);
+//        }
+//
+//        List<PlanLineDTO> lineInfoList = lineInfoDAO.getLines(lineIdList);
+//        Map<Long, String> lineInfoMap = lineInfoList.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, PlanLineDTO::getUsername));
+//
+//        Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(userIdList);
+//
+//        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
+//
+//        list.forEach(item -> {
+//            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
+//            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
+//            item.setTrainingTeacherUserName(userNameMap.get(item.getTrainingTeacherUserId()));
+//            item.setPracticalAssessmentUserName(userNameMap.get(item.getPracticalAssessmentUserId()));
+//            item.setFranchiseeName(lineInfoMap.get(item.getLineId()));
+//        });
+//        return new PageInfo<>(list);
+//    }
+//
+//    @Override
+//    public EmployeeTrainingDetailVO employeeTrainingDetail(Long id) {
+//        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
+//
+//        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
+//
+//        EmployeeTrainingDetailVO employeeTrainingVO = new EmployeeTrainingDetailVO();
+//        employeeTrainingVO.setRoleId(tempUserDetailDO.getRoleId());
+//        employeeTrainingVO.setMobile(tempUserDetailDO.getMobile());
+//        employeeTrainingVO.setUsername(tempUserDetailDO.getUsername());
+//        employeeTrainingVO.setIdCard(tempUserDetailDO.getIdCard());
+//        employeeTrainingVO.setId(tempUserDetailDO.getId());
+//        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(tempUserDetailDO.getRegionId()));
+//        employeeTrainingVO.setRegionNodeName(regionNameMap.get(tempUserDetailDO.getRegionId()));
+//        employeeTrainingVO.setRegionId(tempUserDetailDO.getRegionId());
+//        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailDO.getShopId());
+//        employeeTrainingVO.setShopName(shopInfoDO.getShopName());
+//        employeeTrainingVO.setShopId(tempUserDetailDO.getShopId());
+//        employeeTrainingVO.setAssignFlag(Boolean.FALSE);
+//        if(employeeTrainingDO != null){
+//            employeeTrainingVO.setTrainingStartTime(employeeTrainingDO.getTrainingStartTime());
+//            employeeTrainingVO.setTrainingEndTime(employeeTrainingDO.getTrainingEndTime());
+//            employeeTrainingVO.setTrainingStoreId(employeeTrainingDO.getTrainingStoreId());
+//            employeeTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
+//            StoreDO storeDO = storeDAO.getByStoreId(employeeTrainingDO.getTrainingStoreId());
+//            if (storeDO != null) {
+//                employeeTrainingVO.setTrainingStoreName(storeDO.getStoreName());
+//            }
+//            employeeTrainingVO.setTrainingTeacherUserId(employeeTrainingDO.getTrainingTeacherUserId());
+//            employeeTrainingVO.setTrainingTeacherUserName(enterpriseUserDAO.getUserName(employeeTrainingDO.getTrainingTeacherUserId()));
+//            employeeTrainingVO.setAssessmentStatus(employeeTrainingDO.getAssessmentStatus());
+//            employeeTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum());
+//            employeeTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum());
+//            employeeTrainingVO.setPracticalExamStatus(employeeTrainingDO.getPracticalExamStatus());
+//            employeeTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore());
+//            employeeTrainingVO.setEstimatedAssessmentTime(employeeTrainingDO.getEstimatedAssessmentTime());
+//            employeeTrainingVO.setActualAssessmentTime(employeeTrainingDO.getActualAssessmentTime());
+//            employeeTrainingVO.setPracticalAssessmentUserId(employeeTrainingDO.getPracticalAssessmentUserId());
+//            employeeTrainingVO.setPracticalAssessmentUserName(enterpriseUserDAO.getUserName(employeeTrainingDO.getPracticalAssessmentUserId()));
+//            employeeTrainingVO.setAssignFlag(employeeTrainingDO.getAssignFlag());
+//            employeeTrainingVO.setShopId(employeeTrainingDO.getShopId());
+//        }
+//        return employeeTrainingVO;
+//    }
+//
+//    @Transactional(rollbackFor = Exception.class)
+//    @Override
+//    public void distribution(EmployeeTrainingDetailRequest request) {
+//        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(request.getId());
+//
+//        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(request.getId());
+//
+//        if (employeeTrainingDO != null && employeeTrainingDO.getAssignFlag()) {
+//            throw new ServiceException("已经分配培训，无法再次分配");
+//        }
+//        if (employeeTrainingDO == null) {
+//            employeeTrainingDO = new EmployeeTrainingDO();
+//        }
+//        List<AssessmentTemplateDO> assessmentTemplateDOList = assessmentTemplateDAO.listByType(AssessmentTemplateType.TRAINER.getCode());
+//
+//        employeeTrainingDO.setAssignFlag(true);
+//        employeeTrainingDO.setTrainingTeacherUserId(request.getTrainingTeacherUserId());
+//        employeeTrainingDO.setTrainingStoreId(request.getTrainingStoreId());
+//        employeeTrainingDO.setTrainingStartTime(request.getTrainingStartTime());
+//        employeeTrainingDO.setTrainingEndTime(request.getTrainingEndTime());
+//        employeeTrainingDO.setEstimatedAssessmentTime(request.getEstimatedAssessmentTime());
+//        employeeTrainingDO.setAssessmentNum(0);
+//        employeeTrainingDO.setAssessmentTotalNum(assessmentTemplateDOList.size());
+//        employeeTrainingDO.setAssessmentStatus(0);
+//        if (employeeTrainingDO.getId() == null) {
+//            employeeTrainingDO.setXfsgUserDetailId(tempUserDetailDO.getId());
+//            employeeTrainingDO.setRegionId(tempUserDetailDO.getRegionId());
+//            employeeTrainingDO.setShopId(tempUserDetailDO.getShopId());
+//            employeeTrainingDAO.insertSelective(employeeTrainingDO);
+//        } else {
+//            employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
+//        }
+//        Long shopId = tempUserDetailDO.getShopId();
+//
+//        //分配教练员之后初始化实训数据
+//        List<AssessmentDataDO> assessmentDataDOList = new ArrayList<>();
+//        assessmentTemplateDOList.forEach(assessmentTemplateDO -> {
+//            AssessmentDataDO assessmentDataDO = new AssessmentDataDO();
+//            assessmentDataDO.setTemplateId(assessmentTemplateDO.getId());
+//            assessmentDataDO.setAssessmentUserId(tempUserDetailDO.getIdCard());
+//            assessmentDataDO.setShopId(shopId);
+//            assessmentDataDOList.add(assessmentDataDO);
+//        });
+//        assessmentDataDAO.batchInsertDO(assessmentDataDOList);
+//
+//
+//        Map<String, String> messageMap = new HashMap<>();
+//        messageMap.put("userName", tempUserDetailDO.getUsername());
+//        messageMap.put("mobile", tempUserDetailDO.getMobile());
+//        messageMap.put("registerTime", DateUtils.dateTime(tempUserDetailDO.getRegisterTime()));
+//        messageMap.put("userDetailId", tempUserDetailDO.getId().toString());
+//        commonService.sendMessage(Collections.singletonList(employeeTrainingDO.getTrainingTeacherUserId()), MessageEnum.MESSAGE_22, messageMap);
+//    }
+//
+//    @Override
+//    public List<EmployeeTrainingVO> trainingListByShopId(Long shopId) {
+//
+//        List<EmployeeTrainingVO> list = employeeTrainingDAO.trainingListByShopId(shopId, null, null);
+//        if (CollectionUtils.isEmpty(list)) {
+//            return list;
+//        }
+//        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
+//        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
+//        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
+//
+//        List<Long> regionIdList = list.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
+//        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
+//
+//        list.forEach(item -> {
+//            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
+//            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
+//            if(item.getAssessmentStatus() == null){
+//                //培训未开始
+//                item.setAssessmentStatus(-1);
+//            }
+//        });
+//        return list;
+//    }
+//
+//    @Override
+//    public PageInfo<EmployeeTrainingVO> trainerUserList(String userId, Integer status, Integer pageNum, Integer pageSize) {
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<EmployeeTrainingVO> list = employeeTrainingDAO.trainingListByShopId(null, userId, status);
+//        if (CollectionUtils.isEmpty(list)) {
+//            return new PageInfo<>();
+//        }
+//        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
+//        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
+//        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
+//
+//        List<Long> regionIdList = list.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
+//        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
+//
+//        list.forEach(item -> {
+//            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
+//            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
+//        });
+//        return new PageInfo<>(list);
+//    }
+//
+//    @Override
+//    public EmployeeUserTrainingVO trainerUserDetail(Long id) {
+//        EmployeeUserTrainingVO employeeUserTrainingVO = new EmployeeUserTrainingVO();
+//        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
+//
+//        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
+//        employeeUserTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
+//        employeeUserTrainingVO.setTrainingTeacherUserId(employeeTrainingDO.getTrainingTeacherUserId());
+//        employeeUserTrainingVO.setTrainingStoreId(employeeTrainingDO.getTrainingStoreId());
+//        employeeUserTrainingVO.setTrainingStartTime(employeeTrainingDO.getTrainingStartTime());
+//        employeeUserTrainingVO.setTrainingEndTime(employeeTrainingDO.getTrainingEndTime());
+//        employeeUserTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum());
+//        employeeUserTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum());
+//        employeeUserTrainingVO.setMobile(tempUserDetailDO.getMobile());
+//        employeeUserTrainingVO.setRoleId(tempUserDetailDO.getRoleId());
+//        employeeUserTrainingVO.setIdCard(tempUserDetailDO.getIdCard());
+//        employeeUserTrainingVO.setId(tempUserDetailDO.getId());
+//        employeeUserTrainingVO.setUsername(tempUserDetailDO.getUsername());
+//        employeeUserTrainingVO.setRegionId(tempUserDetailDO.getRegionId());
+//        employeeUserTrainingVO.setShopId(tempUserDetailDO.getShopId());
+//        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailDO.getShopId());
+//        if (shopInfoDO != null) {
+//            employeeUserTrainingVO.setShopName(shopInfoDO.getShopName());
+//        }
+//        StoreDO storeDO = storeDAO.getByStoreId(employeeTrainingDO.getTrainingStoreId());
+//        if (storeDO != null) {
+//            employeeUserTrainingVO.setTrainingStoreName(storeDO.getStoreName());
+//        }
+//
+//        employeeUserTrainingVO.setTrainingTeacherUserName(enterpriseUserDAO.getUserName(employeeTrainingDO.getTrainingTeacherUserId()));
+//        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.getIdCard(), templateIdList);
+//
+//        Map<String, AssessmentDataDO> assessmentDataMap = new HashMap<>();
+//        assessmentDataDOList.forEach(item -> {
+//            assessmentDataMap.put(item.getTemplateId() + CommonConstants.COLON + item.getAssessmentUserId(), item);
+//        });
+//        List<AssessmentTemplateDataVO> templateDataVOList = new ArrayList<>();
+//        assessmentTemplateDOList.forEach(item -> {
+//            AssessmentTemplateDataVO assessmentTemplateDataVO = new AssessmentTemplateDataVO();
+//            AssessmentDataDO assessmentDataDO = assessmentDataMap.get(item.getId() + CommonConstants.COLON + tempUserDetailDO.getIdCard());
+//            if (assessmentDataDO != null) {
+//                assessmentTemplateDataVO.setGoalScore(assessmentDataDO.getScore());
+//                assessmentTemplateDataVO.setReason(assessmentDataDO.getReason());
+//                assessmentTemplateDataVO.setComments(assessmentDataDO.getComments());
+//                assessmentTemplateDataVO.setQualified(assessmentDataDO.getQualified());
+//                assessmentTemplateDataVO.setAssessmentDataId(assessmentDataDO.getId());
+//            }
+//            assessmentTemplateDataVO.setScore(item.getScore());
+//            assessmentTemplateDataVO.setTemplateName(item.getTemplateName());
+//            assessmentTemplateDataVO.setTemplateRemarkList(Arrays.asList(item.getTemplateRemark().split(CommonConstants.COMMA)));
+//            assessmentTemplateDataVO.setCategory(item.getCategory());
+//            assessmentTemplateDataVO.setId(item.getId());
+//            assessmentTemplateDataVO.setType(item.getType());
+//            assessmentTemplateDataVO.setTemplateRequirements(item.getTemplateRequirements());
+//            templateDataVOList.add(assessmentTemplateDataVO);
+//        });
+//        employeeUserTrainingVO.setTemplateDataList(templateDataVOList);
+//        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId()));
+//        employeeUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId()));
+//        return employeeUserTrainingVO;
+//    }
+//
+//    @Transactional(rollbackFor = Exception.class)
+//    @Override
+//    public void trainerUserCommit(EmployeeTrainingCommitListRequest request) {
+//        if (CollectionUtils.isEmpty(request.getList())) {
+//            return;
+//        }
+//
+//        Long userDetailId = request.getUserDetailId();
+//        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(userDetailId);
+//        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(userDetailId);
+//
+//        String idCard = tempUserDetailDO.getIdCard();
+//        request.getList().forEach(item -> {
+//            AssessmentDataDO assessmentDataDO = null;
+//            if (item.getId() != null) {
+//                assessmentDataDO = assessmentDataDAO.selectByPrimaryKey(item.getId());
+//            } else {
+//                assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), item.getUserDetailId(), item.getShopId());
+//            }
+//            if (assessmentDataDO != null) {
+//                assessmentDataDO.setQualified(item.getQualified());
+//                assessmentDataDAO.updateByPrimaryKeySelective(assessmentDataDO);
+//            } else {
+//                assessmentDataDO = new AssessmentDataDO();
+//                assessmentDataDO.setTemplateId(item.getTemplateId());
+//                assessmentDataDO.setAssessmentUserId(idCard);
+//                assessmentDataDO.setShopId(item.getShopId());
+//                assessmentDataDO.setQualified(item.getQualified());
+//                assessmentDataDAO.insertSelective(assessmentDataDO);
+//            }
+//        });
+//        Integer num = assessmentDataDAO.selectCount(idCard, tempUserDetailDO.getShopId());
+//        employeeTrainingDO.setAssessmentNum(num);
+//        if (num.equals(employeeTrainingDO.getAssessmentTotalNum())) {
+//            employeeTrainingDO.setAssessmentStatus(1);
+//        }
+//        employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
+//    }
+//
+//    @Override
+//    public PageInfo<EmployeeTrainingVO> assessmentUserList(String userId, EmployeeAssessmentRequest request) {
+//
+//        List<String> requestStoreIdList = request.getStoreIdList();
+//        Boolean isAdmin = sysRoleService.checkIsAdmin(userId);
+//        if (CollectionUtils.isEmpty(requestStoreIdList) && StringUtils.isNotBlank(userId) && !isAdmin) {
+//            requestStoreIdList = userAuthMappingService.getAuthStoreIdAndSubRegionIdByUserId(userId);
+//            if(CollectionUtils.isEmpty(requestStoreIdList)){
+//                return new PageInfo<>();
+//            }
+//        }
+//        String practicalAssessmentUserId = userId;
+//        //空意味着管理员
+//        if(isAdmin){
+//            practicalAssessmentUserId = null;
+//        }
+//
+//        PageHelper.startPage(request.getPageNum(), request.getPageSize());
+//        List<EmployeeTrainingVO> employeeTrainingVOList = employeeTrainingDAO
+//                .assessmentUserList(request.getName(), practicalAssessmentUserId, request.getAssessmentStatus(),
+//                DateUtils.parseLongDateToStr(request.getEstimatedAssessmentBeginTime()),
+//                DateUtils.parseLongDateToStr(request.getEstimatedAssessmentEndTime()),
+//                DateUtils.parseLongDateToStr(request.getActualAssessmentBeginTime()),
+//                DateUtils.parseLongDateToStr(request.getActualAssessmentEndTime()), requestStoreIdList);
+//        if (CollectionUtils.isEmpty(employeeTrainingVOList)) {
+//            return new PageInfo<>(employeeTrainingVOList);
+//        }
+//        List<String> storeIdList = employeeTrainingVOList.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
+//        List<StoreDO> storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList);
+//        Map<String, String> storeNameMap = storeDOList.stream().collect(Collectors.toMap(StoreDO::getStoreId, StoreDO::getStoreName));
+//
+//        List<Long> regionIdList = employeeTrainingVOList.stream().map(EmployeeTrainingVO::getRegionId).collect(Collectors.toList());
+//        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIdList);
+//
+//        employeeTrainingVOList.forEach(item -> {
+//            item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId()));
+//            item.setRegionNodeName(regionNameMap.get(item.getRegionId()));
+//        });
+//        return new PageInfo<>(employeeTrainingVOList);
+//    }
+//
+//    @Override
+//    public AssessmentUserTrainingVO assessmentUserDetail(Long id) {
+//        AssessmentUserTrainingVO assessmentUserTrainingVO = new AssessmentUserTrainingVO();
+//        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
+//
+//        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
+//        assessmentUserTrainingVO.setEmployeeTrainingId(employeeTrainingDO.getId());
+//        assessmentUserTrainingVO.setTrainingStoreId(employeeTrainingDO.getTrainingStoreId());
+//        StoreDO storeDO = storeDAO.getByStoreId(employeeTrainingDO.getTrainingStoreId());
+//        if (storeDO != null) {
+//            assessmentUserTrainingVO.setTrainingStoreName(storeDO.getStoreName());
+//        }
+//        assessmentUserTrainingVO.setPracticalAssessmentUserId(employeeTrainingDO.getPracticalAssessmentUserId());
+//        assessmentUserTrainingVO.setPracticalAssessmentUserName(enterpriseUserDAO.getUserName(employeeTrainingDO.getPracticalAssessmentUserId()));
+//        assessmentUserTrainingVO.setMobile(tempUserDetailDO.getMobile());
+//        assessmentUserTrainingVO.setRoleId(tempUserDetailDO.getRoleId());
+//        assessmentUserTrainingVO.setIdCard(tempUserDetailDO.getIdCard());
+//        assessmentUserTrainingVO.setActualAssessmentTime(employeeTrainingDO.getActualAssessmentTime());
+//        assessmentUserTrainingVO.setEstimatedAssessmentTime(employeeTrainingDO.getEstimatedAssessmentTime());
+//        assessmentUserTrainingVO.setUsername(tempUserDetailDO.getUsername());
+//        assessmentUserTrainingVO.setAssessmentStatus(employeeTrainingDO.getAssessmentStatus());
+//        assessmentUserTrainingVO.setShopId(tempUserDetailDO.getShopId());
+//
+//        assessmentUserTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum());
+//        assessmentUserTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum());
+//        assessmentUserTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore());
+//        assessmentUserTrainingVO.setPracticalExamStatus(employeeTrainingDO.getPracticalExamStatus());
+//        assessmentUserTrainingVO.setId(tempUserDetailDO.getId());
+//        assessmentUserTrainingVO.setRegionId(tempUserDetailDO.getRegionId());
+//        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(employeeTrainingDO.getShopId());
+//        if (shopInfoDO != null) {
+//            assessmentUserTrainingVO.setShopName(shopInfoDO.getShopName());
+//        }
+//
+//        Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(employeeTrainingDO.getRegionId()));
+//        assessmentUserTrainingVO.setRegionNodeName(regionNameMap.get(employeeTrainingDO.getRegionId()));
+//
+//        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<AssessmentDataDO> assessmentDataDOList = assessmentDataDAO.selectList(tempUserDetailDO.getIdCard(), templateIdList);
+//
+//        Map<String, AssessmentDataDO> assessmentDataMap = new HashMap<>();
+//        assessmentDataDOList.forEach(item -> {
+//            assessmentDataMap.put(item.getTemplateId() + CommonConstants.COLON + item.getAssessmentUserId(), item);
+//        });
+//        List<AssessmentTemplateDataVO> templateDataVOList = new ArrayList<>();
+//        assessmentTemplateDOList.forEach(item -> {
+//            AssessmentTemplateDataVO assessmentTemplateDataVO = new AssessmentTemplateDataVO();
+//            AssessmentDataDO assessmentDataDO = assessmentDataMap.get(item.getId() + CommonConstants.COLON + tempUserDetailDO.getIdCard());
+//            if (assessmentDataDO != null) {
+//                assessmentTemplateDataVO.setGoalScore(assessmentDataDO.getScore());
+//                assessmentTemplateDataVO.setReason(assessmentDataDO.getReason());
+//                assessmentTemplateDataVO.setComments(assessmentDataDO.getComments());
+//                assessmentTemplateDataVO.setQualified(assessmentDataDO.getQualified());
+//                assessmentTemplateDataVO.setAssessmentDataId(assessmentDataDO.getId());
+//                assessmentTemplateDataVO.setPicture(assessmentDataDO.getPicture());
+//                assessmentTemplateDataVO.setVideo(assessmentDataDO.getVideo());
+//            }
+//            assessmentTemplateDataVO.setScore(item.getScore());
+//            assessmentTemplateDataVO.setTemplateName(item.getTemplateName());
+//            assessmentTemplateDataVO.setTemplateRemarkList(Arrays.asList(item.getTemplateRemark().split(CommonConstants.COMMA)));
+//            assessmentTemplateDataVO.setCategory(item.getCategory());
+//            assessmentTemplateDataVO.setId(item.getId());
+//            assessmentTemplateDataVO.setType(item.getType());
+//            assessmentTemplateDataVO.setCategory(item.getCategory());
+//            assessmentTemplateDataVO.setTemplateRequirements(item.getTemplateRequirements());
+//            assessmentTemplateDataVO.setCheckType(item.getCheckType());
+//            templateDataVOList.add(assessmentTemplateDataVO);
+//        });
+//        assessmentUserTrainingVO.setTemplateDataList(templateDataVOList);
+//        return assessmentUserTrainingVO;
+//    }
+//
+//    @Override
+//    public void turn(Long id, String userId, String turnUserId) {
+//        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(id);
+//
+//        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectByUserDetailId(id);
+//
+//        employeeTrainingDO.setPracticalAssessmentUserId(turnUserId);
+//
+//        employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
+//    }
+//
+//    @Transactional(rollbackFor = Exception.class)
+//    @Override
+//    public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo user) {
+//        if (CollectionUtils.isEmpty(request.getList())) {
+//            return;
+//        }
+//        EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectById(request.getEmployeeTrainingId());
+//        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(employeeTrainingDO.getXfsgUserDetailId());
+//        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailDO.getShopId());
+//        String idCard = tempUserDetailDO.getIdCard();
+//        AtomicReference<Long> totalScore = new AtomicReference<>(0L);
+//        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<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(), idCard, item.getShopId());
+//            }
+//            if (assessmentDataDO != null) {
+//                assessmentDataDO.setScore(item.getScore());
+//                assessmentDataDO.setComments(item.getComments());
+//                assessmentDataDO.setPicture(item.getPicture());
+//                assessmentDataDO.setVideo(item.getVideo());
+//            } else {
+//                assessmentDataDO = new AssessmentDataDO();
+//                assessmentDataDO.setTemplateId(item.getTemplateId());
+//                assessmentDataDO.setShopId(item.getShopId());
+//                assessmentDataDO.setComments(item.getComments());
+//                assessmentDataDO.setScore(item.getScore());
+//                assessmentDataDO.setAssessmentUserId(idCard);
+//                assessmentDataDO.setPicture(item.getPicture());
+//                assessmentDataDO.setVideo(item.getVideo());
+//                assessmentDataDAO.insertSelective(assessmentDataDO);
+//            }
+//            assessmentDataDOList.add(assessmentDataDO);
+//        });
+//        checkVideoHandel(assessmentDataDOList);
+//        assessmentDataDAO.batchInsertOrUpdate(assessmentDataDOList);
+//
+//        employeeTrainingDO.setPracticalAssessmentUserId(user.getUserId());
+//        employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
+//        if (totalScore.get().intValue() > CommonConstants.NINETY) {
+//            employeeTrainingDO.setPracticalExamStatus(1);
+//        } else {
+//            employeeTrainingDO.setPracticalExamStatus(2);
+//        }
+//        employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
+//        employeeTrainingDO.setActualAssessmentTime(new Date());
+//
+//
+//        if (employeeTrainingDO.getPracticalExamStatus() == CommonConstants.TWO) {
+//            employeeTrainingDO.setAssessmentStatus(CommonConstants.THREE);
+//        }
+//        if (employeeTrainingDO.getPracticalExamStatus() == 1) {
+//            employeeTrainingDO.setAssessmentStatus(CommonConstants.TWO);
+//        }
+//        employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
+//
+//        //查询员工是否全部培训完成
+//        Integer unCompleteNum = employeeTrainingDAO.unCompleteNum(employeeTrainingDO.getShopId());
+//        if (unCompleteNum != null && unCompleteNum == 0) {
+//            // 培训全部结束
+//
+//            //登记人员，培训状态由未开始到培训中
+////            ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(tempUserDetailDO.getShopId(), ShopSubStageEnum.SHOP_STAGE_6);
+////            if(shopStageInfoDO != null && shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60.getShopSubStageStatus())){
+////                shopStageInfoDAO.updateShopStageInfo(tempUserDetailDO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_61);
+////                //状态结束
+////                preparationService.whetherToOpenForAcceptance(tempUserDetailDO.getShopId());
+////            }
+//
+//            Map<String, String> messageMap = new HashMap<>();
+//            messageMap.put("storeName", shopInfoDO.getShopName());
+//            LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(tempUserDetailDO.getLineId());
+//        }
+//    }
+//
+//    private void checkVideoHandel(List<AssessmentDataDO> assessmentDataDOList) {
+//        if (CollectionUtils.isEmpty(assessmentDataDOList)) {
+//            return;
+//        }
+//        for (AssessmentDataDO assessmentDataDO : assessmentDataDOList) {
+//            SmallVideoInfoDTO smallVideoInfo = JSONObject.parseObject(assessmentDataDO.getVideo(), SmallVideoInfoDTO.class);
+//            if (smallVideoInfo != null && CollectionUtils.isNotEmpty(smallVideoInfo.getVideoList())) {
+//                String callbackCache;
+//                SmallVideoDTO smallVideoCache;
+//                SmallVideoParam smallVideoParam;
+//                for (SmallVideoDTO smallVideo : smallVideoInfo.getVideoList()) {
+//                    //如果转码完成
+//                    if (smallVideo.getStatus() != null && smallVideo.getStatus() >= ResourceStatusEnum.TRANSCODE_FINISH.getValue()) {
+//                        continue;
+//                    }
+//                    callbackCache = redisUtilPool.getString(RedisConstant.VIDEO_CALLBACK_CACHE + smallVideo.getVideoId());
+//                    if (StringUtils.isNotBlank(callbackCache)) {
+//                        smallVideoCache = JSONObject.parseObject(callbackCache, SmallVideoDTO.class);
+//                        if (smallVideoCache != null && smallVideoCache.getStatus() != null && smallVideoCache.getStatus() >= 3) {
+//                            BeanUtils.copyProperties(smallVideoCache, smallVideo);
+//                        } else {
+//                            smallVideoParam = new SmallVideoParam();
+//                            setNotCompleteCache(smallVideoParam, smallVideo, assessmentDataDO.getId());
+//                        }
+//                    } else {
+//                        smallVideoParam = new SmallVideoParam();
+//                        setNotCompleteCache(smallVideoParam, smallVideo, assessmentDataDO.getId());
+//                    }
+//                }
+//                assessmentDataDO.setVideo(JSONObject.toJSONString(smallVideoInfo));
+//            }
+//        }
+//    }
+//
+//    public void setNotCompleteCache(SmallVideoParam smallVideoParam, SmallVideoDTO smallVideo, Long businessId) {
+//        smallVideoParam.setVideoId(smallVideo.getVideoId());
+//        smallVideoParam.setUploadType(UploadTypeEnum.ASSESSMENT_DATA_CONTENT.getValue());
+//        smallVideoParam.setBusinessId(businessId);
+//        smallVideoParam.setUploadTime(new Date());
+//        //存入未转码完成的map，vod回调的时候使用
+//        redisUtilPool.hashSet(RedisConstant.VIDEO_NOT_COMPLETE_CACHE, smallVideo.getVideoId(), JSONObject.toJSONString(smallVideoParam));
+//    }
 }
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 f23c7038c..c7e0db484 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
@@ -97,15 +97,11 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
 
     @Override
     public void addTempUserDetail(TempUserDetailRequest tempUserDetailRequest) {
-        TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectByIdCard(tempUserDetailRequest.getIdCard());
-        if(tempUserDetailDO != null){
-            throw new ServiceException("该员工已登记");
-        }
         ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailRequest.getShopId());
         if(shopInfoDO == null){
             throw new ServiceException("该店铺不存在");
         }
-        tempUserDetailDO = new TempUserDetailDO();
+        TempUserDetailDO tempUserDetailDO = new TempUserDetailDO();
         tempUserDetailDO.setLineId(shopInfoDO.getLineId());
         tempUserDetailDO.setShopId(tempUserDetailRequest.getShopId());
         tempUserDetailDO.setRegionId(shopInfoDO.getRegionId());
@@ -126,26 +122,6 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
         tempUserDetailDO.setSubmitTime(new Date());
         tempUserDetailDO.setSource("create");
         tempUserDetailDAO.insertSelective(tempUserDetailDO);
-
-        //登记人员，培训状态由未开始到培训中
-//        ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(tempUserDetailDO.getShopId(), ShopSubStageEnum.SHOP_STAGE_6);
-//        if(shopStageInfoDO != null && shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())){
-//            shopStageInfoDAO.updateShopStageInfo(tempUserDetailDO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60);
-//        }
-
-//        List<String> userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode()));
-//        RegionDO regionDO = regionDao.getRegionById(shopInfoDO.getRegionId());
-//        //
-//        if (regionDO != null && regionDO.getParentId() != null){
-//            userIdList = enterpriseUserDAO.getUserIdListByRegionId(Long.valueOf(regionDO.getParentId()), userIdList);
-//
-//            Map<String, String> messageMap = new HashMap<>();
-//            messageMap.put("userName", tempUserDetailRequest.getName());
-//            messageMap.put("mobile", tempUserDetailRequest.getPhone());
-//            messageMap.put("registerTime", DateUtils.dateTime(tempUserDetailRequest.getRegisterTime()));
-//            messageMap.put("userDetailId", tempUserDetailDO.getId().toString());
-//            commonService.sendMessage(userIdList, MessageEnum.MESSAGE_21, messageMap);
-//        }
     }
 
     @Override
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java
index c2ec01b16..d5c33211a 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java
@@ -28,113 +28,113 @@ import java.util.List;
 @RequestMapping("pc/employeeTraining")
 public class EmployeeTrainingController {
 
-    @Resource
-    private EmployeeTrainingService employeeTrainingService;
-
-
-    @ApiOperation("培训员工列表")
-    @GetMapping("/trainingListByShopId")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
-    })
-    public ResponseResult<List<EmployeeTrainingVO>> trainingListByShopId(@RequestParam("shopId") Long shopId) {
-        return ResponseResult.success(employeeTrainingService.trainingListByShopId(shopId));
-    }
-
-    @ApiOperation("待训员工列表")
-    @PostMapping("/employeeTrainingList")
-    public ResponseResult<PageInfo<EmployeeTrainingVO>> employeeTrainingList(@RequestBody EmployeeTrainingRequest employeeTrainingRequest) {
-        return ResponseResult.success(employeeTrainingService.employeeTrainingList(CurrentUserHolder.getUserId(), employeeTrainingRequest));
-    }
-
-    @ApiOperation("员工培训详情")
-    @GetMapping("/employeeTrainingDetail")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id", required = true)
-    })
-    public ResponseResult<EmployeeTrainingDetailVO> employeeTrainingDetail(@RequestParam("id") Long id) {
-        return ResponseResult.success(employeeTrainingService.employeeTrainingDetail(id));
-    }
-
-    @ApiOperation("员工培训--分配")
-    @PostMapping("/distribution")
-    public ResponseResult<Boolean> distribution(@RequestBody EmployeeTrainingDetailRequest request) {
-        employeeTrainingService.distribution(request);
-        return ResponseResult.success(Boolean.TRUE);
-    }
-
-    @ApiOperation("培训进度-列表")
-    @PostMapping("/trainingScheduleList")
-    public ResponseResult<PageInfo<EmployeeTrainingVO>> trainingScheduleList(@RequestBody EmployeeTrainingRequest employeeTrainingRequest) {
-        employeeTrainingRequest.setAssignFlag(Boolean.TRUE);
-        return ResponseResult.success(employeeTrainingService.employeeTrainingList(CurrentUserHolder.getUserId(), employeeTrainingRequest));
-    }
-
-
-    @ApiOperation("培训-教练员-员工列表")
-    @GetMapping("/trainerUserList")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "status", value = "带训状态 0-未完成  1-已完成"),
-            @ApiImplicitParam(name = "pageNum", value = "分页页数"),
-            @ApiImplicitParam(name = "pageSize", value = "分页大小"),
-    })
-    public ResponseResult<PageInfo<EmployeeTrainingVO>> trainerUserList(@RequestParam(value = "status", required = false) Integer status,
-                                                                    @RequestParam(value = "pageNum" ,defaultValue = "1")Integer pageNum,
-                                                                    @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
-        return ResponseResult.success(employeeTrainingService.trainerUserList(CurrentUserHolder.getUserId(), status, pageNum, pageSize));
-    }
-
-    @ApiOperation("培训-教练员-员工带训详情")
-    @RequestMapping("/trainerUserDetail")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "用户id", required = true)
-    })
-    public ResponseResult<EmployeeUserTrainingVO> trainerUserDetail(Long id) {
-        return ResponseResult.success(employeeTrainingService.trainerUserDetail(id));
-    }
-
-    @ApiOperation("培训-教练员-提交培训")
-    @PostMapping("/trainerUserCommit")
-    public ResponseResult<Boolean> trainerUserCommit(@RequestBody EmployeeTrainingCommitListRequest request) {
-        employeeTrainingService.trainerUserCommit(request);
-        return ResponseResult.success(Boolean.TRUE);
-    }
-
-
-    @ApiOperation("培训-战区经理-考核员工列表")
-    @PostMapping("/assessmentUserList")
-    public ResponseResult<PageInfo<EmployeeTrainingVO>> assessmentUserList(@RequestBody EmployeeAssessmentRequest request) {
-        return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
-    }
-
-    @ApiOperation("培训-督导-考核员工列表")
-    @PostMapping("/supervisorUserList")
-    public ResponseResult<PageInfo<EmployeeTrainingVO>> supervisorUserList(@RequestBody EmployeeAssessmentRequest request) {
-        return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
-    }
-
-    @ApiOperation("培训-战区经理-员工考核详情")
-    @RequestMapping("/assessmentUserDetail")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "员工id", required = true)
-    })
-    public ResponseResult<AssessmentUserTrainingVO> assessmentUserDetail(Long id) {
-        return ResponseResult.success(employeeTrainingService.assessmentUserDetail(id));
-    }
-
-    @ApiOperation("培训-实训考核-转交")
-    @PostMapping("/turn")
-    public ResponseResult<Boolean> turn(@RequestBody EmployeeAssessmentTurnRequest request) {
-        employeeTrainingService.turn(request.getId(), CurrentUserHolder.getUserId(), request.getTurnUserId());
-        return ResponseResult.success(Boolean.TRUE);
-    }
-
-    @ApiOperation("培训-实训考核-提交考核结果")
-    @PostMapping("/assessmentUserCommit")
-    public ResponseResult<Boolean> assessmentUserCommit(@RequestBody EmployeeAssessmentCommitListRequest request) {
-        employeeTrainingService.assessmentUserCommit(request, CurrentUserHolder.getUser());
-        return ResponseResult.success(Boolean.TRUE);
-    }
+//    @Resource
+//    private EmployeeTrainingService employeeTrainingService;
+//
+//
+//    @ApiOperation("培训员工列表")
+//    @GetMapping("/trainingListByShopId")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
+//    })
+//    public ResponseResult<List<EmployeeTrainingVO>> trainingListByShopId(@RequestParam("shopId") Long shopId) {
+//        return ResponseResult.success(employeeTrainingService.trainingListByShopId(shopId));
+//    }
+//
+//    @ApiOperation("待训员工列表")
+//    @PostMapping("/employeeTrainingList")
+//    public ResponseResult<PageInfo<EmployeeTrainingVO>> employeeTrainingList(@RequestBody EmployeeTrainingRequest employeeTrainingRequest) {
+//        return ResponseResult.success(employeeTrainingService.employeeTrainingList(CurrentUserHolder.getUserId(), employeeTrainingRequest));
+//    }
+//
+//    @ApiOperation("员工培训详情")
+//    @GetMapping("/employeeTrainingDetail")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "id", value = "id", required = true)
+//    })
+//    public ResponseResult<EmployeeTrainingDetailVO> employeeTrainingDetail(@RequestParam("id") Long id) {
+//        return ResponseResult.success(employeeTrainingService.employeeTrainingDetail(id));
+//    }
+//
+//    @ApiOperation("员工培训--分配")
+//    @PostMapping("/distribution")
+//    public ResponseResult<Boolean> distribution(@RequestBody EmployeeTrainingDetailRequest request) {
+//        employeeTrainingService.distribution(request);
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//    @ApiOperation("培训进度-列表")
+//    @PostMapping("/trainingScheduleList")
+//    public ResponseResult<PageInfo<EmployeeTrainingVO>> trainingScheduleList(@RequestBody EmployeeTrainingRequest employeeTrainingRequest) {
+//        employeeTrainingRequest.setAssignFlag(Boolean.TRUE);
+//        return ResponseResult.success(employeeTrainingService.employeeTrainingList(CurrentUserHolder.getUserId(), employeeTrainingRequest));
+//    }
+//
+//
+//    @ApiOperation("培训-教练员-员工列表")
+//    @GetMapping("/trainerUserList")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "status", value = "带训状态 0-未完成  1-已完成"),
+//            @ApiImplicitParam(name = "pageNum", value = "分页页数"),
+//            @ApiImplicitParam(name = "pageSize", value = "分页大小"),
+//    })
+//    public ResponseResult<PageInfo<EmployeeTrainingVO>> trainerUserList(@RequestParam(value = "status", required = false) Integer status,
+//                                                                    @RequestParam(value = "pageNum" ,defaultValue = "1")Integer pageNum,
+//                                                                    @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
+//        return ResponseResult.success(employeeTrainingService.trainerUserList(CurrentUserHolder.getUserId(), status, pageNum, pageSize));
+//    }
+//
+//    @ApiOperation("培训-教练员-员工带训详情")
+//    @RequestMapping("/trainerUserDetail")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "id", value = "用户id", required = true)
+//    })
+//    public ResponseResult<EmployeeUserTrainingVO> trainerUserDetail(Long id) {
+//        return ResponseResult.success(employeeTrainingService.trainerUserDetail(id));
+//    }
+//
+//    @ApiOperation("培训-教练员-提交培训")
+//    @PostMapping("/trainerUserCommit")
+//    public ResponseResult<Boolean> trainerUserCommit(@RequestBody EmployeeTrainingCommitListRequest request) {
+//        employeeTrainingService.trainerUserCommit(request);
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//
+//    @ApiOperation("培训-战区经理-考核员工列表")
+//    @PostMapping("/assessmentUserList")
+//    public ResponseResult<PageInfo<EmployeeTrainingVO>> assessmentUserList(@RequestBody EmployeeAssessmentRequest request) {
+//        return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
+//    }
+//
+//    @ApiOperation("培训-督导-考核员工列表")
+//    @PostMapping("/supervisorUserList")
+//    public ResponseResult<PageInfo<EmployeeTrainingVO>> supervisorUserList(@RequestBody EmployeeAssessmentRequest request) {
+//        return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
+//    }
+//
+//    @ApiOperation("培训-战区经理-员工考核详情")
+//    @RequestMapping("/assessmentUserDetail")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "id", value = "员工id", required = true)
+//    })
+//    public ResponseResult<AssessmentUserTrainingVO> assessmentUserDetail(Long id) {
+//        return ResponseResult.success(employeeTrainingService.assessmentUserDetail(id));
+//    }
+//
+//    @ApiOperation("培训-实训考核-转交")
+//    @PostMapping("/turn")
+//    public ResponseResult<Boolean> turn(@RequestBody EmployeeAssessmentTurnRequest request) {
+//        employeeTrainingService.turn(request.getId(), CurrentUserHolder.getUserId(), request.getTurnUserId());
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
+//
+//    @ApiOperation("培训-实训考核-提交考核结果")
+//    @PostMapping("/assessmentUserCommit")
+//    public ResponseResult<Boolean> assessmentUserCommit(@RequestBody EmployeeAssessmentCommitListRequest request) {
+//        employeeTrainingService.assessmentUserCommit(request, CurrentUserHolder.getUser());
+//        return ResponseResult.success(Boolean.TRUE);
+//    }
 
 
 }
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniEmployeeTrainingController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniEmployeeTrainingController.java
index 6d56670f7..6fd59df22 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniEmployeeTrainingController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniEmployeeTrainingController.java
@@ -27,13 +27,13 @@ public class MiniEmployeeTrainingController {
     @Resource
     private EmployeeTrainingService employeeTrainingService;
 
-    @ApiOperation("培训员工列表")
+    /*@ApiOperation("培训员工列表")
     @GetMapping("/trainingListByShopId")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
     })
     public ResponseResult<List<EmployeeTrainingVO>> trainingListByShopId(@RequestParam("shopId") Long shopId) {
         return ResponseResult.success(employeeTrainingService.trainingListByShopId(shopId));
-    }
+    }*/
 
 }