线索111

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

@@ -52,11 +52,11 @@ public class HyIntendDevMappingDAO {
         return hyIntendDevelopementMappingMapper.selectByMappingIdList(idList);
     }
 
-    public List<ZoneCheckDTO> selectByOpenAreaMappingIdList(List<Long> idList,String type){
+    public List<ZoneCheckDTO> selectByOpenAreaMappingIdList(List<Long> idList,String type,Long currentId){
         if (CollectionUtils.isEmpty(idList)){
             return new ArrayList<>();
         }
-        return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList,type);
+        return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList,type,currentId);
     }
 
     public HyIntendDevelopementMappingDO selectByOpenAreaMappingId(Long id,String type){

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

@@ -56,7 +56,8 @@ public interface HyIntendDevelopementMappingMapper {
     List<ZoneCheckDTO> selectByMappingIdList(@Param("mappingIdList") List<Long> mappingIdList);
 
     List<ZoneCheckDTO> selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List<Long> openAreaMappingIdList,
-                                                     @Param("type") String type);
+                                                     @Param("type") String type,
+                                                     @Param("currentId") Long currentId);
 
 
     HyIntendDevelopementMappingDO selectByOpenAreaMappingId(@Param("openAreaMappingId") Long openAreaMappingId,

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

@@ -147,6 +147,9 @@
           #{mappingId}
         </foreach>
       </if>
+      <if test="currentId!=null">
+        and a.mapping_id != #{currentId}
+      </if>
     </where>
   </select>
 

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

@@ -186,7 +186,7 @@
     hy_open_area_info
     where area_status = 'keyOpen'
     and province_city_flag = 1
-    and parent_id is null
+    and parent_id is not null
   </select>
 
   <select id="queryByKeyword" resultMap="BaseResultMap">

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

@@ -298,16 +298,16 @@
       hpli.partner_id as partnerId,
       hpli.deadline as deadline,
       hpli.workflow_status as status,
-      a.id as id,
+      a.id as interviewId,
       a.auth_code as authCode,
       a.approve_time as approveTime,
       a.process_info as processInfo,
-      b.id as interviewId,
       b.start_time as startTime,
       b.end_time as endTime,
       b.interviewer as interviewer,
       b.create_time as createTime,
-      b.room_id as roomId
+      b.room_id as roomId,
+      b.id as id
     from hy_partner_line_info hpli
     left join hy_partner_interview a on hpli.id = a.partner_line_id
     left join hy_partner_interview_plan b on a.interview_plan_id = b.id

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

@@ -531,12 +531,14 @@
     SELECT MAX(h2.create_time)
     FROM hy_partner_line_info h2
     WHERE h1.partner_id = h2.partner_id
+    and h2.deleted= 1
     <if test="partnerIdList!=null and partnerIdList.size>0">
       <foreach collection="partnerIdList" item="partnerId" open="and h1.partner_id in (" close=")" separator=",">
         #{partnerId}
       </foreach>
     </if>
     )
+
   </select>
 
   <select id="getFollowCountList" resultType="com.cool.store.dto.partner.LineCountDTO">

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

@@ -82,7 +82,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         List<String> partnerIds = list.stream().map(PartnerIntentApplyInfoDTO::getPartnerId).collect(Collectors.toList());
         List<HyPartnerUserInfoDO> hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds);
         Map<String, HyPartnerUserInfoDO> infoDOMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, data -> data));
-        List<Long> wantShopAreaList = list.stream().map(PartnerIntentApplyInfoDTO::getWantShopArea).map(Long::parseLong).distinct().collect(Collectors.toList());
+        List<Long> wantShopAreaList = list.stream().filter(x->StringUtils.isNotEmpty(x.getWantShopArea())).map(PartnerIntentApplyInfoDTO::getWantShopArea).map(Long::parseLong).distinct().collect(Collectors.toList());
         Map<String, String> wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList);
         List<PartnerIntentApplyInfoVO> resultList = PartnerIntentApplyInfoVO.convertList(list, infoDOMap, wantShopAreaNameMap, workflowStatus);
         partnerIntentApplyInfo.setList(resultList);

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

@@ -118,7 +118,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
         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.setPartnerName(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());
@@ -260,6 +260,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
     private PartnerInterviewInfoVO convertPartnerInterviewInfoDTOToVo(PartnerInterviewInfoDTO partnerInterviewInfoDTO){
         PartnerInterviewInfoVO partnerInterviewInfoVO = new PartnerInterviewInfoVO();
         partnerInterviewInfoVO.setInterviewId(partnerInterviewInfoDTO.getInterviewId());
+        partnerInterviewInfoVO.setInterviewPlanId(partnerInterviewInfoDTO.getId());
         partnerInterviewInfoVO.setPartnerId(partnerInterviewInfoDTO.getPartnerId());
         partnerInterviewInfoVO.setInterviewerId(partnerInterviewInfoDTO.getInterviewer());
         partnerInterviewInfoVO.setProcessInfo(partnerInterviewInfoDTO.getProcessInfo());

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

@@ -204,7 +204,7 @@ public class ZoneServiceImpl implements ZoneService {
             throw  new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
         }
         //查询已经绑定战区的 意向区域
-        List<ZoneCheckDTO> list = hyIntendDevMappingDAO.selectByOpenAreaMappingIdList(intentAreaSettingRequest.getOpenAreaIdList(),intentAreaSettingRequest.getType());
+        List<ZoneCheckDTO> list = hyIntendDevMappingDAO.selectByOpenAreaMappingIdList(intentAreaSettingRequest.getOpenAreaIdList(),intentAreaSettingRequest.getType(),intentAreaSettingRequest.getId());
         List<Long> openAreaIdList = list.stream().map(ZoneCheckDTO::getOpenAreaMappingId).collect(Collectors.toList());
         List<HyOpenAreaInfoDO> hyOpenAreaInfoDOList = openAreaInfoDAO.selectByIds(openAreaIdList);
         Map<Long, String> areaNameMap = hyOpenAreaInfoDOList.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, HyOpenAreaInfoDO::getAreaName));