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

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

@@ -1,13 +1,17 @@
 package com.cool.store.dao;
 
 import com.cool.store.entity.HyIntendDevZoneInfoDO;
+import com.cool.store.entity.HyOpenAreaInfoDO;
 import com.cool.store.mapper.HyIntendDevZoneInfoMapper;
+import com.cool.store.mapper.HyOpenAreaInfoMapper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author suzhuhong
@@ -37,13 +41,11 @@ public class HyIntendDevZoneInfoDAO {
     }
 
 
-    public PageInfo<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type){
+    public List<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type){
         if (StringUtils.isEmpty(type)){
-            return new PageInfo<>();
+            return new ArrayList<>();
         }
         return hyIntendDevZoneInfoMapper.getHyIntendDevZoneInfoList(type);
     }
 
-
-
 }

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

@@ -25,7 +25,7 @@ public class HyOpenAreaInfoDAO {
     @Resource
     HyOpenAreaInfoMapper hyOpenAreaInfoMapper;
 
-    public PageInfo<HyOpenAreaInfoDO> queryKeyOpenArea(){
+    public List<HyOpenAreaInfoDO> queryKeyOpenArea(){
         return hyOpenAreaInfoMapper.queryKeyOpenArea();
     }
 

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

@@ -152,4 +152,11 @@ public class HyPartnerLineInfoDAO {
         return hyPartnerLineInfoMapper.getFollowCountList(partnerIdList);
     }
 
+    public List<HyPartnerLineInfoDO> getHyPartnerLineInfoListByIds( List<Long> lineIds){
+        if (CollectionUtils.isEmpty(lineIds)){
+            return new ArrayList<>();
+        }
+        return hyPartnerLineInfoMapper.getHyPartnerLineInfoListByIds(lineIds);
+    }
+
 }

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

@@ -4,6 +4,8 @@ import com.cool.store.entity.HyIntendDevZoneInfoDO;
 import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author zhangchenbiao
  * @date 2023-05-29 03:50
@@ -36,5 +38,5 @@ public interface HyIntendDevZoneInfoMapper {
      * @param type
      * @return
      */
-    PageInfo<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type);
+    List<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type);
 }

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

@@ -32,7 +32,7 @@ public interface HyOpenAreaInfoMapper {
      * 查询重点城市
      * @return
      */
-    PageInfo<HyOpenAreaInfoDO> queryKeyOpenArea();
+    List<HyOpenAreaInfoDO> queryKeyOpenArea();
 
 
     /**

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

@@ -170,4 +170,12 @@ public interface HyPartnerLineInfoMapper {
      * @return
      */
     List<LineCountDTO> getFollowCountList(@Param("partnerIdList") List<String> partnerIdList);
+
+
+    /**
+     * 根据线索ID查询线索数据
+     * @param lineIds
+     * @return
+     */
+    List<HyPartnerLineInfoDO> getHyPartnerLineInfoListByIds(@Param("lineIds") List<Long> lineIds);
 }

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

@@ -120,10 +120,12 @@
     where id = #{record.id}
   </update>
 
+
   <select id="getHyIntendDevZoneInfoList" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List"></include>
+    *
     from hy_intend_dev_zone_info
     where type = #{type}
+    and deleted = 0
   </select>
 </mapper>

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

@@ -91,8 +91,8 @@
       <if test="type!=null and type!=''">
         and type = #{type}
       </if>
-      <if test="deleteByMappingIds!=null and deleteByMappingIds.size>0">
+      <if test="mappingIds!=null and mappingIds.size>0">
-        <foreach collection="deleteByMappingIds" open="and mapping_id in (" close=")" separator="," item="mappingId">
+        <foreach collection="mappingIds" open="and mapping_id in (" close=")" separator="," item="mappingId">
           #{mappingId}
         </foreach>
       </if>
@@ -124,7 +124,7 @@
     from hy_intend_developement_mapping a inner join hy_intend_dev_zone_info b on a.mapping_id = b.id
     <where>
       <if test="mappingIdList!=null and mappingIdList.size>0">
-        <foreach collection="mappingIdList" open="and a.open_area_mapping_id in (" close=")" separator="," item="mappingId">
+        <foreach collection="mappingIdList" open="and a.mapping_id in (" close=")" separator="," item="mappingId">
           #{mappingId}
         </foreach>
       </if>

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

