根据sharding修改代码

src/main/java/com/chinaitop/depot/intelligent/fumigation/mapper/TFumigationAfterMapper.java

@@ -34,4 +34,5 @@ public interface TFumigationAfterMapper {
 
     //获取作业列表
     List<Map<String,Object>> selectHomeWorkQueryList(Map<String, Object> map);
+    List<Map<String,Object>> selectAfterQueryList(Map<String, Object> map);
 }

src/main/java/com/chinaitop/depot/intelligent/fumigation/mapper/TFumigationAfterMapper.xml

@@ -615,7 +615,9 @@
       AND plan.house_id = #{houseId,jdbcType=INTEGER}
     </if>
     GROUP BY process.id
-    UNION ALL
+    ORDER BY createTime DESC
+  </select>
+  <select id="selectAfterQueryList" parameterType="java.util.Map" resultType="java.util.HashMap">
     SELECT
     2 AS planType,
     af.id,

src/main/java/com/chinaitop/depot/intelligent/fumigation/mapper/TFumigationPlanMapper.java

@@ -32,6 +32,7 @@ public interface TFumigationPlanMapper {
 
     //获取方案列表
     List<Map<String,Object>> selectPlanQueryList(Map<String, Object> map);
+    List<Map<String,Object>> selectPlanQuerySYList(Map<String, Object> map);
 
     //作业全部信息--省级平台用
     List<Map<String,Object>> getAllQueryList(Map<String, Object> map);

src/main/java/com/chinaitop/depot/intelligent/fumigation/mapper/TFumigationPlanMapper.xml

@@ -699,7 +699,10 @@
     <if test="houseId != null" >
       AND plan.house_id = #{houseId,jdbcType=INTEGER}
     </if>
-    UNION ALL
+  </select>
+
+
+  <select id="selectPlanQuerySYList" parameterType="java.util.Map" resultType="java.util.HashMap">
     SELECT
     2 AS planType,
     pesticide.id,

src/main/java/com/chinaitop/depot/intelligent/fumigation/service/impl/FumigationAfterServiceImpl.java

@@ -7,8 +7,11 @@ import com.chinaitop.depot.intelligent.fumigation.service.FumigationAfterService
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author lvzhikai
@@ -53,6 +56,8 @@ public class FumigationAfterServiceImpl implements FumigationAfterService {
      */
     @Override
     public List<Map<String,Object>> selectHomeWorkQueryList(Map<String, Object> map) {
-        return tFumigationAfterMapper.selectHomeWorkQueryList(map);
+        List<Map<String,Object>> processData = tFumigationAfterMapper.selectHomeWorkQueryList(map);
+        List<Map<String,Object>> afterData = tFumigationAfterMapper.selectAfterQueryList(map);
+        return Stream.of(processData,afterData).flatMap(Collection::stream).distinct().collect(Collectors.toList());
     }
 }

src/main/java/com/chinaitop/depot/intelligent/fumigation/service/impl/FumigationPlanServiceImpl.java

@@ -14,9 +14,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author lvzhikai
@@ -76,7 +79,9 @@ public class FumigationPlanServiceImpl implements FumigationPlanService {
      */
     @Override
     public List<Map<String,Object>> selectPlanQueryList(Map<String, Object> map) {
-        return tFumigationPlanMapper.selectPlanQueryList(map);
+        List<Map<String,Object>> planData = tFumigationPlanMapper.selectPlanQueryList(map);
+        List<Map<String,Object>> pesticideData = tFumigationPlanMapper.selectPlanQuerySYList(map);
+        return Stream.of(planData,pesticideData).flatMap(Collection::stream).distinct().collect(Collectors.toList());
     }
 
     /**