修改

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

@@ -106,6 +106,7 @@ public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultServi
             map.put("orderId",orderId);
             map.put("orderReceiveStatus",1);
             map.put("capacityNumber","capacityNumber");
+            map.put("isContinueSteelOrder",1);
             //根据旧的总实绩ID判断有没有
             Map<String,Object> responseMap = omsFeign.driverReceiveOrRefuse(map);
             System.out.println(responseMap);

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

@@ -2055,11 +2055,6 @@
                         THEN ASM.TRANSFER_IN_OF_WAREHOUSE
                         ELSE ASO.SALE_REMARK
                         END) "saleRemark",
-                    (CASE WHEN
-                        ASO.sale_remark is not null and  instr(ASO.sale_remark,'钢材工程组') > 0
-                        then 1
-                        else 0
-                        end) "isGcKeHu",
                     (CASE WHEN
                         TLFR.RESULT_OUT_GATE_TIME IS NULL
                         then null
@@ -2367,11 +2362,27 @@
                     <if test="oneDate != null">
                         and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
                     </if>
-
                     <if test="startDate != null">
                         and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
                         and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
                     </if>
+                    <if test="steelTransFlag != null">
+                        and NVL(RCA.CAPACITY_ID,0) != 35128
+                        AND ASO.DELETED = 0
+                        and (to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
+                        and to_date(#{startDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
+                        AND NVL(ASOM.WARRANTY_NUMBER,0) = 0
+                        or
+                        to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
+                        and to_date(#{startDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
+                        AND NVL(ASOM.WARRANTY_NUMBER,0) = 1
+                        AND ASOM.PREVIOUS_ORDER_NUMBER IS NOT NULL
+                        OR
+                        to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
+                        and to_date(#{startDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
+                        AND NVL(ASOM.WARRANTY_NUMBER,0) = 1
+                        AND ASOM.PREVIOUS_ORDER_NUMBER IS  NULL)
+                    </if>
                     order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID  DESC
                      )
     </select>