yangdamao il y a 1 an
Parent
commit
be02b05c5a

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -169,4 +169,7 @@ public class TopOldOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("补款金额标识")
 	private Integer repairSign;
+
+	@ApiModelProperty("学员审核状态")
+	private Integer studentCheckStatus;
 }

+ 14 - 0
zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -148,6 +148,12 @@
         <if test="tenantId != null and tenantId != ''">
             AND vto.tenant_id = #{tenantId}
         </if>
+        <if test="studentCheckStatus != null">
+            AND (vto.order_from != 1
+                AND (SELECT COUNT(too.order_sn)
+                FROM top_old_order_goods too
+                WHERE vto.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0)
+        </if>
         <if test="orderSnList != null and orderSnList.size()!=0 ">
             AND vto.order_sn in
             <foreach collection="orderSnList" item="item" index="index" open="(" close=")" separator=",">
@@ -239,6 +245,11 @@
         <if test="finishStatus != null">
             AND ot.finish_status = #{finishStatus}
         </if>
+        <if test="studentCheckStatus != null">
+            AND (SELECT COUNT(too.order_sn)
+            FROM top_old_order_goods too
+            WHERE ot.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0
+        </if>
         <if test="tenantId != null and tenantId != ''">
             AND ot.tenant_id = #{tenantId}
         </if>
@@ -320,6 +331,9 @@
         <if test="repairSign != null and repairSign != '' and repairSign == 1">
             AND o.order_id = 0
         </if>
+        <if test="studentCheckStatus != null">
+            AND o.order_id = 0
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != ''">
             AND o.invoice_status = #{invoiceStatus}
         </if>