From 4da2986db614578859a4bba23e926aed8eb5e372 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Fri, 15 Sep 2023 16:49:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java b/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java index ec2e9d3e..e20d8219 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java @@ -50,11 +50,13 @@ public class PayPaymentBo implements Serializable { /** 支付时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @NotNull(message = "支付时间不能为空") private LocalDateTime payTime; /** 支付日期 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @NotNull(message = "支付日期不能为空") private LocalDateTime payDate; /** 人员工号 */ From d72362075ebe27e9f512d8e910b5dbd1c4981af3 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Fri, 15 Sep 2023 17:02:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B8=A0=E9=81=93=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bms/controller/BmsChannelController.java | 10 ++++------ .../bms/controller/BmsChannelPointController.java | 7 +++---- .../qs/serve/modules/bms/entity/BmsChannelPoint.java | 3 +++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index 4db80f25..386dbc57 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java @@ -74,17 +74,15 @@ public class BmsChannelController { channelWrapper.le(BmsChannel::getCreateTime, param.getSelectEndTime()); channelWrapper.isNotNull(BmsChannel::getCreateBy); } - if(param.getExportNum()==null || param.getExportNum()==0){ - Assert.throwEx("请输入导出条数"); - } +// if(param.getExportNum()==null || param.getExportNum()==0){ +// Assert.throwEx("请输入导出条数"); +// } if(CollectionUtil.isNotEmpty(param.getSelectIds())){ channelWrapper.in(BmsChannel::getId, param.getSelectIds()); } - if(param.getExportNum()==null || param.getExportNum()==0){ - Assert.throwEx("请输入导出条数"); - }else{ + if(param.getExportNum() != null && param.getExportNum()!= 0){ channelWrapper.last(" limit "+param.getExportNum()); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java index c5de75df..2716d6c3 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java @@ -88,10 +88,9 @@ public class BmsChannelPointController { lqw.in(BmsChannelPoint::getId, param.getSelectIds()); } - if(param.getExportNum()==null || param.getExportNum()==0){ - Assert.throwEx("请输入导出条数"); - }else{ - lqw.last(" limit "+param.getExportNum()); + if(param.getExportNum() != null && param.getExportNum()!= 0 + && param.getStartNum() != null && param.getStartNum()!= 0){ + lqw.last(" limit "+param.getStartNum() + "," + param.getExportNum()); } List list = bmsChannelPointService.list(lqw); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java index c68c7ce1..8da5caf3 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java @@ -220,5 +220,8 @@ public class BmsChannelPoint implements Serializable { @TableField(exist = false) private Integer exportNum; + + @TableField(exist = false) + private Integer startNum; }