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

fix 87901 科室统计--个别为0的数据--导出显示空格

Browse Source
This commit is contained in:
lijiarao
2024-08-02 11:53:05 +08:00
parent 021843e983
commit 98d92596e7
6 changed files with 163 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java
+2
View File
@@ -309,4 +309,6 @@ public interface CommonConstant {
* 第三方登录 验证密码/创建用户 都需要设置一个操作码 防止被恶意调用
*/
public final static String THIRD_LOGIN_CODE = "third_login_code";
public final static String ZERO = "0.00";
}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+1 -1
View File
@@ -2354,7 +2354,7 @@
order by bill_date
</select>
<!--全所收入统计 开票金额-->
<!--全所收入统计 到账金额-->
<select id="queryListComeAllMoney" resultType="com.jero.statistics.entity.AllProjectStatistics">
select
sum(no_tax_amount) as comeAllMoney,
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+64 -20
View File
@@ -6,6 +6,7 @@ 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.aspect.annotation.AutoLog;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oConvertUtils;
@@ -22,6 +23,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -83,10 +85,10 @@ public class AllProjectStatisticsController {
//处理为空数据为0
for (AllProjectStatistics s : pageList.getRecords()) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
s.setComeAllMoney(CommonConstant.ZERO);
}
}
@@ -152,10 +154,10 @@ public class AllProjectStatisticsController {
//处理为空数据为0
for (AllProjectStatistics s : pageList.getRecords()) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
s.setComeAllMoney(CommonConstant.ZERO);
}
}
@@ -194,11 +196,21 @@ public class AllProjectStatisticsController {
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
//处理为空数据为0
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
String allMoney = s.getAllMoney();
if (StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
String confirmAmount = s.getConfirmAmount();
if (StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
}
@@ -247,11 +259,21 @@ public class AllProjectStatisticsController {
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
//处理为空数据为0
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
String allMoney = s.getAllMoney();
if (StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
String confirmAmount = s.getConfirmAmount();
if (StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
}
}
@@ -305,11 +327,22 @@ public class AllProjectStatisticsController {
HashMap<String, Object> hashMap = new HashMap<>();
//处理为空数据为0
for (DepartStatistics s : pageList.getRecords()) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
//处理为空数据为0
String allMoney = s.getAllMoney();
if (StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
String confirmAmount = s.getConfirmAmount();
if (StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
}
@@ -354,11 +387,22 @@ public class AllProjectStatisticsController {
List<DepartStatistics> list = payWorkingGroupService.queryPageListDepartmentExcel(departStatisticsSearch, idList);
//处理为空数据为0
for (DepartStatistics s : list) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
//处理为空数据为0
String allMoney = s.getAllMoney();
if (StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
String confirmAmount = s.getConfirmAmount();
if (StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
}
return AmountUtil.exportListXls(list, DepartStatistics.class, "科室总体统计");
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+30 -17
View File
@@ -9,6 +9,7 @@ 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.aspect.annotation.AutoLog;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.DictModel;
import com.jero.common.util.SpringContextUtils;
@@ -66,7 +67,6 @@ public class CompanyComeMoneyStatisticsController {
private IPayWorkingGroupService payWorkingGroupService;
@Autowired
private IPayCompanyManagementService payCompanyManagementService;
/**
* 分页列表查询
*
@@ -182,14 +182,22 @@ public class CompanyComeMoneyStatisticsController {
List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, null);
//处理为空数据为0
for (CompanyComeMoneyList s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
//处理为空数据为0
String allMoney = s.getAllMoney();
if (StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
if (s.getFinishRate() == null || s.getFinishRate().equals("")) {
s.setFinishRate("0.00%");
String confirmAmount = s.getConfirmAmount();
if (StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
}
return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计");
@@ -213,16 +221,21 @@ public class CompanyComeMoneyStatisticsController {
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
//处理为空数据为0
for (CompanyComeMoneyDetail ss : pageList) {
if (ss.getAllMoney() == null || ss.getAllMoney().equals("")) {
ss.setAllMoney("0.00");
}
if (ss.getComeAllMoney() == null || ss.getComeAllMoney().equals("")) {
ss.setComeAllMoney("0.00");
}
if (s.getBillMoney() == null || s.getBillMoney().equals("")) {
s.setBillMoney("0.00");
}
String allMoney = s.getAllMoney();
if (StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
String comeAllMoney = s.getComeAllMoney();
if (StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
String confirmAmount = s.getConfirmAmount();
if (StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
}
return AmountUtil.exportListXls(pageList, CompanyComeMoneyDetail.class, "企业来款详情统计");
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+34 -11
View File
@@ -1,10 +1,10 @@
package com.jero.statistics.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.mapper.SysUserMapper;
@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -47,7 +48,6 @@ public class PayWorkingGroupStatisticsController {
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Autowired
private IPayWorkingGroupService payWorkingGroupService;
/**
* 工作组项目统计-统计分页列表查询
*
@@ -107,13 +107,25 @@ public class PayWorkingGroupStatisticsController {
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, null);
//处理为空数据为0
for (PayWorkingGroupStatistics s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
//处理为空数据为0
String allMoney = s.getAllMoney();
if (org.apache.commons.lang3.StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (org.apache.commons.lang3.StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
if (s.getMoneyRate() == null || s.getMoneyRate().equals("")) {
String confirmAmount = s.getConfirmAmount();
if (org.apache.commons.lang3.StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
String moneyRate = s.getMoneyRate();
if (StringUtils.isBlank(moneyRate)) {
s.setMoneyRate("0.00%");
}
}
@@ -183,11 +195,22 @@ public class PayWorkingGroupStatisticsController {
List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch, id);
//处理为空数据为0
for (PayWorkGroupSubletStatistics s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
//处理为空数据为0
String allMoney = s.getAllMoney();
if (org.apache.commons.lang3.StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (org.apache.commons.lang3.StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
String confirmAmount = s.getConfirmAmount();
if (org.apache.commons.lang3.StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
}
return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+32 -8
View File
@@ -6,6 +6,7 @@ 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.aspect.annotation.AutoLog;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.LoginType;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
@@ -19,6 +20,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -200,11 +202,22 @@ public class PrincipalPeopleStatisticsController {
List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch, idList);
//处理为空数据为0
for (PrincipalPeopleList s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
//处理为空数据为0
String allMoney = s.getAllMoney();
if (org.apache.commons.lang3.StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (org.apache.commons.lang3.StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
String confirmAmount = s.getConfirmAmount();
if (org.apache.commons.lang3.StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
if (s.getFinishRate() == null || s.getFinishRate().equals("")) {
s.setFinishRate("0.00%");
@@ -232,11 +245,22 @@ public class PrincipalPeopleStatisticsController {
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
//处理为空数据为0
String allMoney = s.getAllMoney();
if (org.apache.commons.lang3.StringUtils.isBlank(allMoney)) {
s.setAllMoney(CommonConstant.ZERO);
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
String comeAllMoney = s.getComeAllMoney();
if (org.apache.commons.lang3.StringUtils.isBlank(comeAllMoney)) {
s.setComeAllMoney(CommonConstant.ZERO);
}
String confirmAmount = s.getConfirmAmount();
if (org.apache.commons.lang3.StringUtils.isBlank(confirmAmount)) {
s.setConfirmAmount(CommonConstant.ZERO);
}
String billMoney = s.getBillMoney();
if (StringUtils.isBlank(billMoney)) {
s.setBillMoney(CommonConstant.ZERO);
}
}
return AmountUtil.exportListXls(pageList, PrincipalPeopleDetail.class, "个人来款详情");