LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 会所收入统计

Browse Source
This commit is contained in:
邝凯兴
2022-07-29 11:40:01 +08:00
parent d8be00fbf2
commit e224733e9c
6 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java
+10 -11
View File
@@ -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<AllProjectStatistics> list = payWorkingGroupService.queryListAllProjectMoney(allProjectStatisticsSearch, null);
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListAllProjectMoney(page, allProjectStatisticsSearch, null);
HashMap<String, Object> 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);
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+11
View File
@@ -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;
}
}