优化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordQuery.java

@@ -65,4 +65,18 @@ public class FinPaymentrecordQuery implements Query {
     @ApiModelProperty("当前组织机构全路径sid")
     private String orgPath;
 
+    //出纳付款列表中增加查询条件：收款单位名称、收款账号、金额、付款时需要备注内容、开户名称、付款账号
+    @ApiModelProperty(value = "收款单位名称")
+    private String receiveCompany;
+    @ApiModelProperty(value = "收款账号")
+    private String receiveBankAccount;
+    @ApiModelProperty(value = "金额")
+    private Integer cost;
+    @ApiModelProperty("付款时备注")
+    private String busRemarks;
+    @ApiModelProperty("开户名称")
+    private String payBank;
+    @ApiModelProperty("付款账号")
+    private String payBankAccount;
+
 }

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

@@ -179,6 +179,29 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                     qw.eq("fp.useOrgSid", resultBean.getData());
                 }
             }
+            //收款单位名称
+            if (StringUtils.isNotBlank(pageQuery.getReceiveCompany())) {
+                qw.like("fp.receiveCompany", pageQuery.getReceiveCompany());
+            }
+            //收款账号
+            if (StringUtils.isNotBlank(pageQuery.getReceiveBankAccount())) {
+                qw.like("fp.receiveBankAccount", pageQuery.getReceiveBankAccount());
+            }
+            if (pageQuery.getCost() != null) {
+                qw.eq("fp.cost", pageQuery.getCost());
+            }
+            //付款时备注
+            if (StringUtils.isNotBlank(pageQuery.getBusRemarks())) {
+                qw.like("fp.busRemarks", pageQuery.getBusRemarks());
+            }
+            //付款银行
+            if (StringUtils.isNotBlank(pageQuery.getPayBank())) {
+                qw.like("fp.payBank", pageQuery.getPayBank());
+            }
+            //付款账号
+            if (StringUtils.isNotBlank(pageQuery.getPayBankAccount())) {
+                qw.like("fp.payBankAccount", pageQuery.getPayBankAccount());
+            }
         }
         IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -234,6 +257,29 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             qw.apply(StringUtils.isNotBlank(pageQuery.getCreateStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getCreateStartDate() + "','%Y-%m-%d')").
                     apply(StringUtils.isNotBlank(pageQuery.getCreateEndDate()), "date_format (fp.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getCreateEndDate() + "','%Y-%m-%d')"
                     );
+            //收款单位名称
+            if (StringUtils.isNotBlank(pageQuery.getReceiveCompany())) {
+                qw.like("fp.receiveCompany", pageQuery.getReceiveCompany());
+            }
+            //收款账号
+            if (StringUtils.isNotBlank(pageQuery.getReceiveBankAccount())) {
+                qw.like("fp.receiveBankAccount", pageQuery.getReceiveBankAccount());
+            }
+            if (pageQuery.getCost() != null) {
+                qw.eq("fp.cost", pageQuery.getCost());
+            }
+            //付款时备注
+            if (StringUtils.isNotBlank(pageQuery.getBusRemarks())) {
+                qw.like("fp.busRemarks", pageQuery.getBusRemarks());
+            }
+            //付款银行
+            if (StringUtils.isNotBlank(pageQuery.getPayBank())) {
+                qw.like("fp.payBank", pageQuery.getPayBank());
+            }
+            //付款账号
+            if (StringUtils.isNotBlank(pageQuery.getPayBankAccount())) {
+                qw.like("fp.payBankAccount", pageQuery.getPayBankAccount());
+            }
         }
         IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -293,10 +339,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
             FinPaymentrecord finPaymentrecordOne = null;
-            if(dto.getCost()<finPaymentrecord.getAccountsReceive()){//实收金额小于应收金额
+            if (dto.getCost() < finPaymentrecord.getAccountsReceive()) {//实收金额小于应收金额
                 finPaymentrecordOne = new FinPaymentrecord();
-                BeanUtil.copyProperties(finPaymentrecord,finPaymentrecordOne,"sid");
-                finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive()-dto.getCost());
+                BeanUtil.copyProperties(finPaymentrecord, finPaymentrecordOne, "sid");
+                finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive() - dto.getCost());
                 finPaymentrecordOne.setCost(finPaymentrecordOne.getAccountsReceive());
             }
             BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
@@ -326,7 +372,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 baseManufUpdateDto.setState("1");
                 ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto);
             }
-            if(finPaymentrecordOne != null){
+            if (finPaymentrecordOne != null) {
                 baseMapper.insert(finPaymentrecordOne);
             }
             //给外采或排产申请人系统消息提醒