From 74150f0d97b084c03c481fd6df79b4c98df0c773 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sat, 12 Feb 2022 10:48:21 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E9=82=AE=E5=AF=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/mail/controller/PayMailBillController.java   | 3 +++
 .../src/main/java/com/jero/mail/entity/PayMailBill.java   | 4 ++++
 .../java/com/jero/mail/mapper/xml/PayMailBillMapper.xml   | 8 +++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 3e3347dd..6e2ec84c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -716,6 +716,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 					if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
 						p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
 					}
+					if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPrincipalPhone())) {
+						p.setPrincipalPhone(PasswordUtil.decrypt(p.getPrincipalPhone()));
+					}
 				});
 			} catch (Exception e) {
 				log.error("手机号解密异常！", e);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
index 8c757498..ce0ce197 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
@@ -167,4 +167,8 @@ public class PayMailBill implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "项目类型")
     private Integer projectType;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目负责人手机号")
+    private java.lang.String principalPhone;
 }
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 64563c7e..e4d817e3 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
@@ -64,6 +64,8 @@
        project_name as projectName,
        bill_no AS billNo,
        pmb.invoice_amount as invoiceAmount,
+        principal_id ,
+        su.phone as principal_phone,
        principal_name as principalName,
        charge_company_name as chargeCompanyName,
         contact_name as contactName,
@@ -71,16 +73,16 @@
         post_status as postStatus,
         send_method as sendMethod ,
         pmbp.project_id as projectId,
-        create_time,
+        pmb.create_time,
         postal_code as postalCode,
         mailer,
         post_no as postNo,
         send_date as sendDate,
         contact_address as contactAddress,
         pmb.remark
-        from  pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id)
+        from  pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id) left join sys_user su on pmb.principal_id = su.id
  ${ew.customSqlSegment}
-  group by pmb.id ORDER BY post_status ASC,create_time DESC
+  group by pmb.id ORDER BY pmb.post_status ASC,pmb.create_time DESC
 
     </select>