From 04e236b061bb0f9f6ff87adc08069be16918f99b Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 15 Sep 2021 17:19:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=A8=E6=8D=AE=E9=82=AE=E5=AF=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMailBillController.java | 21 +++++++++++++------ .../com/jero/mail/entity/PayMailBill.java | 4 ++-- 2 files changed, 17 insertions(+), 8 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 04ae0653..b1976493 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 @@ -1,6 +1,7 @@ package com.jero.mail.controller; import java.security.PrivateKey; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -142,17 +143,23 @@ public class PayMailBillController extends JeroController edit(@RequestParam(name="id") String id, @RequestParam(name="sendMethod") Integer sendMethod, @RequestParam(name="postNo") String postNo, - @RequestParam(name="sendDate") Date sendDate, + @RequestParam(name="sendDate") String sendDate, @RequestParam(name="remark") String remark - ) { + ) throws ParseException { PayMailBill payMailBill = new PayMailBill(); payMailBill.setId(id); payMailBill.setSendMethod(sendMethod); payMailBill.setPostNo(postNo); payMailBill.setRemark(remark); - payMailBill.setSendDate(sendDate); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date parse = simpleDateFormat.parse(sendDate); + payMailBill.setSendDate(parse); payMailBill.setPostStatus(1); payMailBillService.updateById(payMailBill); + //变更5种项目的邮寄状态 + + + return Result.OK("编辑成功!"); } @@ -166,15 +173,17 @@ public class PayMailBillController extends JeroController edit2(@RequestParam(name="id") String id, @RequestParam(name="sendMethod") Integer sendMethod, @RequestParam(name="postNo") String postNo, - @RequestParam(name="sendDate") Date sendDate, + @RequestParam(name="sendDate") String sendDate, @RequestParam(name="remark") String remark - ) { + ) throws ParseException { PayMailBill payMailBill = new PayMailBill(); payMailBill.setId(id); payMailBill.setSendMethod(sendMethod); payMailBill.setPostNo(postNo); payMailBill.setRemark(remark); - payMailBill.setSendDate(sendDate); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date parse = simpleDateFormat.parse(sendDate); + payMailBill.setSendDate(parse); payMailBill.setPostStatus(1); payMailBillService.updateById(payMailBill); return Result.OK("编辑成功!"); 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 552d8136..18904687 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 @@ -118,8 +118,8 @@ public class PayMailBill implements Serializable { @NotNull(message = "项目负责人不能为空") private java.lang.String principalName; - @NotNull(message = "项目负责人不能为空") - @ApiModelProperty(value = "项目负责人") + @NotNull(message = "项目负责人id不能为空") + @ApiModelProperty(value = "项目负责人id") private java.lang.String principalId; }