From aa3d2fa033891dd5e14910d87dbc3195b2f99eea Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Thu, 14 Oct 2021 10:56:45 +0800
Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A=E5=A4=87=E6=B3=A8=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/data/entity/FindByName.java  |  3 +++
 .../xml/PayCaseCommitteeSubitemMapper.xml      |  2 +-
 .../jero/mail/mapper/xml/PayMailBillMapper.xml | 18 ++++++++++++++++--
 .../mail/mapper/xml/PayMailContractMapper.xml  | 15 +++++++--------
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java
index 5d08bd2c..74700e70 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java
@@ -15,6 +15,9 @@ public class FindByName implements Serializable {
     @ApiModelProperty(value = "分标委名称")
     private java.lang.String name;
 
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remarks;
+
     @ApiModelProperty(value = "子目录分标委成员")
     private List<ChildrenFindByName> list;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index d8e3499f..dee81e91 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -13,7 +13,7 @@
         </collection>
     </resultMap>
     <select id="list3"  resultMap="people">
-        SELECT pe.id as id,pe.name as name,#{companyName} as companyName,#{name} as tname
+        SELECT pe.id as id,pe.name as name,pe.remarks,#{companyName} as companyName,#{name} as tname
         from
         pay_case_committee pe
         left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
index f8057354..6d855c49 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
@@ -54,8 +54,22 @@
     </select>
 
     <select id="pageList" resultType="com.jero.mail.entity.PayMailBill">
-       SELECT pmb.id,pmbp.project_id as projectId,project_name as projectName,bill_no AS billNo,pmb.invoice_amount as invoiceAmount,principal_name as principalName,charge_company_name as chargeCompanyName,
-contact_name as contactName,contact_mobile as contactMobile,post_status as postStatus,send_method as sendMethod ,create_time,post_no as postNo,send_date as sendDate,pmb.remark from  pay_mail_bill pmb left join pay_mail_bill_project pmbp
+       SELECT pmb.id,
+       pmbp.project_id as projectId,
+       project_name as projectName,
+       bill_no AS billNo,
+       pmb.invoice_amount as invoiceAmount,
+       principal_name as principalName,
+       charge_company_name as chargeCompanyName,
+        contact_name as contactName,
+        contact_mobile as contactMobile,
+        post_status as postStatus,
+        send_method as sendMethod ,
+        create_time,
+        post_no as postNo,
+        send_date as sendDate,
+        pmb.remark
+        from  pay_mail_bill pmb left join pay_mail_bill_project pmbp
 on(pmb.id=pmbp.bill_id)
  ${ew.customSqlSegment}
 group by pmb.id ORDER BY post_status ASC,create_time DESC
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
index 50da9f5d..dccf5d24 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
@@ -13,11 +13,10 @@ pc.remark,
 pc.send_date as sendDate,
 pic.contract_num as contractNum,
 pic.contract_name as contractName,
-pcm.company_name as signedCompanyTemporaryName,
+pic.signed_company_temporary_name as signedCompanyTemporaryName,
 pic.principal_name as principalName,
 pic.principal_id as principalId,
-pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_company_management pcm
-on(pic.signed_company_id=pcm.id)
+pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id)
 <where>
     <if test="payMailBillList.contractNum !='' and payMailBillList.contractNum !=null">
         pic.contract_num like concat('%',concat(#{payMailBillList.contractNum},'%')) escape '/'
@@ -26,7 +25,7 @@ on(pic.signed_company_id=pcm.id)
         pic.contract_name like concat('%',concat(#{payMailBillList.contractName},'%')) escape '/'
     </if>
     <if test="payMailBillList.signedCompanyTemporaryName !='' and payMailBillList.signedCompanyTemporaryName !=null">
-        pcm.company_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%')) escape '/'
+        pic.signed_company_temporary_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%')) escape '/'
     </if>
     <if test="payMailBillList.principalId !='' and payMailBillList.principalId !=null">
         pic.principal_id = #{payMailBillList.principalId}
@@ -47,12 +46,12 @@ pc.remark,
 pc.send_date as sendDate,
 pic.contract_num as contractNum,
 pic.contract_name as contractName,
-pcm.company_name as signedCompanyTemporaryName,
+pcmt.company_name as signedCompanyTemporaryName,
 pic.principal_name as principalName,
 pic.principal_id as principalId,
-pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_company_management pcm
-on(pic.signed_company_id=pcm.id)
-  where pc.id=#{id} and pcm.status=1
+pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_company_management_temporary pcmt
+on(pic.signed_company_temporary_id=pcmt.id)
+  where pc.id=#{id} and pcmt.status=1
     </select>
 
     <select id="pageContractExcel"  resultType="com.jero.mail.entity.PayMailBillList">