修改内转查询实绩点

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -18,10 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ author    :TXF
@@ -283,8 +280,22 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
 
     @ApiOperation(value = "查看所有实绩点")
     @PostMapping("/getAllResultLineMes")
-    public RESTfulResult getAllResultLineMes(Integer orderId){
-        return success(omstruckOrderSeparateService.getAllOrderResult(new BigDecimal(orderId)));
+    public RESTfulResult getAllResultLineMes(Integer orderId, String orderNumber){
+        Map<String, Object> map = new HashMap<>();
+        if(orderId != null){
+            map.put("orderId", orderId);
+        }
+        if(orderNumber != null){
+            map.put("orderNumber", orderNumber);
+        }
+        List<Map<String, Object>> allOrderResult = null;
+        try {
+            allOrderResult = omstruckOrderSeparateService.getAllOrderResult(map);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            return failed("查询失败");
+        }
+        return success(allOrderResult);
     }
 
     @ApiOperation(value = "正常关闭运输订单")

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

@@ -46,6 +46,8 @@ public interface OmstruckOrderSeparateMapper {
     //通过订单ID查询总实绩ID
     Integer getTotalIdByOrderId(BigDecimal orderId);
 
+    Integer getTotalIdByOrderIdOrOrderNum(Map<String, Object> map);
+
     //通过总实绩ID和路段顺序号查询进厂实绩数据
     Map<String, Object> getEnFactoryMes(Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -275,12 +275,12 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
      * 查询运输进程，通过实绩ID
      * @Author TXF
      * @Date 2022/2/18 16:46
-     * @param orderId
+     * @param map
      * @return
      **/
-    public List<Map<String, Object>> getAllOrderResult(BigDecimal orderId){
+    public List<Map<String, Object>> getAllOrderResult(Map<String, Object> map){
         //通过订单Id查询总实绩Id
-        Integer resultTotalId = omstruckOrderSeparateMapper.getTotalIdByOrderId(orderId);
+        Integer resultTotalId = omstruckOrderSeparateMapper.getTotalIdByOrderIdOrOrderNum(map);
         //通过总实绩ID查询所有的实绩：包括进厂、出厂、计重、装卸货
         List<Map<String, Object>> allMesList = new ArrayList<>(20);
         allMesList.addAll(omstruckOrderSeparateMapper.getAllEnFactoryResultMesByTotalId(resultTotalId));
@@ -293,9 +293,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         allMesList.sort(new Comparator<Map<String, Object>>() {
             @Override
             public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-                BigDecimal segmenSqe1 = DataChange.dataToBigDecimal(o1.get("segmenSqe"));
-                BigDecimal segmenSqe2 = DataChange.dataToBigDecimal(o2.get("segmenSqe"));
-                return segmenSqe1.compareTo(segmenSqe2);
+                BigDecimal b1 = DataChange.dataToBigDecimal(o1.get("segmenSqe"));
+                BigDecimal b2 = DataChange.dataToBigDecimal(o2.get("segmenSqe"));
+                return b1.compareTo(b2);
             }
         });
         return allMesList;
@@ -603,8 +603,8 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
 
     @Override
     public int closeInwardOrder(Integer orderId) {
-      int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId);
-      return i;
+
+      return  omstruckOrderSeparateMapper.closeInwardOrder(orderId);
 
     }
 }

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -734,5 +734,19 @@
         where "pointDate" is not null
     </select>
 
+    <select id="getTotalIdByOrderIdOrOrderNum" parameterType="map" resultType="java.lang.Integer">
+        select TTR.RESULT_TOTAL_ID
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR on TTR.ORDER_ID = OO.ORDER_ID
+        <where>
+            <if test="orderId != null">
+                and OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                and OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+    </select>
+
 
 </mapper>