@@ -450,4 +450,16 @@
   </select>
 
 
+  <select id="getHyPartnerLineInfoListByIds" resultMap="BaseResultMap">
+    SELECT <include refid="Base_Column_List"></include>
+    FROM hy_partner_line_info
+    <where>
+      <if test="lineIds!=null and lineIds.size>0">
+        <foreach collection="lineIds" item="lineId" open="and id in (" close=")" separator=",">
+          #{partnerId}
+        </foreach>
+      </if>
+    </where>
+  </select>
+
 </mapper>

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java

@@ -30,7 +30,7 @@ public class PartnerIntentApplyInfoVO {
     private String partnerId;
 
     @ApiModelProperty("hy_partner_line_info.id")
-    private Long partnerLineId;
+    private Long lineId;
 
     @ApiModelProperty("常驻区域")
     private String liveArea;
@@ -50,4 +50,7 @@ public class PartnerIntentApplyInfoVO {
     @ApiModelProperty("阶段提交时间")
     private Date partnerSubmitTime;
 
+    @ApiModelProperty("阶段状态")
+    private String WorkflowStatus;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java

@@ -27,6 +27,9 @@ public class PartnerInterviewInfoVO {
     @ApiModelProperty("会议结束时间")
     private String endTime;
 
+    @ApiModelProperty("截止时间")
+    private Date deadline;
+
     @ApiModelProperty("房间号")
     private String roomId;
 
@@ -36,6 +39,9 @@ public class PartnerInterviewInfoVO {
     @ApiModelProperty("加盟商用户名称")
     private String partnerName;
 
+    @ApiModelProperty("加盟商手机号码")
+    private String partnerPhone;
+
     @ApiModelProperty("面试官ID")
     private String interviewerId;
 
@@ -47,4 +53,16 @@ public class PartnerInterviewInfoVO {
 
     @ApiModelProperty("过程信息")
     private String processInfo;
+
+    @ApiModelProperty("线索状态")
+    private Integer lineStatus;
+
+    @ApiModelProperty("线索ID")
+    private  Long lineId;
+
+    @ApiModelProperty("合同号")
+    private String authCode;
+
+    @ApiModelProperty("审批发起时间")
+    private Date approveTime;
 }

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

@@ -27,7 +27,7 @@ public interface HyPartnerInterviewPlanService {
      * @param pageNumber
      * @return
      */
-    PageInfo<PartnerInterviewInfoVO> getPartnerInterviewInfoList(String userId,Integer pageSize,Integer pageNumber);
+    PageInfo<PartnerInterviewInfoVO> getPartnerInterviewInfoList(String userId,String type,Integer pageSize,Integer pageNumber);
 
 
     /**

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

@@ -70,11 +70,13 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         List<HyPartnerUserInfoDO> hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds);
         Map<String, HyPartnerUserInfoDO> infoDOMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, data -> data));
         List<PartnerIntentApplyInfoVO> result = new ArrayList<>();
+        String finalWorkflowStatus = workflowStatus;
         list.stream().forEach(x->{
             PartnerIntentApplyInfoVO pat = partnerIntentApplyInfoDTOToVo(x);
             HyPartnerUserInfoDO infoDOMapOrDefault = infoDOMap.getOrDefault(x.getPartnerId(), new HyPartnerUserInfoDO());
             pat.setPartnerUserName(infoDOMapOrDefault.getUsername());
             pat.setPartnerUserPhone(infoDOMapOrDefault.getMobile());
+            pat.setWorkflowStatus(finalWorkflowStatus);
             result.add(pat);
         });
         partnerIntentApplyInfo.setList(result);
@@ -170,7 +172,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         PartnerIntentApplyInfoVO partnerIntentApplyInfoVO = new PartnerIntentApplyInfoVO();
         partnerIntentApplyInfoVO.setId(partnerIntentApplyInfoDTO.getId());
         partnerIntentApplyInfoVO.setPartnerId(partnerIntentApplyInfoDTO.getPartnerId());
-        partnerIntentApplyInfoVO.setPartnerLineId(partnerIntentApplyInfoDTO.getPartnerLineId());
+        partnerIntentApplyInfoVO.setLineId(partnerIntentApplyInfoDTO.getPartnerLineId());
         partnerIntentApplyInfoVO.setPartnerSubmitTime(partnerIntentApplyInfoDTO.getPartnerSubmitTime());
         partnerIntentApplyInfoVO.setAcceptAdjustType(partnerIntentApplyInfoDTO.getAcceptAdjustType());
         partnerIntentApplyInfoVO.setLiveArea(partnerIntentApplyInfoDTO.getLiveArea());

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

@@ -3,9 +3,11 @@ package com.cool.store.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.HyPartnerInterviewPlanDAO;
+import com.cool.store.dao.HyPartnerLineInfoDAO;
 import com.cool.store.dao.HyPartnerUserInfoDAO;
 import com.cool.store.dto.partner.PartnerInterviewInfoDTO;
 import com.cool.store.entity.HyPartnerInterviewPlanDO;
+import com.cool.store.entity.HyPartnerLineInfoDO;
 import com.cool.store.entity.HyPartnerUserInfoDO;
 import com.cool.store.enums.WorkflowStageEnum;
 import com.cool.store.enums.WorkflowStatusEnum;
@@ -39,6 +41,8 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
     @Resource
     HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
 
+    @Resource
+    HyPartnerLineInfoDAO hyPartnerLineInfoDAO;
 
     @Override
     public List<InterviewDetailInfoVO> getInterviewPlanList(String userId) {
@@ -63,17 +67,34 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
     }
 
     @Override
-    public PageInfo<PartnerInterviewInfoVO> getPartnerInterviewInfoList(String userId ,Integer pageSize,Integer pageNumber) {
+    public PageInfo<PartnerInterviewInfoVO> getPartnerInterviewInfoList(String userId ,String type,Integer pageSize,Integer pageNumber) {
+        String workflowStatus = "";
+        if (CommonConstants.PENDING.equals(type)) {
+            workflowStatus = WorkflowStatusEnum.RESERVATION_1.getCode();
+        }
+        if (CommonConstants.FOLLOW.equals(type)) {
+            workflowStatus = WorkflowStatusEnum.RESERVATION_0.getCode();
+        }
         PageHelper.startPage(pageNumber,pageSize);
         //查询预约面试列表
-        PageInfo partnerInterviewInfoList = hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.RESERVATION.getCode(), WorkflowStatusEnum.RESERVATION_0.getCode());
+        PageInfo partnerInterviewInfoList = hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.RESERVATION.getCode(), workflowStatus);
         List<PartnerInterviewInfoDTO> list = partnerInterviewInfoList.getList();
         if (CollectionUtils.isEmpty(list)){
             return partnerInterviewInfoList;
         }
         List<PartnerInterviewInfoVO> result = new ArrayList<>();
+        List<String> partnerIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerId).collect(Collectors.toList());
+        List<HyPartnerUserInfoDO> hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds);
+        Map<String, HyPartnerUserInfoDO> userNameMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, Data->Data));
+        List<Long> lineIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerLineId).collect(Collectors.toList());
+        List<HyPartnerLineInfoDO> hyPartnerLineInfoDOS= hyPartnerLineInfoDAO.getHyPartnerLineInfoListByIds(lineIds);
+        Map<Long, HyPartnerLineInfoDO> hyPartnerLineInfoDOMap = hyPartnerLineInfoDOS.stream().collect(Collectors.toMap(HyPartnerLineInfoDO::getId, data -> data));
         list.stream().forEach(x->{
             PartnerInterviewInfoVO partnerInterviewInfoVO = convertPartnerInterviewInfoDTOToVo(x);
+            partnerInterviewInfoVO.setPartnerPhone(userNameMap.getOrDefault(x.getPartnerId(),new HyPartnerUserInfoDO()).getUsername());
+            partnerInterviewInfoVO.setPartnerPhone(userNameMap.getOrDefault(x.getPartnerId(),new HyPartnerUserInfoDO()).getMobile());
+            partnerInterviewInfoVO.setLineStatus(hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerLineId(),new HyPartnerLineInfoDO()).getLineStatus());
+            partnerInterviewInfoVO.setLineId(hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerLineId(),new HyPartnerLineInfoDO()).getId());
             result.add(partnerInterviewInfoVO);
         });
         partnerInterviewInfoList.setList(result);
@@ -97,9 +118,19 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
         if (CollectionUtils.isEmpty(list)){
             return partnerInterviewInfoList;
         }
+        List<String> partnerIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerId).collect(Collectors.toList());
+        List<HyPartnerUserInfoDO> hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds);
+        Map<String, HyPartnerUserInfoDO> userNameMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, Data->Data));
+        List<Long> lineIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerLineId).collect(Collectors.toList());
+        List<HyPartnerLineInfoDO> hyPartnerLineInfoDOS= hyPartnerLineInfoDAO.getHyPartnerLineInfoListByIds(lineIds);
+        Map<Long, HyPartnerLineInfoDO> hyPartnerLineInfoDOMap = hyPartnerLineInfoDOS.stream().collect(Collectors.toMap(HyPartnerLineInfoDO::getId, data -> data));
         List<PartnerInterviewInfoVO> result = new ArrayList<>();
         list.stream().forEach(x->{
             PartnerInterviewInfoVO partnerInterviewInfoVO = convertPartnerInterviewInfoDTOToVo(x);
+            partnerInterviewInfoVO.setPartnerPhone(userNameMap.getOrDefault(x.getPartnerId(),new HyPartnerUserInfoDO()).getUsername());
+            partnerInterviewInfoVO.setPartnerPhone(userNameMap.getOrDefault(x.getPartnerId(),new HyPartnerUserInfoDO()).getMobile());
+            partnerInterviewInfoVO.setLineStatus(hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerLineId(),new HyPartnerLineInfoDO()).getLineStatus());
+            partnerInterviewInfoVO.setLineId(hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerLineId(),new HyPartnerLineInfoDO()).getId());
             result.add(partnerInterviewInfoVO);
         });
         partnerInterviewInfoList.setList(result);
@@ -135,9 +166,12 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
         partnerInterviewInfoVO.setProcessInfo(partnerInterviewInfoDTO.getProcessInfo());
         partnerInterviewInfoVO.setCreateTime(DateUtil.format(partnerInterviewInfoDTO.getCreateTime(),CoolDateUtils.DATE_FORMAT_SEC));
         partnerInterviewInfoVO.setRoomId(partnerInterviewInfoDTO.getRoomId());
+        partnerInterviewInfoVO.setDeadline(partnerInterviewInfoDTO.getDeadline());
         partnerInterviewInfoVO.setStartTime(DateUtil.format(partnerInterviewInfoDTO.getStartTime(),CoolDateUtils.DATE_FORMAT_SEC));
         partnerInterviewInfoVO.setStatus(partnerInterviewInfoDTO.getStatus());
+        partnerInterviewInfoVO.setAuthCode(partnerInterviewInfoDTO.getAuthCode());
         partnerInterviewInfoVO.setEndTime(DateUtil.format(partnerInterviewInfoDTO.getEndTime(),CoolDateUtils.DATE_FORMAT_SEC));
+        partnerInterviewInfoVO.setApproveTime(partnerInterviewInfoDTO.getApproveTime());
         return partnerInterviewInfoVO;
     }
 

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

@@ -130,7 +130,8 @@ public class OpenAreaServiceImpl implements OpenAreaService {
     @Override
     public PageInfo<OpenAreaVO> queryKeyOpenAreaList(Integer pageSize, Integer pageNumber) {
         PageHelper.startPage(pageNumber,pageSize);
-        PageInfo hyOpenAreaInfoDOPageInfo = hyOpenAreaInfoDAO.queryKeyOpenArea();
+        List<HyOpenAreaInfoDO> hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryKeyOpenArea();
+        PageInfo hyOpenAreaInfoDOPageInfo = new PageInfo<>(hyOpenAreaInfoDOS);
         if (hyOpenAreaInfoDOPageInfo==null){
             return new PageInfo<>();
         }

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

@@ -85,10 +85,13 @@ public class ZoneServiceImpl implements ZoneService {
         HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = new HyIntendDevZoneInfoDO();
         hyIntendDevZoneInfoDO.setId(intentAreaSettingRequest.getId());
         hyIntendDevZoneInfoDO.setZoneName(intentAreaSettingRequest.getZoneName());
+        hyIntendDevZoneInfoDO.setUpdateUserId(userId);
         hyIntendDevZoneInfoDO.setAssociatedRegionId(CollectionUtils.isNotEmpty(intentAreaSettingRequest.getOrgIdList())?JSONObject.toJSONString(intentAreaSettingRequest.getOrgIdList()):"");
         hyIntendDevZoneInfoDAO.updateByPrimaryKeySelective(hyIntendDevZoneInfoDO);
         //添加战区映射的意向区域
         hyIntendDevMappingDAO.deleteByOpenAreaIds(intentAreaSettingRequest.getOpenAreaIdList(),intentAreaSettingRequest.getType());
+        hyIntendDevMappingDAO.deleteByMappingIds(Arrays.asList(intentAreaSettingRequest.getId())
+                ,intentAreaSettingRequest.getType());
         List<Long> openAreaIdList = intentAreaSettingRequest.getOpenAreaIdList();
         List<HyIntendDevelopementMappingDO> list = new ArrayList<>();
         openAreaIdList.stream().forEach(x->{
@@ -106,7 +109,7 @@ public class ZoneServiceImpl implements ZoneService {
     @Override
     public PageInfo<ZoneVO> getZoneList(String type, Integer pageSize, Integer pageNum) {
         PageHelper.startPage(pageNum,pageSize);
-        PageInfo hyIntendDevZoneInfoList = hyIntendDevZoneInfoDAO.getHyIntendDevZoneInfoList(type);
+        PageInfo hyIntendDevZoneInfoList = new PageInfo(hyIntendDevZoneInfoDAO.getHyIntendDevZoneInfoList(type));
         List<ZoneVO> result = new ArrayList<>();
         List<HyIntendDevZoneInfoDO> list = hyIntendDevZoneInfoList.getList();
         if (CollectionUtils.isEmpty(list)){
@@ -145,6 +148,8 @@ public class ZoneServiceImpl implements ZoneService {
             List<String> regionIds = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class);
             Map<String, String> regionMap = regionDAO.getRegionMap(regionIds);
             zoneVO = handleZoneVO(regionMap, hyIntendDevZoneInfoDO);
+        }
+        if (enterpriseUserDO!=null){
             zoneVO.setUpdateUserName(enterpriseUserDO.getName());
         }
         List<ZoneCheckDTO> zoneCheckDTOS = hyIntendDevMappingDAO.selectByMappingIdList(Arrays.asList(zoneId));
@@ -214,7 +219,7 @@ public class ZoneServiceImpl implements ZoneService {
 
     @Override
     public List<String> queryAllBingZoneRegionList(String type) {
-        PageInfo<HyIntendDevZoneInfoDO> intend = hyIntendDevZoneInfoDAO.getHyIntendDevZoneInfoList(type);
+        PageInfo<HyIntendDevZoneInfoDO> intend = new PageInfo<>(hyIntendDevZoneInfoDAO.getHyIntendDevZoneInfoList(type));
         List<HyIntendDevZoneInfoDO> list = intend.getList();
         List<String> resultList = list.stream().filter(x->StringUtil.isNotEmpty(x.getAssociatedRegionId()))
                 .flatMap(HyIntendDevZoneInfoDO -> JSONObject.parseArray(HyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class).stream())

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

@@ -110,11 +110,12 @@ public class DeskController {
 
     @PostMapping(path = "/querySubscribeInterviewTimeList")
     @ApiOperation("招商经理视角===预约面试时间 列表")
-    public ResponseResult<PageInfo<PartnerInterviewInfoVO>> querySubscribeInterviewTimeList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
+    public ResponseResult<PageInfo<PartnerInterviewInfoVO>> querySubscribeInterviewTimeList(@RequestParam(value = "type",required = false)String type,
+                                                                                            @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
                                                                                             @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
 
         String userId = CurrentUserHolder.getUserId();
-        return ResponseResult.success(hyPartnerInterviewPlanService.getPartnerInterviewInfoList(userId,pageSize,pageNumber));
+        return ResponseResult.success(hyPartnerInterviewPlanService.getPartnerInterviewInfoList(userId,type,pageSize,pageNumber));
     }
 
     @PostMapping(path = "/queryQualifiedInterviewList")

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

@@ -59,12 +59,12 @@ public class ZoneController {
     }
 
 
-    @GetMapping(path = "/deletedZoneList")
+    @GetMapping(path = "/deletedZone")
     @ApiOperation("删除战区")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", required = false),
     })
-    public ResponseResult<Boolean> deletedZoneList(@RequestParam(value = "id",required = false)Long id){
+    public ResponseResult<Boolean> deletedZone(@RequestParam(value = "id",required = false)Long id){
         return  ResponseResult.success(zoneService.deletedZone(id));
     }