Procházet zdrojové kódy

修改bug:
私有协议应收-手续费应收/跟单费用应收-开票记录,加个删除开票的功能

jiakai před 4 měsíci
rodič
revize
2adb30d977

+ 7 - 0
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -250,6 +250,13 @@ public class ReceivableController {
     public HttpResult<Page<InvoiceRecordResult>> getInvoiceRecord(@RequestBody InvoiceRecordQueryVo invoiceRecordQueryVo){
         return HttpResult.ok(receivableService.getInvoiceRecordList(invoiceRecordQueryVo));
     }
+
+    @DeleteMapping("/deleteInvoiceById/{id}")
+    @Operation(summary = "删除开票记录")
+    public HttpResult<Boolean> deleteInvoiceById(@PathVariable String id){
+        return HttpResult.ok(receivableService.deleteInvoiceById(id));
+    }
+
 //    @PostMapping("batchModify")
 //    @Operation(summary = "批量修改")
 //    public HttpResult batchModify(@RequestBody List<SettlementVo> settlementVoList){

+ 2 - 0
tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -292,4 +292,6 @@ public interface ReceivableService extends IService<InsPlyIncome> {
      * @date 2026/5/12 14:22
      */
     HttpResult<List<InsPlyIncome>> queryIncomeDatas(IncomeDataVO incomeDataVO);
+
+    Boolean deleteInvoiceById(String id);
 }

+ 4 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -377,6 +377,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         return HttpResult.ok(filterIncomes);
     }
 
+    @Override
+    public Boolean deleteInvoiceById(String id) {
+        return insPlyIncomeInvoiceMapper.deleteById(id) > 0;
+    }
 
 
     /**

+ 1 - 1
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1042,7 +1042,7 @@
                 LEFT JOIN ins_ply_income_invoice_settlement ipiis ON ipii.id = ipiis.invoice_id
                 LEFT JOIN esm_ins_company eic on eic.id = ipii.company_id
         WHERE
-            1=1
+            1=1 AND ipii.is_delete = 0 AND ipiis.is_delete = 0 AND eic.is_delete = 0
         <if test="invoiceRecordQueryVo.invoiceType != null and invoiceRecordQueryVo.invoiceType != ''">
             AND ipii.invoice_type = #{invoiceRecordQueryVo.invoiceType}
         </if>