发票导出

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

@@ -379,7 +379,7 @@
         (case when a.type = '1' then (select pr.is_pre_invoice from cw_project_records pr where pr.id = a.program_id)
         else '' end ) as isPreInvoice,
         (case when a.type = '1' then
-        (select is_complete_invoice from cw_project_report pr where pr.project_id = a.program_id)
+        (select SUBSTR(GROUP_CONCAT( pr.is_complete_invoice),1,1 ) from cw_project_report pr where pr.project_id = a.program_id)
         else '' end) as isCompleteInvoice
         from cw_finance_invoice_base a
         left join cw_finance_invoice fi on a.invoice_id = fi.id

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

@@ -369,7 +369,7 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     /*8
     预开票已关联
      */
-    @Excel(name = "预开票已关联",width = 14, replace = {"是_2", "否_0"," _null"})
+    @Excel(name = "预开票已关联",width = 14, replace = {"是_2","是_1", "否_0"," _null"})
     private String isCompleteInvoice;