功能调整

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

@@ -364,7 +364,7 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
         if(CollectionUtil.isNotEmpty(omsInvoiceFileList)){
             for (FinanceInvoiceDTO invoice : pageList.getRecords()) {
                 for (WorkAttachmentInfo workattachment : omsInvoiceFileList) {
-                    if(invoice.getId().equals(workattachment.getAttachmentId())){
+                    if(invoice.getId().equals(workattachment.getAttachmentId()) && workattachment.getUrl().contains("OMS_invoice")){
                         invoice.setOmsAttachmentUrl(workattachment.getUrl());
                         break;
                     }

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

@@ -368,6 +368,14 @@
         ) as programName,
 
         (
+            case
+                when a.type = '0' then ('')
+                when a.type = '1' then ('')
+                when a.type = '2' then (select report_name from cw_project_report where id = a.program_id)
+                when a.type = '4' then (select GROUP_CONCAT(DISTINCT cpr.report_name) from cw_project_report cpr where cpr.project_id = a.program_id and cpr.del_flag = '0')
+            else '' end
+        ) as reportName,
+        (
         case
                  when a.type = '0' then (fi.report_type)
                  when a.type = '1' then (select rpr.report_type from cw_project_records rpr where id = a.program_id)

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

@@ -445,7 +445,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             if(CollectionUtil.isNotEmpty(omsInvoiceFileList)){
                 for (CwFinanceInvoiceDTO invoice : list.getRecords()) {
                     for (WorkAttachmentInfo workattachment : omsInvoiceFileList) {
-                        if(invoice.getId().equals(workattachment.getAttachmentId())){
+                        if(invoice.getId().equals(workattachment.getAttachmentId()) && workattachment.getUrl().contains("OMS_invoice")){
                             invoice.setOmsAttachmentUrl(workattachment.getUrl());
                             break;
                         }

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

@@ -38,6 +38,9 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     @Excel(name = "报告号",width = 25)
     private String reportNos;
 
+    @Excel(name = "报告名称",width = 25)
+    private String reportName;
+
     /**
      * 开票类型
      */