Guoyan
/
new_huozhou_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

统计1.5

master
Jinyuanyuan 4 months ago
parent
1979163cbb
commit
583d6fc916
3 changed files with 118 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
  2. 166
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
  3. 19
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java

6
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
View File

@ -257,7 +257,11 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
.select(HuzhouContractinfo::getProjectId,HuzhouContractinfo::getId);
List<HuzhouContractinfo> contractInfoList=contractinfoMapper.selectList(query);
List<String> contractIds = contractInfoList.stream().map(x -> x.getId()).collect(Collectors.toList());
List<HuzhouContractinfo> result = contractinfoMapper.selectBatchIds(contractIds);
List<HuzhouContractinfo> result= new ArrayList<>();
if(contractIds.size()!=0){
result = contractinfoMapper.selectBatchIds(contractIds);
}
return result;
}

166
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
View File

@ -32,6 +32,7 @@ import com.easy.admin.sys.service.SysDictService;
import com.easy.admin.util.PasswordUtil;
import com.easy.admin.util.ShiroUtil;
import javassist.expr.NewArray;
import kotlin.collections.EmptyList;
import org.activiti.engine.IdentityService;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
@ -512,6 +513,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
// return "0";
// }
//查询当前用户名下主项目和子项目的id
@Override
public Map<String,List<String>> findAllProjectIds() {
HuzhouProjectinfo projectInfo =new HuzhouProjectinfo();
@ -533,62 +535,83 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
return result;
}
//统计主项目和子项目中的总投资
@Override
public BigDecimal totalMoneyByProjectIds(Map<String,List<String>> projectIds) {
LambdaQueryWrapper<HuzhouProjectinfo> query = new LambdaQueryWrapper<>(new HuzhouProjectinfo())
.in(HuzhouProjectinfo::getId,projectIds.get("zxm"))
.select(HuzhouProjectinfo::getId,HuzhouProjectinfo::getTotalMoney);
List<HuzhouProjectinfo> projectInfoList=projectinfoMapper.selectList(query);
BigDecimal zxmTotal = new BigDecimal(Double.toString(projectInfoList.stream().mapToDouble(x -> x.getTotalMoney()).sum()));
LambdaQueryWrapper<HuzhouSubProjectinfo> cquery = new LambdaQueryWrapper<>(new HuzhouSubProjectinfo())
.in(HuzhouSubProjectinfo::getId,projectIds.get("cxm"))
.select(HuzhouSubProjectinfo::getId,HuzhouSubProjectinfo::getTotalMoney);
List<HuzhouSubProjectinfo> subProjectInfoList=subProjectinfoMapper.selectList(cquery);
BigDecimal cxmTotal = new BigDecimal(Double.toString(subProjectInfoList.stream().mapToDouble(x -> x.getTotalMoney()).sum()));
BigDecimal zxmTotal = new BigDecimal("0.00");
BigDecimal cxmTotal = new BigDecimal("0.00");
if(projectIds.get("zxm").size()!=0) {
LambdaQueryWrapper<HuzhouProjectinfo> query = new LambdaQueryWrapper<>(new HuzhouProjectinfo())
.in(HuzhouProjectinfo::getId, projectIds.get("zxm"))
.select(HuzhouProjectinfo::getId, HuzhouProjectinfo::getTotalMoney);
List<HuzhouProjectinfo> projectInfoList = projectinfoMapper.selectList(query);
zxmTotal = new BigDecimal(Double.toString(projectInfoList.stream().mapToDouble(x -> x.getTotalMoney()).sum()));
}
if(projectIds.get("cxm").size()!=0){
LambdaQueryWrapper<HuzhouSubProjectinfo> cquery = new LambdaQueryWrapper<>(new HuzhouSubProjectinfo())
.in(HuzhouSubProjectinfo::getId,projectIds.get("cxm"))
.select(HuzhouSubProjectinfo::getId,HuzhouSubProjectinfo::getTotalMoney);
List<HuzhouSubProjectinfo> subProjectInfoList=subProjectinfoMapper.selectList(cquery);
cxmTotal = new BigDecimal(Double.toString(subProjectInfoList.stream().mapToDouble(x -> x.getTotalMoney()).sum()));
}
BigDecimal result = zxmTotal.add(cxmTotal);
return result;
}
//统计项目总进度(计划阶段已完成数和未完成数)
@Override
public ProjectProgressOV countProjectProgress() {
int fininshNum=0;
int unfininshNum=0;
//1、查询所有项目
//2、查询所有项目对应的计划阶段
Map<String, List<String>> projectIdsMap = this.findAllProjectIds();
List<String> projectIdsList = projectIdsMap.get("zxm");
projectIdsList.addAll(projectIdsMap.get("cxm"));
List<HuzhouPlaninfo> planInfoList = planinfoService.listByProjectIds(projectIdsList);
int fininshNum = (int) planInfoList.stream().filter(x -> (x.getIsfinish().equals("2"))).count();
int unfininshNum=planInfoList.size()-fininshNum;
if(projectIdsList.size()!=0){
List<HuzhouPlaninfo> planInfoList = planinfoService.listByProjectIds(projectIdsList);
fininshNum = (int) planInfoList.stream().filter(x -> (x.getIsfinish().equals("2"))).count();
unfininshNum = planInfoList.size()-fininshNum;
}
ProjectProgressOV result = ProjectProgressOV.builder().fininshNum(fininshNum).unfininshNum(unfininshNum).build();
return result;
}
//统计资金拨付情况(支付阶段在计划中已完成即为已付款)
@Override
public FundOV countFund() {
Map<String, List<String>> projectIdsMap = this.findAllProjectIds();
List<String> projectIdsList = projectIdsMap.get("zxm");
projectIdsList.addAll(projectIdsMap.get("cxm"));
List<HuzhouContractinfo> contractInfoList = contractinfoService.ListByProjectIds(projectIdsList);
List<HuzhouPlaninfo> planInfoList = planinfoService.listByProjectIds(projectIdsList);
BigDecimal totalAmount = new BigDecimal("0.00");
BigDecimal unPayAmount = new BigDecimal("0.00");
BigDecimal payAmount = new BigDecimal("0.00");
Map<String, Double> contractMoneyMap;
List<String> finishPlanTaskList;
for(String projectId:projectIdsList){
contractMoneyMap = contractInfoList.stream().filter(x -> x.getProjectId().equals(projectId))
.collect(Collectors.toMap(HuzhouContractinfo::getTaskName, HuzhouContractinfo::getTotalMoney));
finishPlanTaskList = planInfoList.stream().filter(x->x.getProjectId().equals(projectId))
.filter(x->x.getIsfinish().equals("2")).map(x->x.getTaskName()).collect(Collectors.toList());
for(String key:contractMoneyMap.keySet()){
if(finishPlanTaskList.contains(key)){
payAmount=payAmount.add(new BigDecimal(Double.toString(contractMoneyMap.get(key))));
if(projectIdsList.size()!=0){
List<HuzhouContractinfo> contractInfoList = contractinfoService.ListByProjectIds(projectIdsList);
List<HuzhouPlaninfo> planInfoList = planinfoService.listByProjectIds(projectIdsList);
Map<String, Double> contractMoneyMap;
List<String> finishPlanTaskList;
for(String projectId:projectIdsList){
contractMoneyMap = contractInfoList.stream().filter(x -> x.getProjectId().equals(projectId))
.collect(Collectors.toMap(HuzhouContractinfo::getTaskName, HuzhouContractinfo::getTotalMoney));
finishPlanTaskList = planInfoList.stream().filter(x->x.getProjectId().equals(projectId))
.filter(x->x.getIsfinish().equals("2")).map(x->x.getTaskName()).collect(Collectors.toList());
for(String key:contractMoneyMap.keySet()){
if(finishPlanTaskList.contains(key)){
payAmount=payAmount.add(new BigDecimal(Double.toString(contractMoneyMap.get(key))));
}
}
}
//根据projectIds累加总金额
totalAmount = this.totalMoneyByProjectIds(projectIdsMap);
unPayAmount = totalAmount.subtract(payAmount);
}
//根据projectIds累加总金额
BigDecimal totalAmount = this.totalMoneyByProjectIds(projectIdsMap);
BigDecimal unPayAmount = totalAmount.subtract(payAmount);
FundOV result = FundOV.builder().fininshNum(payAmount.toString()).unfininshNum(unPayAmount.toString()).build();
return result;
}
@ -598,49 +621,60 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
Map<String, List<String>> projectIdsMap = this.findAllProjectIds();
List<String> zxmIds = projectIdsMap.get("zxm");
List<String> cxmIds = projectIdsMap.get("cxm");
List<HuzhouProjectinfo> projectInfoList = projectinfoMapper.selectBatchIds(zxmIds);
List<HuzhouSubProjectinfo> cProjectinfoList = subProjectinfoService.listByProjectIds(cxmIds);
projectInfoList.addAll(cProjectinfoList);
List<Select> projectStage1 = dictService.selectByDictType("projectStage").stream().collect(Collectors.toList());
Map<String, String> projectStage = dictService.selectByDictType("projectStage").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel()));
Map<String, String> reformTasks = dictService.selectByDictType("reformTasks").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel()));
//根据项目状态统计
zxmIds.addAll(cxmIds);
CountOV result;
List<ProjectStatusOV> projectStatusList= new ArrayList<>();
Map<String, List<HuzhouProjectinfo>> statusCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getStage()));
for(String key:statusCountMap.keySet()){
projectStatusList.add(ProjectStatusOV.builder().name(projectStage.get(key)).value(statusCountMap.get(key).size()).build());
}
//根据所属改革任务统计(阶段完成情况)
List<CommonCountOV> projectByReformList= new ArrayList<>();
Map<String, List<HuzhouProjectinfo>> reformCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getReformName().trim()));
for (String key:reformCountMap.keySet()){
List<String> keyProjectIdsList = reformCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
projectByReformList.add(CommonCountOV.builder().name(reformTasks.get(key)).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
}
//根据行政区统计
List<CommonCountOV> projectByRegionList= new ArrayList<>();
Map<String, List<HuzhouProjectinfo>> regionCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getAdminDivision().trim()));
for (String key:regionCountMap.keySet()){
List<String> keyProjectIdsList = regionCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
projectByRegionList.add(CommonCountOV.builder().name(key).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
}
//根据单位统计
List<CommonCountOV> projectByWorkplaceList= new ArrayList<>();
Map<String, List<HuzhouProjectinfo>> workplaceCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getWorkplaceProperties().trim()));
for (String key:workplaceCountMap.keySet()){
List<String> keyProjectIdsList = workplaceCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
projectByWorkplaceList.add(CommonCountOV.builder().name(key).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
if(zxmIds.size()!=0){
List<HuzhouProjectinfo> projectInfoList = projectinfoMapper.selectBatchIds(zxmIds);
List<HuzhouSubProjectinfo> cProjectinfoList = subProjectinfoService.listByProjectIds(cxmIds);
projectInfoList.addAll(cProjectinfoList);
Map<String, String> projectStage = dictService.selectByDictType("projectStage").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel()));
Map<String, String> reformTasks = dictService.selectByDictType("reformTasks").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel()));
//根据项目状态统计
Map<String, List<HuzhouProjectinfo>> statusCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getStage()));
for(String key:statusCountMap.keySet()){
projectStatusList.add(ProjectStatusOV.builder().name(projectStage.get(key)).value(statusCountMap.get(key).size()).build());
}
//根据所属改革任务统计(阶段完成情况)
Map<String, List<HuzhouProjectinfo>> reformCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getReformName().trim()));
for (String key:reformCountMap.keySet()){
List<String> keyProjectIdsList = reformCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
projectByReformList.add(CommonCountOV.builder().name(reformTasks.get(key)).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
}
//根据行政区统计
Map<String, List<HuzhouProjectinfo>> regionCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getAdminDivision().trim()));
for (String key:regionCountMap.keySet()){
List<String> keyProjectIdsList = regionCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
projectByRegionList.add(CommonCountOV.builder().name(key).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
}
//根据单位统计
Map<String, List<HuzhouProjectinfo>> workplaceCountMap = projectInfoList.stream().collect(Collectors.groupingBy(x -> x.getWorkplaceProperties().trim()));
for (String key:workplaceCountMap.keySet()){
List<String> keyProjectIdsList = workplaceCountMap.get(key).stream().map(x -> x.getId()).collect(Collectors.toList());
Map<String, Integer> countMap = planinfoService.conutCompletionStatus(keyProjectIdsList);
projectByWorkplaceList.add(CommonCountOV.builder().name(key).fininshNum(countMap.get("fininshNum")).unfininshNum(countMap.get("unfininshNum")).build());
}
ProjectProgressOV projectProgress = countProjectProgress();
FundOV fund = countFund();
result = CountOV.builder().xiangmZJD(projectProgress).xiangmuZJ(fund)
.xiangmuZT(projectStatusList).XXQY(projectByRegionList).SSGGRW(projectByReformList).DWSX(projectByWorkplaceList).build();
}else {
result=CountOV.builder().xiangmZJD(ProjectProgressOV.builder().fininshNum(0).unfininshNum(0).build())
.xiangmuZJ(FundOV.builder().fininshNum("0").unfininshNum("0").build())
.xiangmuZT(projectStatusList)
.XXQY(projectByRegionList)
.SSGGRW(projectByReformList)
.DWSX(projectByWorkplaceList).build();
}
ProjectProgressOV projectProgress = countProjectProgress();
FundOV fund = countFund();
CountOV result = CountOV.builder().xiangmZJD(projectProgress).xiangmuZJ(fund)
.xiangmuZT(projectStatusList).XXQY(projectByRegionList).SSGGRW(projectByReformList).DWSX(projectByWorkplaceList).build();
return result;
}

