From d8be00fbf226fac6acd16d77bfb27db2239f4939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com> Date: Thu, 28 Jul 2022 18:13:08 +0800 Subject: [PATCH] =?UTF-8?q?insert=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 | 17 ++++ .../service/IPayWorkingGroupService.java | 2 + .../impl/PayWorkingGroupServiceImpl.java | 5 ++ .../AllProjectMoneyStatisticsController.java | 78 +++++++++++++++++++ .../entity/AllProjectStatistics.java | 2 +- 6 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java 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 512b5403..f77aac60 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 @@ -217,4 +217,6 @@ public interface PayWorkingGroupMapper extends BaseMapper { List queryPageListDepartment(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); AllMoney queryPageListDepartment33(@Param("departStatisticsSearch") DepartStatisticsSearch departStatisticsSearch, @Param("idList") List idList); + + IPage queryPageListAllProjectMoney(Page page, @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 bc39a471..cca9c9c4 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 @@ -2216,4 +2216,21 @@ + + 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 6c735273..601ae7d7 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 @@ -238,4 +238,6 @@ public interface IPayWorkingGroupService extends IService { List queryPageListDepartmentExcel(DepartStatisticsSearch departStatisticsSearch, List idList); AllMoney queryPageListDepartment33(DepartStatisticsSearch departStatisticsSearch, List idList); + + IPage queryPageListAllProjectMoney(Page page, 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 c2efb540..4a08c688 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 @@ -630,4 +630,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListAllProjectMoney(Page page, AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { + return payWorkingGroupMapper.queryPageListAllProjectMoney(page,allProjectStatisticsSearch,idList); + } } 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 new file mode 100644 index 00000000..4ee33f80 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectMoneyStatisticsController.java @@ -0,0 +1,78 @@ +package com.jero.statistics.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.util.oConvertUtils; +import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysUserService; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.text.DecimalFormat; +import java.util.HashMap; + +/** + * @Description: TODO + * @author: Kuang Kaixing + * @date: 2022/07/28 16:13 + */ +@Api(tags = "全所收入统计") +@RestController +@RequestMapping("/statistics/allProjectMoneyStatistics") +@Slf4j +public class AllProjectMoneyStatisticsController { + @Resource + private SysUserMapper userMapper; + @Autowired + private ISysDepartService sysDepartService; + @Autowired + private ISysBaseAPI sysBaseAPI; + @Autowired + private ISysUserService sysUserService; + @Autowired + private IPayWorkingGroupService payWorkingGroupService; + + /** + * 分页列表查询 + * + * @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) { + + 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); + 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 7f48ed85..d5c029f8 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 @@ -66,5 +66,5 @@ public class AllProjectStatistics { @Excel(name = "到账时间", width = 15) @ApiModelProperty(value = "到账时间") - private Date paymentDate; + private String paymentDate; }