Jelajahi Sumber

修改出账去掉身份照片和合同没有的数据(钱计算还用原来的)

LiFei 5 tahun lalu
induk
melakukan
7d0a29972a

+ 2 - 3
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/controller/HlgPaymentDetailController.java

@@ -116,14 +116,13 @@ public class HlgPaymentDetailController {
         int fromIndex = (pageNo - 1) * pageSize;
         //计算结束索引
         int toIndex = (list.size() - fromIndex) > pageSize ? fromIndex + pageSize : list.size();
+        //新加两行代码去掉身份证照片和合同没有的数据
+        list=list.stream().filter(hlgPaymentDetailStatistics1 -> hlgPaymentDetailStatistics1.getWorkContract()!=null && hlgPaymentDetailStatistics1.getIdcardPicture()!=null).collect(Collectors.toList());
         pageList.setRecords(list.subList(fromIndex, toIndex));
         if (pageList.getRecords().size() > 0) {
             pageList.getRecords().get(0).setSumTaxFee(sumTaxFee);
             pageList.getRecords().get(0).setSumPayment(sumPayment);
         }
-        //新加两行代码去掉身份证照片和合同没有的数据
-        list=list.stream().filter(hlgPaymentDetailStatistics1 -> hlgPaymentDetailStatistics1.getWorkContract()!=null && hlgPaymentDetailStatistics1.getIdcardPicture()!=null).collect(Collectors.toList());
-        pageList.setRecords(list);
         pageList.setTotal(list.size());
         result.setSuccess(true);
         result.setResult(pageList);