出纳付款列表查询

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -76,11 +76,11 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             }
             //款项类别
             if (StringUtils.isNotBlank(pageQuery.getCostTypeKey())) {
-                qw.eq("fp.costTypekey", pageQuery.getCostTypeKey());
+                qw.eq("fa.costTypekey", pageQuery.getCostTypeKey());
             }
             //款项名称
             if (StringUtils.isNotBlank(pageQuery.getCostTitleKey())) {
-                qw.eq("fp.costTitleKey", pageQuery.getCostTitleKey());
+                qw.eq("fa.costTitleKey", pageQuery.getCostTitleKey());
             }
             //申请日期
             qw.apply(StringUtils.isNotBlank(pageQuery.getCreateStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getCreateStartDate() + "','%Y-%m-%d')").
@@ -112,9 +112,11 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         //判断选择的sids的付款申请的收款单位是否一致
         List<String> applySids = baseMapper.selectApplySids(sids);
         List<String> applyCodes = finPaymentapplyService.selectCodeBySid(applySids);
-        applyCodes = applyCodes.stream().distinct().collect(Collectors.toList());
-        if (applyCodes.size() > 0) {
-            return rb.setMsg("批量处理的数据中存在收款账号不一致");
+        if(applyCodes.size()>1){
+            applyCodes = applyCodes.stream().distinct().collect(Collectors.toList());
+            if (applyCodes.size() > 0) {
+                return rb.setMsg("批量处理的数据中存在收款账号不一致");
+            }
         }
         List<String> list = new ArrayList<>();
         for (int i = 0; i < sids.size(); i++) {