Merge branch 'cc_partner_init' into 'master'

Cc partner init

See merge request hangzhou/java/custom_xfsg!5

coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java

@@ -33,7 +33,7 @@ public enum SMSMsgEnum {
     FRANCHISE_FEE_NOT_PASS("缴纳加盟费缴纳失败", "", "SMS_465896262"),
     DECORATION_MODEL_PAY("装修款待缴费", "","SMS_465961253"),
     THREE_ACCEPTANCE_WAIT("三方验收待验收","","SMS_465961257"),
-    FIRST_ORDER("首批订货金代缴费","","SMS_467585281"),
+    FIRST_ORDER("首批订货金待缴费","","SMS_467585281"),
     TRAINING_REGISTER_SUCCESS("培训登记中", "", "SMS_466035101"),
     TRAINING_ASSESSMENT_SUCCESS("员工培训已完成", "", "SMS_465901266"),
 

coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

@@ -238,7 +238,7 @@
       left join xfsg_line_info b on a.line_id = b.id
     </if>
     <if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 1 ">
-      left join xfsg_system_building_shop c on a.id = c.shop_id
+      left join xfsg_system_building_shop c on a.shop_id = c.shop_id
     </if>
     <where>
       <if test="shopIds != null and shopIds.size() > 0">

coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java

@@ -1,5 +1,6 @@
 package com.cool.store.service;
 
+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.request.*;
 import com.cool.store.vo.AssessmentUserTrainingVO;
 import com.cool.store.vo.EmployeeTrainingDetailVO;
@@ -35,5 +36,5 @@ public interface EmployeeTrainingService {
 
     void turn(Long id, String userId, String turnUserId);
 
-    void assessmentUserCommit(EmployeeAssessmentCommitListRequest request);
+    void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo userId);
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java

@@ -365,8 +365,9 @@ public class DeskServiceImpl implements DeskService {
      */
     private PageInfo<PreparationCommonPendingVO> commonPendingVOPageInfo(Integer pageNum, Integer pageSize, LoginUserInfo user,ShopSubStageEnum shopSubStageEnum,List<Integer> subStageStatusList,Integer type){
         PageHelper.startPage(pageNum, pageSize);
+        //user.getJobNumber()
         List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(),
-                subStageStatusList, user.getUserId(),type);
+                subStageStatusList, user.getJobNumber(),type);
         PageInfo result = new PageInfo<>(specialShopStageInfo);
         List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList());
         List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList());

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

@@ -3,6 +3,7 @@ package com.cool.store.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.constants.RedisConstant;
+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.*;
 import com.cool.store.dto.SmallVideoDTO;
 import com.cool.store.dto.SmallVideoInfoDTO;
@@ -579,7 +580,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request) {
+    public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request, LoginUserInfo user) {
         if (CollectionUtils.isEmpty(request.getList())) {
             return;
         }
@@ -628,7 +629,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         checkVideoHandel(assessmentDataDOList);
         assessmentDataDAO.batchInsertOrUpdate(assessmentDataDOList);
 
-        employeeTrainingDO.setPracticalAssessmentUserId(userId);
+        employeeTrainingDO.setPracticalAssessmentUserId(user.getUserId());
         employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
         if (totalScore.get().intValue() > CommonConstants.NINETY) {
             employeeTrainingDO.setPracticalExamStatus(1);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java

@@ -13,6 +13,7 @@ import com.cool.store.request.TrainingExperienceDistributionRequest;
 import com.cool.store.service.TrainingExperienceService;
 import com.cool.store.utils.poi.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -152,6 +153,10 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
         //过滤
         userIdsByMappingIds.retainAll(userIdsByRoleIdList);
         //用户
+        if (CollectionUtils.isEmpty(userIdsByMappingIds)){
+            leaseBaseInfoDO.setStoreManager("");
+            return leaseBaseInfoDO;
+        }
         List<EnterpriseUserDO> userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds);
         String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString();
         leaseBaseInfoDO.setStoreManager(nameList);

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java

@@ -1,6 +1,7 @@
 package com.cool.store.controller.webb;
 
 import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.request.*;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.EmployeeTrainingService;
@@ -131,7 +132,7 @@ public class EmployeeTrainingController {
     @ApiOperation("培训-实训考核-提交考核结果")
     @PostMapping("/assessmentUserCommit")
     public ResponseResult<Boolean> assessmentUserCommit(@RequestBody EmployeeAssessmentCommitListRequest request) {
-        employeeTrainingService.assessmentUserCommit(request);
+        employeeTrainingService.assessmentUserCommit(request, CurrentUserHolder.getUser());
         return ResponseResult.success(Boolean.TRUE);
     }