diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java index b54616b5..fe787531 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java @@ -98,8 +98,8 @@ public class IndexController { @ApiOperation(value = "未收账款统计") @GetMapping(value = "/uncollected") - public Result> uncollected() { - List UncollectedPieChartVOS = indexService.uncollected(); + public Result> uncollected(@RequestParam(name="departCode",required = false)String departCode) { + List UncollectedPieChartVOS = indexService.uncollected(departCode); return Result.OK(UncollectedPieChartVOS); } 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 eb20542a..35ab70da 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 @@ -12,7 +12,6 @@ import com.jero.index.vo.*; import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.*; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -267,22 +266,22 @@ public class IndexService { return histogramVOList; } - public List uncollected() { + public List uncollected(String departCode) { List uncollectedPieChartVOList = new ArrayList<>(); - UncollectedPieChartVO uncollectedPieChartVO1 = setUncollectedPieChartVO("3月内", null, 90); + UncollectedPieChartVO uncollectedPieChartVO1 = setUncollectedPieChartVO("3月内", null, 90, departCode); uncollectedPieChartVOList.add(uncollectedPieChartVO1); - UncollectedPieChartVO uncollectedPieChartVO2 = setUncollectedPieChartVO("3-6月内", 91, 180); + UncollectedPieChartVO uncollectedPieChartVO2 = setUncollectedPieChartVO("3-6月内", 91, 180, departCode); uncollectedPieChartVOList.add(uncollectedPieChartVO2); - UncollectedPieChartVO uncollectedPieChartVO3 = setUncollectedPieChartVO("6-12月内", 181, 360); + UncollectedPieChartVO uncollectedPieChartVO3 = setUncollectedPieChartVO("6-12月内", 181, 360, departCode); uncollectedPieChartVOList.add(uncollectedPieChartVO3); - UncollectedPieChartVO uncollectedPieChartVO4 = setUncollectedPieChartVO("一年以上", 361, null); + UncollectedPieChartVO uncollectedPieChartVO4 = setUncollectedPieChartVO("一年以上", 361, null, departCode); uncollectedPieChartVOList.add(uncollectedPieChartVO4); return uncollectedPieChartVOList; } - private UncollectedPieChartVO setUncollectedPieChartVO(String name, Integer start, Integer end){ - BigDecimal bigDecimal = payWorkingGroupMapper.invoiceAmount(start, end); - BigDecimal bigDecimal1 = payWorkingGroupMapper.arrivalAmount(start, end); + 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){ 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 18500791..e192f61d 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 @@ -246,7 +246,7 @@ public interface PayWorkingGroupMapper extends BaseMapper { List cumulativeListComeAllMoney(); - BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end); + BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); - BigDecimal arrivalAmount(@Param("start") Integer start, @Param("end") Integer end); + 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 47a76bed..f5fdcf47 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,8 +2701,12 @@