diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/HomeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/HomeController.java index a37eb1da..9c29905c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/HomeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/HomeController.java @@ -59,7 +59,7 @@ public class HomeController { if(Objects.isNull(b1)){ b1 = new BigDecimal("0.00"); } - int count = projectDetailService.getMonthProjectCount(d1); + int count = payPaymentRecordService.getMonthProjectCount(d1); // 上月应收总额 // BigDecimal b2 = payPaymentRecordService.getMonthAmountCount(d2); // if(Objects.isNull(b2)){ @@ -67,7 +67,7 @@ public class HomeController { // } // dataStatisticsVO.setNowMonthAddAmount(count); - dataStatisticsVO.setNowMonthAmount((b1.divide(new BigDecimal("10000"))).setScale(2, BigDecimal.ROUND_DOWN)); + dataStatisticsVO.setNowMonthAmount((b1.divide(new BigDecimal("10000"),2,BigDecimal.ROUND_DOWN))); int m = payMailBillService.getMonthMailCount(d1); dataStatisticsVO.setNowMonthMail(m); return Result.OK(dataStatisticsVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java index 0cba2dab..a0f0a788 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java @@ -48,4 +48,14 @@ public interface PayPaymentRecordMapper extends BaseMapper { * @Exception */ BigDecimal getMonthAmountCount(String time); + + /** + * @Description 查询月份收款项目个数 + * @Author lqt + * @Date 2021/11/2 + * @Param + * @Return + * @Exception + */ + Integer getMonthProjectCount(String time); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index ac7d2a91..72ee57ce 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -207,4 +207,7 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index 9a5e11e1..bfd3dcee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -74,6 +74,15 @@ public interface IPayPaymentRecordService extends IService { * @Exception */ BigDecimal getMonthAmountCount(String time); + /** + * @Description 查询月份收款项目个数 + * @Author lqt + * @Date 2021/11/2 + * @Param + * @Return + * @Exception + */ + Integer getMonthProjectCount(String time); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index b70000f3..3206acbf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -792,6 +792,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl