提交代码

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

@@ -20,6 +20,9 @@ public interface QmsQueueListMapper extends IBaseMapper<QmsQueueList, BigDecimal
     //查询当前链表最大序号
     Integer getMaxListNodeOrder(Map<String, Object> map);
 
+    //根据运力ID获取是否为VIP
+    Map<String,Object> getByIsVip(BigDecimal capacityId);
+
     //通过运输订单号 或实绩Id 关联 实绩总表 查询 排队实绩
     Map<String, Object> getQueueResultByOrderNumber(Map<String, Object> map);
 

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

@@ -53,6 +53,8 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     //查询排队开始、详情数据  正在排队的数据
     List<Map<String, Object>> getQueueListByQueueUp(Map<String, Object> map);
 
+
+
     //查询排队详情
 //    List<Map<String, Object>> getQueueMes(Map<String, Object> map);
 
@@ -152,6 +154,7 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
 
     List<Map<String, Object>> getQueueListByQueueUpSpellingNew(Map<String, Object> map);
 
+
     List<Map<String,Object>> getMaterialId(BigDecimal orderId);
 
     List<Map<String,Object>> getStoreQueueList();

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

@@ -435,6 +435,24 @@
     where QQL.GRID_ID = #{gridId}
   </select>
 
+  <!--根据运力Id去查询是否为VIP-->
+  <select id="getByIsVip" resultType="java.util.Map">
+    select CASE
+             WHEN RC.CAPACITY_GPS = '是'
+               then '是'
+             when NVL(RC.CAPACITY_GPS,'否') = '否'
+               then '否'
+             end "isGps",
+           CASE
+             WHEN RC.CAPACITY_VIP = '是'
+               then '是'
+             when NVL(RC.CAPACITY_VIP,'否') = '否'
+               then '否'
+             end "isVip"
+    from RMS_CAPACITY RC
+    WHERE RC.CAPACITY_ID=#{capacityId}
+  </select>
+
 <!--  通过运输订单号 或实绩Id 关联 实绩总表 查询 排队实绩 -->
   <select id="getQueueResultByOrderNumber" parameterType="java.util.Map" resultType="java.util.Map">
     select

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

@@ -869,10 +869,18 @@
         OO.ORDER_ID "orderId",
         RG.GATEPOST_NAME "gatepostName",
         ASM.STEEL_METER "steelMeter",
-        QQL.IS_VIP "resultInsertTime",
+        case
+        when RC.CAPACITY_VIP = '是'
+        then sysdate
+        else
+            QQL.IS_VIP
+        end
+            "resultInsertTime",
         (CASE WHEN
             QQL.IS_VIP is not null
             then 0
+            when RC.CAPACITY_VIP = '是'
+            then 0
             else
         (select COUNT(QQL.LIST_ID)
         from QMS_QUEUE_LIST QQL
@@ -927,6 +935,7 @@
 
     </select>
 
+
     <!--查询已派车车数-->
     <select id="querySentCarNumber" resultType="java.lang.Integer">
        select
@@ -999,10 +1008,18 @@
         OO.ORDER_ID "orderId",
         RG.GATEPOST_NAME "gatepostName",
         RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
-        QQSL.IS_VIP "resultInsertTime",
+        case
+        when RC.CAPACITY_VIP = '是'
+        then sysdate
+        else
+        QQSL.IS_VIP
+        end
+        "resultInsertTime",
         (CASE WHEN
             QQSL.IS_VIP is not null
             then 0
+            when RC.CAPACITY_VIP = '是'
+            then 0
             ELSE
         (select COUNT(QQSL.SPELLING_RESULT_ID)
         from QMS_QUEUE_SPELLING_LIST QQSL3
@@ -1069,6 +1086,7 @@
             </if>
     </select>
 
+
     <select id="getQueueListByQueueUpSpellingNew" parameterType="map" resultType="java.util.LinkedHashMap">
         select QQR.RESULT_ID "resultId",
         QQR.RESULT_TOTAL_ID "resultTotalId",
@@ -1088,10 +1106,18 @@
         OO.ORDER_ID "orderId",
         RG.GATEPOST_NAME "gatepostName",
         RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
-        QQSL.IS_VIP "resultInsertTime",
+        case
+        when RC.CAPACITY_VIP = '是'
+        then sysdate
+        else
+        QQSL.IS_VIP
+        end
+        "resultInsertTime",
         (CASE WHEN
             QQSL.IS_VIP IS NOT NULL
             THEN 0
+            when RC.CAPACITY_VIP = '是'
+            then 0
             ELSE
         (
         select COUNT(QQSL.SPELLING_RESULT_ID)
@@ -1160,6 +1186,7 @@
         </if>
     </select>
 
+
     <select id="getMaterialId" resultType="java.util.Map">
         select
         distinct