提交代码

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

@@ -736,8 +736,9 @@ public class StatisticalReportController extends BaseRESTfulController {
                 BigDecimal orderId = (BigDecimal) stringObjectMap.get("orderId");
                 if (orderId !=null){
                     String status = statisticalReportService.getStatus(orderId);
-                    Object orderStatus = stringObjectMap.get("orderStatus");
-                    stringObjectMap.put("orderStatus",orderStatus+status);
+                    if (!(" ".equals(status))){
+                        stringObjectMap.put("orderStatus",status);
+                    }
                 }
             }catch (Exception e){
                 e.printStackTrace();

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

@@ -1958,7 +1958,17 @@
                                                  2,'销售已提交',
                                                  4,'财务已审批',
                                                  0,'销售订单未上报') "saleOrderStatus",
-                    DECODE(OO.ORDER_STATUS ,2,'作业已完成',4,'物流公司已派单',5,'司机已接单',0,'未派发',7,'已关闭',8,'已关闭')
+                    (CASE
+                    WHEN TRR.INSERT_TIME IS NOT NULL
+                    THEN '已完成'
+                    WHEN TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+                    THEN '已出厂'
+                    WHEN TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
+                    THEN '已进厂'
+                    WHEN TER.INSERT_TIME IS NULL
+                    THEN ' '
+                    WHEN TLFR.INSERT_TIME IS NULL THEN ' '
+                    END)
                                                                   "orderStatus"
                     FROM AMS_SALE_ORDER ASO
                     LEFT JOIN RMS_CONSIGNEE RC
@@ -2710,12 +2720,13 @@
     <select id="getStatus" resultType="java.lang.String">
         select
         CASE
+        WHEN TLFR.INSERT_TIME IS NOT NULL
+        THEN '已出厂'
         WHEN TER.INSERT_TIME IS NOT NULL
-        THEN ' '||'已进厂' ||' '||
-          CASE WHEN TLFR.INSERT_TIME IS NOT NULL THEN '已出厂'
-          WHEN TLFR.INSERT_TIME IS NULL THEN ' ' end
+        THEN '已进厂'
         WHEN TER.INSERT_TIME IS NULL
         THEN ' '
+        WHEN TLFR.INSERT_TIME IS NULL THEN ' ' end
         END
         "status"
         from OMSTRUCK_ORDER OO