Merge remote-tracking branch 'origin/v1.0' into v1.0

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){
+//        if(param.getExportNum()==null || param.getExportNum()==0){
-            Assert.throwEx("请输入导出条数");
+//            Assert.throwEx("请输入导出条数");
-        }
+//        }
 
         if(CollectionUtil.isNotEmpty(param.getSelectIds())){
             channelWrapper.in(BmsChannel::getId, param.getSelectIds());
         }
 
-        if(param.getExportNum()==null || param.getExportNum()==0){
+        if(param.getExportNum() != null && param.getExportNum()!= 0){
-            Assert.throwEx("请输入导出条数");
-        }else{
             channelWrapper.last(" limit "+param.getExportNum());
         }
 

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){
+        if(param.getExportNum() != null && param.getExportNum()!= 0
-            Assert.throwEx("请输入导出条数");
+            && param.getStartNum() != null && param.getStartNum()!= 0){
-        }else{
+            lqw.last(" limit "+param.getStartNum() + "," + param.getExportNum());
-            lqw.last(" limit "+param.getExportNum());
         }
 
         List<BmsChannelPoint> list = bmsChannelPointService.list(lqw);

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;
 }
 

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;
 
     /** 人员工号 */