发票收款调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/mapper/xml/FinanceInvoiceMapper.xml

@@ -257,7 +257,8 @@
         left join finance_invoice fi on a.invoice_id = fi.id
         LEFT JOIN program_project_list_info pr on a.program_id=pr.id
         WHERE
-        ( fi.receivables_date IS NULL OR fi.receivables_status = '0' )
+        ( fi.receivables_date IS NULL and fi.receivables_status = '0' )
+        and fi.status != 1 and fi.status != 2 and fi.status != 3 and fi.status != 4 and fi.status != 7
         AND DATE( fi.billing_date ) <= DATE(
         DATE_SUB( CURDATE(), INTERVAL 1 MONTH ))
         ORDER BY

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/service/FinanceInvoiceService.java

@@ -619,6 +619,7 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
 
     public String isReceivables(FinanceInvoiceDTO financeInvoiceDTO) {
         FinanceInvoice financeInvoice = FinanceInvoiceWrapper.INSTANCE.toEntity(financeInvoiceDTO);
+        financeInvoice.setReceivablesDate(new Date());
         financeInvoiceMapper.update(financeInvoice, new QueryWrapper<FinanceInvoice>().lambda().eq(FinanceInvoice::getId, financeInvoice.getId()));
         return "操作成功";
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -613,7 +613,8 @@
         left join cw_finance_invoice fi on a.invoice_id = fi.id
         LEFT JOIN cw_project_records pr on a.program_id=pr.id
         WHERE
-        ( fi.receivables_date IS NULL OR fi.receivables_status = '0' )
+        ( fi.receivables_date IS NULL and fi.receivables_status = '0' )
+        and fi.status != 1 and fi.status != 2 and fi.status != 3 and fi.status != 4 and fi.status != 7
         AND DATE( fi.billing_date ) <= DATE(
         DATE_SUB( CURDATE(), INTERVAL 1 MONTH ))
         ORDER BY

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -640,6 +640,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
 
     public String isReceivables(CwFinanceInvoiceDTO cwFinanceInvoiceDTO) {
         CwFinanceInvoice cwFinanceInvoice = CwFinanceInvoiceWrapper.INSTANCE.toEntity(cwFinanceInvoiceDTO);
+        cwFinanceInvoice.setReceivablesDate(new Date());
         cwFinanceInvoiceMapper.update(cwFinanceInvoice, new QueryWrapper<CwFinanceInvoice>().lambda().eq(CwFinanceInvoice::getId, cwFinanceInvoice.getId()));
         return "操作成功";
     }