微调 修BUG

src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java

@@ -95,6 +95,11 @@ public class BmsChannelMyController {
         List<String> ids = masterUsers.stream().map(BmsMasterUser::getTargetId).collect(Collectors.toList());
         ids.add("#");
         channelWrapper.in(BmsChannel::getId,ids);
+
+        if(param.getExportNum() != null && param.getExportNum()!= 0){
+            channelWrapper.last(" limit "+param.getExportNum());
+        }
+
         List<BmsChannel> list = bmsChannelService.list(channelWrapper);
 
         List<Long> channelIds = list.stream().map(a->a.getId()).collect(Collectors.toList());

src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java

@@ -110,6 +110,11 @@ public class BmsChannelPointMyController {
             qw.in(BmsChannelPoint::getChannelId,channelIds).or().in(BmsChannelPoint::getId,pointIds);
         });
 
+        if(param.getExportNum() != null && param.getExportNum()!= 0
+                && param.getStartNum() != null && param.getStartNum()!= 0){
+            lqw.last(" limit "+param.getStartNum() + "," + param.getExportNum());
+        }
+
         List<BmsChannelPoint> list = bmsChannelPointService.list(lqw);
         List<String> bizRegionIds = new ArrayList<>();
         bizRegionIds.addAll(list.stream().filter(a->a.getBizRegionId()!=null).map(a->a.getBizRegionId()).collect(Collectors.toList()));

src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java

@@ -50,13 +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 = "支付时间不能为空")
+//    @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 = "支付日期不能为空")
+//    @NotNull(message = "支付日期不能为空")
     private LocalDateTime payDate;
 
     /** 人员工号 */

src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml

@@ -55,7 +55,7 @@
             SELECT
             cost_apply_id,
             SUM(CASE WHEN verification_state = 1 THEN amount ELSE 0 END) AS checked_amt,
-            SUM(CASE WHEN verification_state IN (0, 3) THEN amount ELSE 0 END) AS checking_amt
+            SUM(CASE WHEN verification_state = 0 THEN amount ELSE 0 END) AS checking_amt
             FROM
             vtb_verification
             WHERE
@@ -151,7 +151,7 @@
         SELECT
         cost_apply_id,
         SUM(CASE WHEN verification_state = 1 THEN amount ELSE 0 END) AS checked_amt,
-        SUM(CASE WHEN verification_state IN (0, 3) THEN amount ELSE 0 END) AS checking_amt
+        SUM(CASE WHEN verification_state = 0 THEN amount ELSE 0 END) AS checking_amt
         FROM
         vtb_verification
         WHERE