中间合同合并合同-增加删除API

hx-sale/src/main/java/com/fjhx/sale/controller/intermediate/IntermediateContractController.java

@@ -47,6 +47,13 @@ public class IntermediateContractController {
     public IntermediateContractVo detail(@RequestBody BaseSelectDto dto) {
         return intermediateContractService.detail(dto.getId());
     }
+    /**
+     * 中间合同删除
+     */
+    @PostMapping("/del")
+    public void del(@RequestBody BaseSelectDto dto) {
+        intermediateContractService.del(dto.getId());
+    }
 
     /**
      * 中间合同编辑

hx-sale/src/main/java/com/fjhx/sale/service/intermediate/IntermediateContractService.java

@@ -32,6 +32,11 @@ public interface IntermediateContractService extends BaseService<IntermediateCon
     IntermediateContractVo detail(Long id);
 
     /**
+     * 中间合同删除
+     */
+    void del(Long id);
+
+    /**
      * 中间合同编辑
      */
     void edit(IntermediateContractDto intermediateContractDto);

hx-sale/src/main/java/com/fjhx/sale/service/intermediate/impl/IntermediateContractServiceImpl.java

@@ -106,6 +106,15 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
         return result;
     }
 
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void del(Long id) {
+        this.removeById(id);
+    }
+
     @Override
     public void edit(IntermediateContractDto intermediateContractDto) {
         intermediateContractDto.setId(null);

hx-sale/src/main/resources/mapper/intermediate/IntermediateContractMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.fjhx.sale.mapper.intermediate.IntermediateContractMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.intermediate.vo.IntermediateContractVo">
         SELECT
+            d.id,
             c.CODE,
             c.amount,
             c.currency,