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

fix:统计调整

Browse Source
This commit is contained in:
zhangqinlin
2021-12-13 11:13:55 +08:00
parent f31e74dad6
commit 11878cfe03
11 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+1 -1
View File
@@ -34,7 +34,7 @@
group by pe.id
order by pe.create_time desc
</select>
<select id="listForChildren" resultType="com.jero.data.entity.ChildrenFindByName">
<select id="listForChildren" resultType="com.jero.data.entity.subCouncil">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as id
from
pay_case_council_subitem pm
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java → jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
+3 -3
View File
@@ -1,4 +1,4 @@
package com.jero.data.controller;
package com.jero.project.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
@@ -8,8 +8,8 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.data.entity.PayResearchProject;
import com.jero.data.service.IPayResearchProjectService;
import com.jero.project.entity.PayResearchProject;
import com.jero.project.service.IPayResearchProjectService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java → jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayResearchProject.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.data.entity;
package com.jero.project.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.data.mapper;
package com.jero.project.mapper;
import com.jero.data.entity.PayResearchProject;
import com.jero.project.entity.PayResearchProject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayResearchProjectMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayResearchProjectMapper.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.data.mapper.PayResearchProjectMapper">
<mapper namespace="com.jero.project.mapper.PayResearchProjectMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+1 -1
View File
@@ -64,7 +64,7 @@
</select>
<!--工作组详情-->
<select id="queryPageList2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
select pwg1.principalId,pwg1.principalName,pwg1.chargeCompanyTemporaryName,pwg1.allMoney,pwg1.comeAllMoney,pwg1.chargeUse,if(pwg1.pack=0,'否','是') as packText,pwg1.pack from (SELECT
select pwg1.principalId,pwg1.principalName,pwg1.chargeCompanyTemporaryName,pwg1.allMoney,pwg1.comeAllMoney,pwg1.chargeUse,if(pwg1.pack=0,'否','是') as packText,pwg1.pack,pwg1.id from (SELECT
pwgs.id,
pwg.principal_id_a as principalId,
pwg.principal_name_a as principalName,
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayResearchProjectService.java → jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.data.service;
package com.jero.project.service;
import com.jero.data.entity.PayResearchProject;
import com.jero.project.entity.PayResearchProject;
import com.baomidou.mybatisplus.extension.service.IService;
/**
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayResearchProjectServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java
+4 -4
View File
@@ -1,8 +1,8 @@
package com.jero.data.service.impl;
package com.jero.project.service.impl;
import com.jero.data.entity.PayResearchProject;
import com.jero.data.mapper.PayResearchProjectMapper;
import com.jero.data.service.IPayResearchProjectService;
import com.jero.project.entity.PayResearchProject;
import com.jero.project.mapper.PayResearchProjectMapper;
import com.jero.project.service.IPayResearchProjectService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+10 -8
View File
@@ -373,15 +373,17 @@ public class AllProjectStatisticsController {
@ApiOperation(value = "通过部门id查所有人员", notes = "通过部门id查所有人员")
@RequestMapping(value = "/listForUserByOrgCode", method = RequestMethod.GET)
public Result<?> listForUserByOrgCode(@RequestParam(name = "departCode",required = true) String departCode) {
QueryWrapper<SysDepart> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("org_code",departCode);
SysDepart one = sysDepartService.getOne(queryWrapper1);
List<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(one.getId());
SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(one.getId());
List<String> orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList());
orgCodes.add(sysDepartModel.getOrgCode());
// QueryWrapper<SysDepart> queryWrapper1 = new QueryWrapper<>();
// queryWrapper1.eq("org_code",departCode);
// SysDepart one = sysDepartService.getOne(queryWrapper1);
// List<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(one.getId());
// SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(one.getId());
// List<String> orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList());
// orgCodes.add(sysDepartModel.getOrgCode());
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
queryWrapper.in("org_code",orgCodes);
queryWrapper.eq("org_code",departCode);
queryWrapper.eq("del_flag",0);
queryWrapper.eq("status",1);
List<SysUser> pageList = sysUserService.list(queryWrapper);
return Result.OK(pageList);
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+35 -24
View File
@@ -11,6 +11,8 @@ import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysDepartTreeModel;
import com.jero.common.util.oConvertUtils;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.service.IPayCompanyManagementService;
import com.jero.mail.commont.constant;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
@@ -51,6 +53,8 @@ public class CompanyComeMoneyStatisticsController {
private ISysBaseAPI sysBaseAPI;
@Autowired
private IPayWorkingGroupService payWorkingGroupService;
@Autowired
private IPayCompanyManagementService payCompanyManagementService;
/**
* 分页列表查询
@@ -155,36 +159,43 @@ public class CompanyComeMoneyStatisticsController {
// } else {
// return Result.OK();
// }
PayCompanyManagement byId = payCompanyManagementService.getById(companyComeMoneyDetailSearch.getChargeCompanyId());
if(ObjectUtils.isEmpty(byId)){
return Result.error("企业id错误，无对应企业id");
}
Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,null);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#,##0.00");
for(CompanyComeMoneyDetail s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
s.setChargeCompanyName(byId.getCompanyName());
}
//处理为空数据为0
for(CompanyComeMoneyDetail s: pageList.getRecords()) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
for(CompanyComeMoneyDetail s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
s.setChargeUse_text(payment_charge_use);
}
}
hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
}
//处理为空数据为0
for(CompanyComeMoneyDetail s: pageList.getRecords()) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
}
}
hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
}
/**
*企业来款统计
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
+3
View File
@@ -13,6 +13,9 @@ import org.jeecgframework.poi.excel.annotation.Excel;
public class CompanyComeMoneyDetail {
@ApiModelProperty(value = "项目id")
private String projectId;
@Excel(name = "来款企业", width = 15)
@ApiModelProperty(value = "来款企业")
private String chargeCompanyName;
@Excel(name = "来款项目", width = 15)
@ApiModelProperty(value = "来款项目")
private String projectName;