后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -2102,7 +2102,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 //        obj.put("startTime", startTime);
 //        obj.put("endTime", endTime);
 //        obj.put("dataSource", dataSource);
-        List<String> list = meterWorkCarActualMapper.distinctCarNo(params).stream().map(MeterWorkCarActual::getCarNo).collect(Collectors.toList());
+        List<String> list = meterWorkCarActualMapper.distinctCarNo(params).stream().map(MeterWorkCarActual::getCarNo).distinct().collect(Collectors.toList());
         return list;
     }
 

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2800,7 +2800,7 @@
 
   <!-- 查询：根据传入时间和车号，查询给定时间段去重车号 -->
   <select id="distinctCarNo" parameterType="java.lang.String" resultMap="BaseResultMap">
-    SELECT distinct car_No
+    SELECT distinct car_No, create_time
     from METER_WORK_CAR_ACTUAL_FIRST
     where 1=1
     <if test="carNo != null and carNo != ''">
@@ -2838,6 +2838,7 @@
     <if test="isPreScale != null and isPreScale != ''">
       and  is_pre_scale = #{isPreScale}
     </if>
+    order by create_time desc
   </select>
 
   <update id="repairPre" parameterType="java.util.HashMap">

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -3252,7 +3252,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 //        obj.put("forwardingUnitName", forwardingUnitName);
 //        obj.put("receivingUintName", receivingUintName);
 //        obj.put("valueFlag", valueFlag);
-        List<String> list = meterWorkCarActualFirstMapper.distinctCarNo(obj).stream().map(MeterWorkCarActualFirst::getCarNo).collect(Collectors.toList());
+        List<String> list = meterWorkCarActualFirstMapper.distinctCarNo(obj).stream().map(MeterWorkCarActualFirst::getCarNo).distinct().collect(Collectors.toList());
         return list;
     }
 

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/controller/MeterWorkOldAndNew.java

@@ -538,4 +538,29 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value="查询所有秤点结净老系统和新系统（包含汽车衡、轨道衡、吊钩秤、铁水衡、皮带秤）", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/doQueryAllOldAndNew")
+    public RESTfulResult doQueryAllOldAndNew(@RequestBody HashMap params) {
+        RESTfulResult rm = success();
+        try {
+            //PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+            // 新系统结净数据
+            List<HashMap> newList = meterWorkOldAndNewService.getAllNew(params);
+            // 老系统结净数据
+            List<HashMap> oldList = meterWorkOldAndNewService.getAllOld(params);
+            // 新老系统数据联合查询
+            List<HashMap> totalList = Stream.of(newList, oldList)
+                    .flatMap(x -> x.stream())
+                    .collect(Collectors.toList());
+            PageList pageInfo = this.helpPage(params, totalList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/mapper/MeterWorkOldAndNewMapper.java

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkoldandnew.mapper;
 
+import com.sun.javafx.collections.MappingChange;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.HashMap;
@@ -45,4 +46,8 @@ public interface MeterWorkOldAndNewMapper {
     List<HashMap> doQueryRailwayHookOld(Map<String, Object> params);
     List<HashMap> countRailwayHookNew(Map<String, Object> params);
     List<HashMap> countRailwayHookOld(Map<String, Object> params);
+
+    //所有秤点联合查询
+    List<String> getAllNew(Map<String, Object> params);
+    List<String> getAllOld(Map<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/service/IMeterWorkOldAndNewService.java

@@ -41,4 +41,8 @@ public interface IMeterWorkOldAndNewService {
     List<HashMap> getRailwayHookOld(HashMap params);
     List<HashMap> countRailwayHookNew(HashMap params);
     List<HashMap> countRailwayHookOld(HashMap params);
+
+    //所有秤点联合查询Service
+    List<HashMap> getAllNew(HashMap params);
+    List<HashMap> getAllOld(HashMap params);
 }

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/service/impl/MeterWorkOldAndNewService.java

@@ -148,4 +148,14 @@ public class MeterWorkOldAndNewService implements IMeterWorkOldAndNewService {
     public List<HashMap> countRailwayHookOld(HashMap params) {
         return meterWorkOldAndNewMapper.countRailwayHookOld(params);
     }
+
+    @Override
+    public List<HashMap> getAllNew(HashMap params) {
+        return meterWorkOldAndNewMapper.getAllNew(params);
+    }
+
+    @Override
+    public List<HashMap> getAllOld(HashMap params) {
+        return meterWorkOldAndNewMapper.getAllOld(params);
+    }
 }