报告归档导出调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -284,17 +284,23 @@
         su3.name as projectCreateName,
         date_format(cw_prnl.report_date,'%Y-%m-%d') as report_date,
         cw_pa.audit_date as auditDate,
-        cw_pa.approve_remarks as approveRemarks,
+        cw_pa.remarks as remarks,
         cw_pa.contract,
         cw_pa.approved_no_including_tax as approvedNoIncludingTax,
         cw_pa.approved_including_tax as approvedIncludingTax,
+        cw_pa.entrust_type as entrustType,
         sureview.name as secondAuditName,
 
         cw_pr.project_name as project_name,
         cw_prnl.report_no,
 
         su11.NAME AS signature_annotator1_name,
-        su22.NAME AS signature_annotator2_name
+        su22.NAME AS signature_annotator2_name,
+        su33.NAME AS realHeaderName,
+        su44.NAME AS projectMasterName,
+        cw_wcb.name AS auditedUnitsName
+
+
         from cw_project_report_archive cw_pa
         left join cw_project_records cw_pr on cw_pr.id = cw_pa.project_id and cw_pr.del_flag = '0'
         left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
@@ -310,6 +316,9 @@
         LEFT JOIN cw_project_report cw_prr ON cw_prr.id = cw_prnl.report_id AND cw_prr.del_flag = '0'
         LEFT JOIN sys_user su11 ON su11.id = cw_prr.signature_annotator1 AND su11.del_flag = '0'
         LEFT JOIN sys_user su22 ON su22.id = cw_prr.signature_annotator2 AND su22.del_flag = '0'
+        LEFT JOIN sys_user su33 ON su33.id = cw_pr.real_header AND su33.del_flag = '0'
+        LEFT JOIN sys_user su44 ON su44.id = cw_pr.project_master_id AND su44.del_flag = '0'
+        LEFT JOIN cw_work_client_base cw_wcb on cw_pa.audited_units = cw_wcb.id and cw_wcb.del_flag = '0'
 
         ${ew.customSqlSegment}
         and cw_prnl.report_number is not null and cw_prnl.report_date is not null and cw_pa.del_flag = '0'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/dto/CwProjectReportArchiveExportDTO.java

@@ -134,7 +134,6 @@ public class CwProjectReportArchiveExportDTO extends BaseDTO {
     /**
      * 审核备注
      */
-    @Excel(name = "备注",width = 25,orderNum = "17")
     private String approveRemarks;
 
     private String taskBorrowId;
@@ -185,6 +184,7 @@ public class CwProjectReportArchiveExportDTO extends BaseDTO {
     /**
      * 备注信息
      */
+    @Excel(name = "备注",width = 25,orderNum = "17")
     private String remarks;