工作组添加备注

jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml

@@ -43,7 +43,7 @@
         </where>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'','',tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,'','','',tmember.year,''
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,tmember.director_name,tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,'','','',tmember.year,''
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         <where>
@@ -105,7 +105,7 @@
         </where>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'','',tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,''
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,tmember.director_name,tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,''
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         <where>

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml

@@ -185,7 +185,7 @@
                 tmsub.company_name AS chargeCompanyName,
                 tmsub.amount_receivable AS receivableAmount,
                 tmsub.paid_amount AS paidAmount,
-                '' AS principalName,
+                tmember.director_name AS principalName,
                 tmsub.liaison_man AS contactsName,
                 pica.create_time AS createTime
             FROM pay_income_contract_associated pica

jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml

@@ -98,7 +98,7 @@
             </where>
             <!-- 标协会员项目-->
             UNION ALL
-            select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,
+            select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,tmember.director_id,tmember.director_name,'',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,
         if(tmsub.paid_amount is null or tmsub.paid_amount = '','0.00',tmsub.paid_amount) as paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email
             from tb_member_project tmember
             inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
@@ -218,7 +218,7 @@
         </where>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'','',tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.liaison_man
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,tmember.director_name,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.liaison_man
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         <where>
@@ -346,7 +346,7 @@
         <!-- 标协会员项目-->
         UNION ALL
         select
-        tmsub.id,tmember.project_name,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email
+        tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,tmember.director_name,'',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         <where>

jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml

@@ -74,7 +74,7 @@
         </if>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'空','空',tmsub.company_id,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.invoice_amount,tmsub.liaison_man_id,'' as register_check_result,tmsub.liaison_man
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,tmember.director_name,tmsub.company_id,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.invoice_amount,tmsub.liaison_man_id,'' as register_check_result,tmsub.liaison_man
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         where
@@ -174,7 +174,7 @@
         </if>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'空','空',tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,tmember.director_name,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         where

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml

@@ -845,7 +845,7 @@
         SELECT
         tmps.id,
         tmp.project_name AS projectName,
-        "" as principalName,
+        tmp.director_name as principalName,
         tmps.company_name AS chargeCompanyTemporaryName,
         tmps.amount_receivable as allMoney,
         tmps.paid_amount as comeAllMoney,

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml

@@ -12,12 +12,15 @@
             pwgs.contacts_id_one AS contactsIdOne,
             pwgs.contacts_temporary_id_one AS contactsTemporaryIdOne,
             pwgs.contacts_temporary_name_one AS contactsTemporaryNameOne,
+            pwgs.remarks_one as remarksOne,
             pwgs.contacts_id_two AS contactsIdTwo,
             pwgs.contacts_temporary_id_two AS contactsTemporaryIdTwo,
             pwgs.contacts_temporary_name_two AS contactsTemporaryNameTwo,
+            pwgs.remarks_two as remarksTwo,
             pwgs.contacts_id_three AS contactsIdThree,
             pwgs.contacts_temporary_id_three AS contactsTemporaryIdThree,
             pwgs.contacts_temporary_name_three AS contactsTemporaryNameThree,
+            pwgs.remarks_three as remarksThree,
             pwgs.receivable_amount AS receivableAmount,
             pwgs.paid_amount AS paidAmount,
             pwgs.mail_contacts_id AS mailContactsId,