提交代码

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

@@ -732,6 +732,16 @@ public class StatisticalReportController extends BaseRESTfulController {
                 }
                 stringObjectMap.put("capacityNo",capacityNumber);
             }
+            try{
+                BigDecimal orderId = (BigDecimal) stringObjectMap.get("orderId");
+                if (orderId !=null){
+                    String status = statisticalReportService.getStatus(orderId);
+                    Object orderStatus = stringObjectMap.get("orderStatus");
+                    stringObjectMap.put("orderStatus",orderStatus+status);
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
         }
         return success(report);
     }

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

@@ -93,4 +93,7 @@ public interface StatisticalReportMapper {
 
     List<Map<String, Object>> loadingSaleSteelReport(Map<String, Object> map);
 
+    //获得进出厂状态
+    String getStatus(BigDecimal orderId);
+
 }

src/main/java/com/steerinfo/dil/service/IStatisticalReportService.java

@@ -86,5 +86,8 @@ public interface IStatisticalReportService {
 
 
     List<Map<String, Object>> loadingSaleSteelReport(Map<String, Object> map);
+
+    //获得是否进出厂的状态
+    String getStatus(BigDecimal orderId);
 }
 

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

@@ -324,4 +324,9 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         List<Map<String, Object>> saleSteelReport = statisticalReportMapper.loadingSaleSteelReport(map);
         return saleSteelReport;
     }
+
+    @Override
+    public String getStatus(BigDecimal orderId) {
+        return statisticalReportMapper.getStatus(orderId);
+    }
 }

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

@@ -2694,4 +2694,25 @@
         )
     </select>
 
+    <select id="getStatus" resultType="java.lang.String">
+        select
+        CASE
+        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
+        WHEN TER.INSERT_TIME IS NULL
+        THEN ' '
+        END
+        "status"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_ID=#{orderId}
+    </select>
+
 </mapper>