From f0a7ffca8118691e4705136d9e9261bfd809cf67 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Wed, 6 Apr 2022 21:46:47 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2022-1-4变更.sql                                 |  5 ++++-
 .../controller/PaySpendingContractController.java   | 13 ++++++++-----
 .../impl/PaySpendingContractServiceImpl.java        |  2 +-
 .../contract/vo/PaySpendingContractExcelModel.java  | 10 ++++++++++
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql
index d8feea1f..e556515e 100644
--- a/db/2022-1-4变更.sql
+++ b/db/2022-1-4变更.sql
@@ -46,4 +46,7 @@ ALTER TABLE tb_certificate_payment
 update tb_certificate_payment set charge_use = 20 where 1 = 1;
 
 update pay_meeting set meeting_type = 5 ,case_committee_id = '1486586847797346305' ,case_committee_name = '全国汽车标准化技术委员会电动车辆分技术委员会' WHERE id = '1478574801809993729';
-update pay_working_group_subitem set make_invoice = 1 where id = '1484760196725768194';
\ No newline at end of file
+update pay_working_group_subitem set make_invoice = 1 where id = '1484760196725768194';
+
+alter TABLE pay_spending_contract ADD (phone VARCHAR(22) COMMENT '联系电话',address VARCHAR(255) COMMENT '邮寄地址',post_code VARCHAR(50) COMMENT '邮编');
+alter TABLE pay_mail_contract ADD (contract_type TINYINT(2) COMMENT '合同类型：1 支出合同，2 收入合同');
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
index ad449af0..f8af5e5c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
@@ -64,7 +64,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	private Environment env;
 	@Resource
 	private ISysBaseAPI sysBaseAPI;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -105,7 +105,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		IPage<PaySpendingContract> pageList = paySpendingContractService.queryPageList(page, paySpendingContract,startTime,endTime,chargeStatus);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -120,7 +120,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		PaySpendingContract paySpendingContract = paySpendingContractService.addPaySpendingContractInput(input);
 		return Result.OK("添加成功！",paySpendingContract);
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -228,7 +228,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		paySpendingContractService.deletePaySpendingContractInputById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -251,7 +251,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		paySpendingContractService.deleteSpendingContractInputByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -400,6 +400,9 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		filedsList.add(new ExcelExportEntity("签订联系人", "signedContactsTemporaryName"));
 		filedsList.add(new ExcelExportEntity("是否开口", "opening"));
 		filedsList.add(new ExcelExportEntity("负责人", "principalName"));
+		filedsList.add(new ExcelExportEntity("联系电话", "phone"));
+		filedsList.add(new ExcelExportEntity("邮寄地址", "address"));
+		filedsList.add(new ExcelExportEntity("邮编", "postCode"));
 		filedsList.add(new ExcelExportEntity("部门名称", "departmentName"));
 		filedsList.add(new ExcelExportEntity("签订合同总金额", "contractAmount"));
 		filedsList.add(new ExcelExportEntity("税率", "rate"));
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index a7504557..b0b92460 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -137,7 +137,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         PayMailContract payMailContract = new PayMailContract();
         payMailContract.setContractId(paySpendingContract.getId());
         payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
-        payMailContract.setMobile(paySpendingContract.getPhone());
+        payMailContract.setMobile(PasswordUtil.encrypt(paySpendingContract.getPhone()));
         payMailContract.setEmail("");
         payMailContract.setLiaisonMan(paySpendingContract.getSignedContactsTemporaryName());
         payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE1);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java
index 0ce863af..068bbfe5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java
@@ -38,6 +38,16 @@ public class PaySpendingContractExcelModel implements Serializable {
     /**未税金额*/
     @Excel(name = "未税金额", width = 15)
     private String noTaxAmount;
+
+    @Excel(name = "联系电话", width = 15)
+    private String phone;
+
+    @Excel(name = "邮寄地址", width = 15)
+    private String address;
+
+    @Excel(name = "邮编", width = 15)
+    private String postCode;
+
     /**合同签订日期*/
     @Excel(name = "合同签订日期", width = 15, format = "yyyy-MM-dd")
     private Date contractDate;