开票状态

src/main/java/com/fdkankan/sale/vo/response/RepairerVo.java

@@ -42,6 +42,7 @@ public class RepairerVo extends Repair {
 
     private String sendTrackingNum;
     private Integer isSignFor;
+    private Integer invoiceOpenStatus;
 
     /**
      * 相关图片

src/main/resources/mapper/sale/RepairInvoiceMapper.xml

@@ -6,7 +6,7 @@
         select  ri.*,rp.order_sn ,rp.pay_time ,r.cancel_status,r.warranty_type from t_repair_invoice ri
             left join t_repair_pay rp on ri.repair_id = rp.repair_id
             left join t_repair r on ri.repair_id = r.repair_id
-        where  ri.rec_status = 'A' and rp.pay_status = 1
+        where  ri.rec_status = 'A' and rp.pay_status = 1 and r.invoice_status !=2
         <if test="param.orderSn !=null and param.orderSn !='' ">
             and rp.order_sn like concat('%',#{param.orderSn},'%')
         </if>

src/main/resources/mapper/sale/RepairMapper.xml

@@ -181,13 +181,14 @@
 
     <select id="pageInfoList" resultType="com.fdkankan.sale.vo.response.RepairerVo">
         select distinct  r.*,rr.check_result,o.create_time as orderReceivingTime,c.customer_name ,c.company_name,
-                        o.sys_user_id as saleId,rr.sys_user_id as repairManId, rr.over_time as repairOverTime
+                        o.sys_user_id as saleId,rr.sys_user_id as repairManId, rr.over_time as repairOverTime,ri.status as invoiceOpenStatus
         from t_repair r
         left join  t_order_receiving o on r.repair_id = o.repair_id
         left join  t_repair_register rr on r.repair_id = rr.repair_id
         left join  t_customer c on r.repair_id = c.repair_id
         left join t_repair_pay rp on r.repair_id = rp.repair_id
-        where r.rec_status = 'A' and r.invoice_status !=2
+        left join t_repair_invoice ri on r.repair_id = ri.repair_id
+        where r.rec_status = 'A'
         <if test="param.repairId != null and param.repairId != ''">
             and r.repair_id like  concat ('%',#{param.repairId},'%')
         </if>