Browse Source

支付凭证图片

lyhzzz 2 years ago
parent
commit
78892e4c76

+ 9 - 0
src/main/java/com/fdkankan/sale/vo/response/RepairerVo.java

@@ -1,7 +1,10 @@
 package com.fdkankan.sale.vo.response;
 package com.fdkankan.sale.vo.response;
 
 
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.sale.entity.Repair;
 import com.fdkankan.sale.entity.Repair;
+import com.fdkankan.sale.typehandle.JsonArrayTypeHandler;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -38,5 +41,11 @@ public class RepairerVo extends Repair {
 
 
     private String sendTrackingNum;
     private String sendTrackingNum;
 
 
+    /**
+     * 相关图片
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray payImg;
+
 }
 }
 
 

+ 2 - 1
src/main/resources/mapper/sale/RepairMapper.xml

@@ -97,11 +97,12 @@
 
 
     <select id="checkAccountList" resultType="com.fdkankan.sale.vo.response.RepairerVo">
     <select id="checkAccountList" resultType="com.fdkankan.sale.vo.response.RepairerVo">
         select distinct r.*,rr.check_result,o.create_time as orderReceivingTime,c.customer_name,c.company_name,
         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
+        o.sys_user_id as saleId,rr.sys_user_id as repairManId,p.pay_img
         from t_repair r
         from t_repair r
         left join  t_order_receiving o on r.repair_id = o.repair_id
         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_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_customer c on r.repair_id = c.repair_id
+        left join t_repair_pay p on r.repair_id = p.repair_id
         where r.rec_status = 'A' and r.status in
         where r.rec_status = 'A' and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}
             #{status}