add:邮寄添加邮寄人

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java

@@ -166,7 +166,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	@Transactional
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayMailBill payMailBill)  {
+		LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 payMailBill.setPostStatus(1);
+		payMailBill.setMailer(sysUser.getUsername());
 		 payMailBillService.updateById(payMailBill);
 		//变更5种项目的邮寄状态
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
@@ -263,7 +265,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		}
 		PayMailBill payMailBillData = payMailBillService.getById(payMailBill.getId());
 		if(!Objects.isNull(payMailBillData)){
-			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			// 发送消息
 			SendMessageDTO sendMessageDTO = new SendMessageDTO();
 			if(!StringUtils.isBlank(payMailBillData.getEmail())){

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java

@@ -108,18 +108,19 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 	  * 邮寄合同-编辑（邮寄和修改按钮统一接口）
 	  */
 	 @RequiresPermissions("contractMail:mail")
-	 @AutoLog(value = "邮寄合同-邮寄合同-编辑（邮寄和修改按钮统一接口）")
-	 @ApiOperation(value = "邮寄合同-编辑（邮寄和修改按钮统一接口）", notes = "邮寄合同-编辑（邮寄和修改按钮统一接口)")
+	 @AutoLog(value = "邮寄合同-邮寄口")
+	 @ApiOperation(value = "邮寄合同-邮寄口", notes = "邮寄合同-邮寄口")
 	 @PostMapping(value = "/mile")
 	 public Result<?> mile(@RequestBody PayMailContract payMailContract
 	 ) {
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 				PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId());
 				payMailContract.setPostStatus(1);
+		 		payMailContract.setMailer(sysUser.getUsername());
 				payMailContractService.updateById(payMailContract);
 
 				if (!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)) {
 					PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
-					LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 					// 发送消息
 					SendMessageDTO sendMessageDTO = new SendMessageDTO();
 					if (!StringUtils.isBlank(payMailContractData.getEmail())) {

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java

@@ -134,8 +134,8 @@ public class PayMailBill implements Serializable {
     @ApiModelProperty(value = "项目id")
     private String projectId;
 
-
-
+    @ApiModelProperty(value = "邮寄人")
+    private String mailer;
 
     @NotNull(message = "项目负责人id不能为空")
     @ApiModelProperty(value = "项目负责人id")

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java

@@ -51,6 +51,8 @@ public class PayMailBillList {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "邮寄时间")
     private java.util.Date sendDate;
+    @ApiModelProperty(value = "邮寄人")
+    private java.lang.String mailer;
 
 
 

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java

@@ -84,4 +84,7 @@ public class PayMailContract implements Serializable {
     /**联系人邮箱*/
     @ApiModelProperty(value = "联系人邮箱")
 	private String email;
+    /**邮寄人*/
+    @ApiModelProperty(value = "邮寄人")
+    private String mailer;
 }

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

@@ -65,6 +65,7 @@
         post_status as postStatus,
         send_method as sendMethod ,
         create_time,
+        mailer,
         post_no as postNo,
         send_date as sendDate,
         pmb.remark

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

@@ -10,6 +10,7 @@ pc.post_no as postNo,
 pc.liaison_man as liaisonMan,
 pc.mobile,
 pc.remark,
+pc.mailer,
 pc.send_date as sendDate,
 pic.contract_num as contractNum,
 pic.contract_name as contractName,