Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java

@@ -108,12 +108,12 @@ public class LineInfoDAO {
         List<LineInfoDO> lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus);
         return lineInfo;
     }
-    public List<LineInfoDO> listByInterview(String interviewId, Integer interviewType,Integer pendingInterviewStatus,
+    public List<LineInfoDO> listByInterview(String interviewId, Integer interviewType,List<Integer> pendingInterviewStatusList,
                                             Integer notPassingTheInterview,List<Integer> subStageStatus) {
         if (StringUtils.isBlank(interviewId)){
             return null;
         }
-        List<LineInfoDO> lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatus,notPassingTheInterview,subStageStatus);
+        List<LineInfoDO> lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatusList,notPassingTheInterview,subStageStatus);
         return lineInfo;
     }
 

coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java

@@ -35,7 +35,7 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
      */
     List<LineInfoDO> listByInterview(@Param("interviewId") String  interviewId,
                                      @Param("interviewType") Integer interviewType,
-                                     @Param("pendingInterviewStatus") Integer pendingInterviewStatus,
+                                     @Param("pendingInterviewStatusList") List<Integer> pendingInterviewStatusList,
                                      @Param("notPassingTheInterview") Integer notPassingTheInterview,
                                      @Param("codes") List<Integer> codes);
 

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

@@ -335,8 +335,10 @@
         #{code}
       </foreach>
     </if>
-    <if test="pendingInterviewStatus != null ">
+    <if test="pendingInterviewStatusList !=null and pendingInterviewStatusList.size>0">
-      and ((workflow_sub_stage_status = #{pendingInterviewStatus}
+      <foreach collection="pendingInterviewStatusList" item="status" open="and (( workflow_sub_stage_status in (" close=")" separator=",">
+        #{status}
+      </foreach>
       <if test="interviewType != null and interviewType == 1">
         and first_interviewer = #{interviewId}
       </if>

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

@@ -114,7 +114,7 @@ public class DeskServiceImpl implements DeskService {
     public PageInfo<InterviewPendingVO> firstInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) {
         PageHelper.startPage(pageNum, pageSize);
         List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.INTERVIEW.getCode(),
-                WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null);
+                Arrays.asList(WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_35.getCode()),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null);
         PageInfo page = new PageInfo(lineInfoDOS);
         Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
         List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -147,7 +147,7 @@ public class DeskServiceImpl implements DeskService {
     public PageInfo<InterviewPendingVO> secondInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) {
         PageHelper.startPage(pageNum, pageSize);
         List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.SECOND_INTERVIEW.getCode(),
-                WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null);
+                Arrays.asList(WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(),WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_110.getCode()), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null);
         PageInfo page = new PageInfo(lineInfoDOS);
         Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
         List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());

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

@@ -119,9 +119,9 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
     @Override
     public LeaseBaseInfoDO getTrainingExperience(Long lineId) {
         List<String> roleNames = new ArrayList<>();
-        //todo 写死
         roleNames.add("加盟店店长");
         roleNames.add("加盟店储备店长");
+        roleNames.add("店长");
 
         LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId);
         if (Objects.isNull(leaseBaseInfoDO)) {

coolstore-partner-web/src/main/resources/application-hd.properties

@@ -70,7 +70,7 @@ recommended.channel.id=52400
 cool.app.id=78836
 coolstore.page.domain=https://store.coolstore.cn
 
-xfsg.url=https://inf.xianfengsg.com/InfService
+xfsg.url=https://inf-test.xianfengsg.com/InfService
 
 aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
 aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa