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

分标委bug处理

Browse Source
This commit is contained in:
zhangqinlin
2021-09-27 16:11:29 +08:00
parent a30b5b0d75
commit eaa7fa0e5f
11 changed files with 77 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java
+22 -14
View File
@@ -100,15 +100,7 @@ public class PayWorkingGroupStatisticsController {
payWorkingGroupStatistics.setComeAllMoney("0.00");
}
}
// //去除项目下来款金额为零的工作组
// ArrayList<PayWorkingGroupStatistics> list = new ArrayList<>();
// for(PayWorkingGroupStatistics payWorkingGroupStatistics:records) {
// if (ObjectUtils.isNotEmpty(payWorkingGroupStatistics)) {
// if (!("0".equals(payWorkingGroupStatistics.getComeAllMoney()) || payWorkingGroupStatistics.getComeAllMoney() == null)) {
// list.add(payWorkingGroupStatistics);
// }
// }
// }
//计算应收和实收总金额
double sum=0;
double sum2 =0;
@@ -124,7 +116,7 @@ public class PayWorkingGroupStatisticsController {
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
if(s.getMoneyRate()== null || s.getComeAllMoney().equals("") ) {
if(s.getMoneyRate()== null || s.getMoneyRate().equals("") ) {
s.setMoneyRate("0.00%");
}
}
@@ -160,7 +152,7 @@ public class PayWorkingGroupStatisticsController {
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
@@ -168,9 +160,16 @@ public class PayWorkingGroupStatisticsController {
idList.add(userId);
}
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,idList);
for (PayWorkingGroupStatistics payWorkingGroupStatistics:pageList){
if(payWorkingGroupStatistics.getComeAllMoney()==null||payWorkingGroupStatistics.getComeAllMoney()==""){
payWorkingGroupStatistics.setComeAllMoney("0.00");
//处理为空数据为0
for(PayWorkingGroupStatistics s: pageList){
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
if(s.getMoneyRate()== null || s.getMoneyRate().equals("") ) {
s.setMoneyRate("0.00%");
}
}
return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class,"工作组项目统计");
@@ -246,7 +245,16 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
payWorkingGroupSubletSearch.setYear(year);
}
List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch,id);
//处理为空数据为0
for(PayWorkGroupSubletStatistics s: pageList){
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
}
return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
}