From e224733e9caf01d570a7d5c67d10349b18c08f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com> Date: Fri, 29 Jul 2022 11:40:01 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E6=89=80=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/PayWorkingGroupMapper.java | 2 +- .../mapper/xml/PayWorkingGroupMapper.xml | 2 +- .../service/IPayWorkingGroupService.java | 2 +- .../impl/PayWorkingGroupServiceImpl.java | 18 ++++++++++++++-- .../AllProjectMoneyStatisticsController.java | 21 +++++++++---------- .../entity/AllProjectStatistics.java | 11 ++++++++++ 6 files changed, 40 insertions(+), 16 deletions(-) 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 f77aac60..aa023a1a 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 @@ -218,5 +218,5 @@ public interface PayWorkingGroupMapper extends BaseMapper { AllMoney queryPageListDepartment33(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); - IPage queryPageListAllProjectMoney(Page page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); + List queryListAllProjectMoney(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); } 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 cca9c9c4..e2c6eb10 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 @@ -2217,7 +2217,7 @@ - select sum(paidNoTaxAmount) as comeAllMoney, sum(invoiceNoTaxAmount) as billMoney, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 601ae7d7..28ac3da6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -239,5 +239,5 @@ public interface IPayWorkingGroupService extends IService { AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List idList); - IPage queryPageListAllProjectMoney(Page page, AllProjectStatisticsSearch allProjectStatisticsSearch, List idList ); + List queryListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList ); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 4a08c688..c2a88439 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -632,7 +632,21 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListAllProjectMoney(Page page, AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { - return payWorkingGroupMapper.queryPageListAllProjectMoney(page,allProjectStatisticsSearch,idList); + public List queryListAllProjectMoney(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { + List list = payWorkingGroupMapper.queryListAllProjectMoney(allProjectStatisticsSearch,idList); + List collect=list.stream() + .map(allProjectStatistics -> Integer.valueOf(allProjectStatistics.getPaymentDate().split("-")[1])) + .collect(Collectors.toList()); + + String paymentYear=allProjectStatisticsSearch.getPaymentYear(); + for (int i=1; i <=12 ; i++) { + if(!collect.contains(i)){ + StringBuilder stringBuilder = new StringBuilder().append(paymentYear); + AllProjectStatistics allProjectStatistics=new AllProjectStatistics("0.00","0.00","0.00",stringBuilder.append("-"+i).toString()); + list.add(allProjectStatistics); + } + } + list.sort(Comparator.comparing(allProjectStatistics -> Integer.valueOf(allProjectStatistics.getPaymentDate().split("-")[1]))); + return list; } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java index 4ee33f80..e046312e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java @@ -12,6 +12,7 @@ import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.AllMoney; import com.jero.statistics.entity.AllProjectStatistics; import com.jero.statistics.entity.AllProjectStatisticsSearch; +import com.mchange.lang.IntegerUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,7 +26,10 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.text.DecimalFormat; -import java.util.HashMap; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.IntStream; /** * @Description: TODO @@ -52,26 +56,21 @@ public class AllProjectMoneyStatisticsController { * 分页列表查询 * * @param allProjectStatisticsSearch 全所收入统计搜索 - * @param pageNo 页数 - * @param pageSize 条数 */ @ApiOperation(value = "全所收入统计搜索-分页列表查询", notes = "全所收入统计搜索-详情分页列表查询") @GetMapping(value = "/list") - public Result list(AllProjectStatisticsSearch allProjectStatisticsSearch, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + public Result list(AllProjectStatisticsSearch allProjectStatisticsSearch) { + + List list = payWorkingGroupService.queryListAllProjectMoney(allProjectStatisticsSearch, null); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupService.queryPageListAllProjectMoney(page, allProjectStatisticsSearch, null); HashMap hashMap = new HashMap<>(); - AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch, null); - hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney()); hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount()); - hashMap.put("pageList", pageList); + hashMap.put("list", list); + return Result.OK(hashMap); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java index d5c029f8..703e3bf8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java @@ -2,7 +2,9 @@ package com.jero.statistics.entity; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; @@ -12,6 +14,8 @@ import java.util.Date; * @date 2021/9/17 18:04 */ @Data +@AllArgsConstructor +@NoArgsConstructor public class AllProjectStatistics { @ApiModelProperty(value = "项目id") private String projectId; @@ -67,4 +71,11 @@ public class AllProjectStatistics { @Excel(name = "到账时间", width = 15) @ApiModelProperty(value = "到账时间") private String paymentDate; + + public AllProjectStatistics(String confirmAmount, String billMoney, String comeAllMoney, String paymentDate) { + this.confirmAmount=confirmAmount; + this.billMoney=billMoney; + this.comeAllMoney=comeAllMoney; + this.paymentDate=paymentDate; + } }