19
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java
View File

@ -95,12 +95,19 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl<HuzhouSubProjec
@Override
public List<HuzhouSubProjectinfo> listByProjectIds(List<String> projectIds) {
LambdaQueryWrapper<HuzhouSubProjectinfo> query = new LambdaQueryWrapper<>(new HuzhouSubProjectinfo())
.in(HuzhouSubProjectinfo::getProjectId,projectIds)
.select(HuzhouSubProjectinfo::getProjectId,HuzhouSubProjectinfo::getId);
List<HuzhouSubProjectinfo> subProjectInfoList=subProjectinfoMapper.selectList(query);
List<String> subProjectsIds = subProjectInfoList.stream().map(x -> x.getId()).collect(Collectors.toList());
List<HuzhouSubProjectinfo> result = subProjectinfoMapper.selectBatchIds(subProjectsIds);
List<HuzhouSubProjectinfo> result= new ArrayList<>();
if(projectIds.size()!=0){
LambdaQueryWrapper<HuzhouSubProjectinfo> query = new LambdaQueryWrapper<>(new HuzhouSubProjectinfo())
.in(HuzhouSubProjectinfo::getProjectId,projectIds)
.select(HuzhouSubProjectinfo::getProjectId,HuzhouSubProjectinfo::getId);
List<HuzhouSubProjectinfo> subProjectInfoList=subProjectinfoMapper.selectList(query);
List<String> subProjectsIds = subProjectInfoList.stream().map(x -> x.getId()).collect(Collectors.toList());
if(subProjectsIds.size()!=0){
result = subProjectinfoMapper.selectBatchIds(subProjectsIds);
}
}
return result;
}
}

Write Preview
Loading…
Cancel
Save