修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -93,9 +94,25 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
                 * publishTaskInfo.getPageSize());
+        //自定义装货区
+        String loading = publishTaskInfo.getLoadingPlace();
+        boolean loadingt = loading.contains(",");
+        if(loadingt){
+            List<String> loadingList = Arrays.asList(loading.split(","));
+            pageView.put("loadingList", loadingList);
+        }else {
+            pageView.put("loadingPlace", publishTaskInfo.getLoadingPlace());
+        }
+        //自定义卸货区
+        String unloading = publishTaskInfo.getUnLoadingPlace();
+        boolean unloadingt = unloading.contains(",");
+        if(unloadingt){
+            List<String> unloadingList = Arrays.asList(unloading.split(","));
+            pageView.put("unloadingList", unloadingList);
+        }else {
+            pageView.put("unLoadingPlace", publishTaskInfo.getUnLoadingPlace());
+        }
         //用户id
-        pageView.put("loadingPlace", publishTaskInfo.getLoadingPlace());
-        pageView.put("unLoadingPlace", publishTaskInfo.getUnLoadingPlace());
         pageView.put("loadingPlaceCity", publishTaskInfo.getLoadingPlaceCity());
         pageView.put("unLoadingPlaceCity", publishTaskInfo.getUnLoadingPlaceCity());
         pageView.put("searchKeyWord", publishTaskInfo.getSearchKeyWord());
@@ -227,7 +244,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         //将货源对象放入货源列表
         goodsSourceViews.add(goodsSourceView);
         page.setRecords(goodsSourceViews == null ? Lists.newArrayList() : goodsSourceViews);
-        page.setTotal(dataCount == null ? publishTaskInfoList.size() : dataCount + publishTaskInfoList.size());
+        page.setTotal(dataCount == null ? 0 : dataCount);
         page.setCurrent(publishTaskInfo.getCurrentPage());
         page.setSize(publishTaskInfo.getPageSize());
         return page;

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/PublishTaskInfoMapper.xml

@@ -101,6 +101,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
     </select>
 
     <!-- 获得货源推荐列表 -->
@@ -160,6 +174,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         UNION ALL
         SELECT
         p.id,
@@ -211,6 +239,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         ) t
         ORDER BY
         t.createDate DESC,
@@ -273,6 +315,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         ORDER BY p.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
@@ -338,6 +394,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         UNION ALL
         SELECT
         p.id,
@@ -391,13 +461,27 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         ) t
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
 
-    <!-- 获得货源列表 -->
+    <!-- 获得周边信息列表 -->
     <select id="getAllListsByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo">
         SELECT