战区

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">
-        <foreach collection="deleteByMappingIds" open="and mapping_id in (" close=")" separator="," item="mappingId">
+      <if test="mappingIds!=null and mappingIds.size>0">
+        <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>