售后添加 新合同id

hx-sale/src/main/java/com/fjhx/sale/entity/after/dto/AfterSalesSelectDto.java

@@ -22,4 +22,10 @@ public class AfterSalesSelectDto extends BaseSelectDto {
      * 售后状态 0进行中1关闭
      */
     private Integer status;
+
+
+    /**
+     * 销售合同id
+     */
+    private Long contractId;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/after/vo/AfterSalesVo.java

@@ -1,7 +1,6 @@
 package com.fjhx.sale.entity.after.vo;
 
 import com.fjhx.sale.entity.after.po.AfterSales;
-import com.fjhx.sale.entity.after.po.AfterSalesRecords;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,4 +20,7 @@ public class AfterSalesVo extends AfterSales {
     List<AfterSalesDetailVo> afterSalesDetailList;
     private String contractCode;
 
+    private String newContractCode;
+    private Long newContractId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/after/impl/AfterSalesServiceImpl.java

@@ -64,6 +64,9 @@ public class AfterSalesServiceImpl extends ServiceImpl<AfterSalesMapper, AfterSa
         wrapper.eq("as1", AfterSales::getStatus, dto.getStatus());
         wrapper.eq("as1", AfterSales::getType, dto.getType());
 
+        wrapper.eq("as1", AfterSales::getContractId, dto.getContractId());
+
+
         wrapper.orderByDesc("as1", AfterSales::getId);
         Page<AfterSalesVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<AfterSalesVo> records = page.getRecords();

hx-sale/src/main/resources/mapper/after/AfterSalesMapper.xml

@@ -6,7 +6,7 @@
                as1.customer_id,
                as1.contract_id,
                as1.contract_ids,
-               as1.code,
+               as1.`code`,
                as1.type,
                as1.remark,
                as1.reason,
@@ -24,9 +24,12 @@
                as1.update_user,
                as1.update_time,
                as1.currency,
-               c.`code` as contractCode
+               c.`code`  AS contractCode,
+               c1.`code` AS newContractCode,
+               c1.id     AS newContractId
         FROM after_sales as1
-                 left join contract c on c.id = as1.contract_id
+                 LEFT JOIN contract c ON c.id = as1.contract_id
+                 LEFT JOIN contract c1 ON c1.after_sales_id = as1.id
     </sql>
     <select id="getPage" resultType="com.fjhx.sale.entity.after.vo.AfterSalesVo">
         <include refid="list"/>