diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java index 35ab70da..c4ccf2ec 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java @@ -281,15 +281,14 @@ public class IndexService { private UncollectedPieChartVO setUncollectedPieChartVO(String name, Integer start, Integer end, String departCode){ BigDecimal bigDecimal = payWorkingGroupMapper.invoiceAmount(start, end, departCode); - BigDecimal bigDecimal1 = payWorkingGroupMapper.arrivalAmount(start, end, departCode); UncollectedPieChartVO uncollectedPieChartVO = new UncollectedPieChartVO(); uncollectedPieChartVO.setName(name); - if (bigDecimal.compareTo(bigDecimal1) > 0){ - BigDecimal subtract = bigDecimal.subtract(bigDecimal1); - uncollectedPieChartVO.setMoney(String.valueOf(subtract)); - }else { - uncollectedPieChartVO.setMoney("0"); - } + //if (bigDecimal.compareTo(bigDecimal1) > 0){ + // BigDecimal subtract = bigDecimal.subtract(bigDecimal1); + uncollectedPieChartVO.setMoney(String.valueOf(bigDecimal)); + //}else { + // uncollectedPieChartVO.setMoney("0"); + //} return uncollectedPieChartVO; } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index e192f61d..adee0d01 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -248,5 +248,4 @@ public interface PayWorkingGroupMapper extends BaseMapper { BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); - BigDecimal arrivalAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index f5fdcf47..9ba17bba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2701,12 +2701,13 @@ - -