代码提交

liusheng

3 天以前 8351280ca1da09465accbd1a91f57621b130976a

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java

@@ -131,6 +131,8 @@
        if (serviceFund.getJxrq() != null) {
            wrappers.eq(ServiceFund::getJxrq, serviceFund.getJxrq());
        }
        // 添加 group by donorname
        wrappers.groupBy(ServiceFund::getDonorname);
        return this.list(wrappers);
    }

@@ -744,7 +746,7 @@
                if (StringUtils.isNotEmpty(serviceFunddetailVO.getIdcardno())) {
                    serviceFunddetailVO.setIdcardno(serviceFunddetailVO.getIdcardno().trim());
                }

                log.info("身份证号为：{}", serviceFunddetailVO.getIdcardno());
                if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
                    throw new BaseException("请检查银行卡号是否为空,姓名：" + serviceFunddetailVO.getBeneficiaryname());
                }
@@ -1197,7 +1199,6 @@
        serviceFunddetail.setTaxTime(null);
        serviceFunddetail.setXh(null);
        boolean b = serviceFunddetailMapper.updateTaxTime(serviceFunddetail);

        return b;
    }
}