会计-开票选择项目，展示报告名称

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

@@ -299,9 +299,11 @@
     <select id="getBaseList" resultType="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceBaseDTO">
         select
         <include refid="FIB_Column_List"></include>
-        ,rpl.report_no
+        ,rpl.report_no,
+        rp.report_name
         from cw_finance_invoice_base fib
         left join cw_project_report_new_line rpl on fib.program_id=rpl.report_id
+        left join cw_project_report rp on rpl.report_id=rp.id
         where fib.del_flag = '0' and fib.invoice_id = #{id}
     </select>
     <select id="findList" resultMap="BaseExportResultMap">

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

@@ -55,6 +55,11 @@ public class CwFinanceInvoiceBaseDTO extends BaseDTO {
      * 报备类型
      */
     private String reportNo;
+
+    /**
+     * 报告名称
+     */
+    private String reportName;
     /**
      * 是否预开票
      */

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -45,6 +45,7 @@
         <result property="memberCount" column="member_count" jdbcType="VARCHAR"/>
         <result property="realHeaderName" column="real_header_name" jdbcType="VARCHAR"/>
         <result property="reportReview" column="report_review" jdbcType="VARCHAR"/>
+        <result property="reportName" column="report_name" jdbcType="VARCHAR"/>
         <collection property="cwProjectClientInfoDTOList" ofType="com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO" column="id" select="getProjectClient"></collection>
         <collection property="workAttachmentDtoList" ofType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO" column="id" select="getFileList"></collection>
         <collection property="cwProjectClientContactDTOList" ofType="com.jeeplus.finance.projectRecords.service.dto.CwProjectClientContactDTO" column="id" select="getContact"></collection>
@@ -364,7 +365,8 @@
         cw_wci.payment_method,
         cw_wcb.name as client_contacts_name,
         cw_pbt.name as business_type_name,
-        b.member_count
+        b.member_count,
+        cpr.report_name
         from cw_project_records a
         left join sys_user su on su.id = a.create_by_id and su.del_flag = '0'
         left join sys_user su2 on su2.id = a.project_master_id and su2.del_flag = '0'
@@ -378,6 +380,7 @@
         group by rec.id
         ) b on b.id = a.id
         left join cw_project_members cpm on a.id = cpm.project_id
+        left join cw_project_report cpr on a.id = cpr.project_id
         left join sys_user sub on cpm.user_id = sub.id
         left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
         ${ew.customSqlSegment}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -260,6 +260,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
      * 查找该报告及报告对应项目下的开票列表
      */
     private String reportNo;
+    private String reportName;
     private String no;
     private String number;
     private String account;