Skip to content

F
fgqyxxlr
Commit dc4f28ac by liru
Options

统计修改

parent b0075b42
Showing with 130 additions and 114 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/ReportController.java
......@@ -64,6 +64,9 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
for (OrhonFgqy orhonFgqy : allFgqy) {
ReportOneResult tmpResult = null;
if(orhonFgqy.getDeptId()==null) {
orhonFgqy.setDeptId(0l);
}
if ( qiquMap.get(orhonFgqy.getDeptId()) == null) {
tmpResult = new ReportOneResult();
this.initResult(tmpResult);
......@@ -250,10 +253,13 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
this.initResult(result);
}
result.setAreaName(dictData.getDictLabel());
reportOneResultList.add(result);
}
ReportOneResult result = qiquMap.get(0l);
if(result!=null){
result.setAreaName("空");
reportOneResultList.add(result);
}
rspData.setRows(reportOneResultList);
rspData.setTotal(reportOneResultList.size());
return rspData;
......@@ -473,8 +479,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
reportOneResultList.add(result);
}
ReportOneResult result = qiquMap.get("0");
result.setType("空");
reportOneResultList.add(result);
if(result!=null){
result.setType("空");
reportOneResultList.add(result);
}
rspData.setRows(reportOneResultList);
rspData.setTotal(reportOneResultList.size());
return rspData;
......@@ -702,8 +710,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
reportTwoResultList.add(result);
}
ReportTwoResult result = qiquMap.get(0l);
result.setAreaName("空");
reportTwoResultList.add(result);
if(result!=null){
result.setType("空");
reportTwoResultList.add(result);
}
rspData.setRows(reportTwoResultList);
rspData.setTotal(reportTwoResultList.size());
return rspData;
......@@ -884,8 +894,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
reportTwoResultList.add(result);
}
ReportTwoResult result = qiquMap.get("0");
result.setType("空");
reportTwoResultList.add(result);
if(result!=null){
result.setType("空");
reportTwoResultList.add(result);
}
rspData.setRows(reportTwoResultList);
rspData.setTotal(reportTwoResultList.size());
return rspData;
......@@ -1044,37 +1056,38 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
}
orhonFgqy.setIsdzz("1");
java.util.List<com.ruoyi.system.domain.OrhonFgqy> listOrhonFgqy = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
List<ReportEightResult> list1=new ArrayList<>();
for(OrhonFgqy f:listOrhonFgqy){
ReportEightResult r=new ReportEightResult();
BeanUtils.copyProperties(f, r);
list1.add(r);
}
BeanUtils.copyProperties(listOrhonFgqy, list1);
orhonGtxx.setIsdzz("1");
List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
List<ReportEightResult> list2=new ArrayList<>();
for(OrhonGtxx gtxx:listOrhonGtxx){
ReportEightResult r=new ReportEightResult();
r.setMc(gtxx.getZhmc());
r.setIsdzz(gtxx.getIsdzz());
r.setDzzjlsj(gtxx.getDzzjlsj());
r.setDzzmc(gtxx.getDzzmc());
r.setDzzlx(gtxx.getDzzlx());
r.setDzzsdgx(gtxx.getDzzsdgx());
r.setSjdzz(gtxx.getSjdzz());
r.setIsgh(gtxx.getIsgh());
r.setIstzz(gtxx.getIstzz());
r.setIsjljcfnzz(gtxx.getIsjljcfnzz());
r.setHjxx(gtxx.getHjxx());
r.setDfzh(gtxx.getDfzh());
r.setSzd(gtxx.getJycs());
r.setLxdhjczh(gtxx.getLxdhjczh());
list2.add(r);
}
list.addAll(list1);
list.addAll(list2);
return getDataTable(list);
// List<ReportEightResult> list1=new ArrayList<>();
// for(OrhonFgqy f:listOrhonFgqy){
// ReportEightResult r=new ReportEightResult();
// BeanUtils.copyProperties(f, r);
// list1.add(r);
// }
// BeanUtils.copyProperties(listOrhonFgqy, list1);
// orhonGtxx.setIsdzz("1");
// List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
// List<ReportEightResult> list2=new ArrayList<>();
// for(OrhonGtxx gtxx:listOrhonGtxx){
// ReportEightResult r=new ReportEightResult();
// r.setMc(gtxx.getZhmc());
// r.setIsdzz(gtxx.getIsdzz());
// r.setDzzjlsj(gtxx.getDzzjlsj());
// r.setDzzmc(gtxx.getDzzmc());
// r.setDzzlx(gtxx.getDzzlx());
// r.setDzzsdgx(gtxx.getDzzsdgx());
// r.setSjdzz(gtxx.getSjdzz());
// r.setIsgh(gtxx.getIsgh());
// r.setIstzz(gtxx.getIstzz());
// r.setIsjljcfnzz(gtxx.getIsjljcfnzz());
// r.setHjxx(gtxx.getHjxx());
// r.setDfzh(gtxx.getDfzh());
// r.setSzd(gtxx.getJycs());
// r.setLxdhjczh(gtxx.getLxdhjczh());
// list2.add(r);
// }
// list.addAll(list1);
// list.addAll(list2);
// return getDataTable(list);
return getDataTable(listOrhonFgqy);
}
/**
* 第12个报表
......@@ -1094,33 +1107,34 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
}
orhonFgqy.setIsdzz("1");
java.util.List<com.ruoyi.system.domain.OrhonFgqy> listOrhonFgqy = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
List<ReportTwelveResult> list1=new ArrayList<>();
for(OrhonFgqy f:listOrhonFgqy){
ReportTwelveResult r=new ReportTwelveResult();
BeanUtils.copyProperties(f, r);
list1.add(r);
}
orhonGtxx.setIsdzz("1");
List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
List<ReportTwelveResult> list2=new ArrayList<>();
for(OrhonGtxx gtxx:listOrhonGtxx){
ReportTwelveResult r=new ReportTwelveResult();
r.setMc(gtxx.getZhmc());
r.setYwdy(gtxx.getYwdy());
r.setDys(gtxx.getDys());
r.setZzdysl(gtxx.getZzdysl());
r.setYbdysl(gtxx.getYbdysl());
r.setLddysl(gtxx.getLddysl());
r.setSlhkddysl(gtxx.getSlhkddysl());
r.setJjfzsl(gtxx.getJjfzsl());
r.setFzdxsl(gtxx.getFzdxsl());
r.setNnfzdys(gtxx.getNnfzdys());
r.setDfsjbz(gtxx.getDfsjbz());
list2.add(r);
}
list.addAll(list1);
list.addAll(list2);
return getDataTable(list);
// List<ReportTwelveResult> list1=new ArrayList<>();
// for(OrhonFgqy f:listOrhonFgqy){
// ReportTwelveResult r=new ReportTwelveResult();
// BeanUtils.copyProperties(f, r);
// list1.add(r);
// }
// orhonGtxx.setIsdzz("1");
// List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
// List<ReportTwelveResult> list2=new ArrayList<>();
// for(OrhonGtxx gtxx:listOrhonGtxx){
// ReportTwelveResult r=new ReportTwelveResult();
// r.setMc(gtxx.getZhmc());
// r.setYwdy(gtxx.getYwdy());
// r.setDys(gtxx.getDys());
// r.setZzdysl(gtxx.getZzdysl());
// r.setYbdysl(gtxx.getYbdysl());
// r.setLddysl(gtxx.getLddysl());
// r.setSlhkddysl(gtxx.getSlhkddysl());
// r.setJjfzsl(gtxx.getJjfzsl());
// r.setFzdxsl(gtxx.getFzdxsl());
// r.setNnfzdys(gtxx.getNnfzdys());
// r.setDfsjbz(gtxx.getDfsjbz());
// list2.add(r);
// }
// list.addAll(list1);
// list.addAll(list2);
// return getDataTable(list);
return getDataTable(listOrhonFgqy);
}
/**
* 第14个报表
......@@ -1140,32 +1154,33 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
}
orhonFgqy.setIsdzz("1");
java.util.List<com.ruoyi.system.domain.OrhonFgqy> listOrhonFgqy = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
List<ReportFourteenResult> list1=new ArrayList<>();
for(OrhonFgqy f:listOrhonFgqy){
ReportFourteenResult r=new ReportFourteenResult();
BeanUtils.copyProperties(f, r);
list1.add(r);
}
orhonGtxx.setIsdzz("1");
List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
List<ReportFourteenResult> list2=new ArrayList<>();
for(OrhonGtxx gtxx:listOrhonGtxx){
ReportFourteenResult r=new ReportFourteenResult();
r.setMc(gtxx.getZhmc());
r.setIshdzd(gtxx.getIshdzd());
r.setHdzdmj(gtxx.getHdzdmj());
r.setDjjf(gtxx.getDjjf());
r.setSjbfe(gtxx.getSjbfe());
r.setBjppe(gtxx.getBjppe());
r.setSfpdjzdy(gtxx.getSfpdjzdy());
r.setDjzdyxm(gtxx.getDjzdyxm());
r.setGzdwjzw(gtxx.getGzdwjzw());
r.setLxdhjczh(gtxx.getLxdhjczh());
list2.add(r);
}
list.addAll(list1);
list.addAll(list2);
return getDataTable(list);
// List<ReportFourteenResult> list1=new ArrayList<>();
// for(OrhonFgqy f:listOrhonFgqy){
// ReportFourteenResult r=new ReportFourteenResult();
// BeanUtils.copyProperties(f, r);
// list1.add(r);
// }
// orhonGtxx.setIsdzz("1");
// List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
// List<ReportFourteenResult> list2=new ArrayList<>();
// for(OrhonGtxx gtxx:listOrhonGtxx){
// ReportFourteenResult r=new ReportFourteenResult();
// r.setMc(gtxx.getZhmc());
// r.setIshdzd(gtxx.getIshdzd());
// r.setHdzdmj(gtxx.getHdzdmj());
// r.setDjjf(gtxx.getDjjf());
// r.setSjbfe(gtxx.getSjbfe());
// r.setBjppe(gtxx.getBjppe());
// r.setSfpdjzdy(gtxx.getSfpdjzdy());
// r.setDjzdyxm(gtxx.getDjzdyxm());
// r.setGzdwjzw(gtxx.getGzdwjzw());
// r.setLxdhjczh(gtxx.getLxdhjczh());
// list2.add(r);
// }
// list.addAll(list1);
// list.addAll(list2);
// return getDataTable(list);
return getDataTable(listOrhonFgqy);
}
/**
* 第16个报表
......@@ -1185,28 +1200,29 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
}
orhonFgqy.setIsdzz("1");
java.util.List<com.ruoyi.system.domain.OrhonFgqy> listOrhonFgqy = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
List<ReportSixteenResult> list1=new ArrayList<>();
for(OrhonFgqy f:listOrhonFgqy){
ReportSixteenResult r=new ReportSixteenResult();
BeanUtils.copyProperties(f, r);
list1.add(r);
}
orhonGtxx.setIsdzz("1");
List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
List<ReportSixteenResult> list2=new ArrayList<>();
for(OrhonGtxx gtxx:listOrhonGtxx){
ReportSixteenResult r=new ReportSixteenResult();
r.setMc(gtxx.getZhmc());
r.setIssqlh(gtxx.getIssqlh());
r.setQdjb(gtxx.getQdjb());
r.setQdsj(gtxx.getQdsj());
r.setXjpdjg(gtxx.getXjpdjg());
r.setJcqk(gtxx.getJcqk());
list2.add(r);
}
list.addAll(list1);
list.addAll(list2);
return getDataTable(list);
// List<ReportSixteenResult> list1=new ArrayList<>();
// for(OrhonFgqy f:listOrhonFgqy){
// ReportSixteenResult r=new ReportSixteenResult();
// BeanUtils.copyProperties(f, r);
// list1.add(r);
// }
// list.addAll(list1);
// orhonGtxx.setIsdzz("1");
// List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
// List<ReportSixteenResult> list2=new ArrayList<>();
// for(OrhonGtxx gtxx:listOrhonGtxx){
// ReportSixteenResult r=new ReportSixteenResult();
// r.setMc(gtxx.getZhmc());
// r.setIssqlh(gtxx.getIssqlh());
// r.setQdjb(gtxx.getQdjb());
// r.setQdsj(gtxx.getQdsj());
// r.setXjpdjg(gtxx.getXjpdjg());
// r.setJcqk(gtxx.getJcqk());
// list2.add(r);
// }
// list.addAll(list2);
// return getDataTable(list);
return getDataTable(listOrhonFgqy);
}
/**
* 有党组织的社会组织列表
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment