Skip to content

F
fgqyxxlr
Commit f3785292 by liru
Options

统计12修改

parent 3192c866
Showing with 645 additions and 47 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java
......@@ -131,6 +131,10 @@ public class DemoTableController extends BaseController
return prefix + "/reportsixteen";
case "17":
return prefix + "/reportseventeen";
case "18":
return prefix + "/reportonelb";
case "19":
return prefix + "/reporttwolb";
// default:
// return prefix + "/groupHeader";
}
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/ReportController.java
......@@ -55,6 +55,13 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
List<OrhonFgqy> allFgqy = this.orhonFgqyService.selectOrhonFgqyList(new OrhonFgqy());
Map<Long, ReportOneResult> qiquMap = new HashMap<>(12);
ReportOneResult zongji=new ReportOneResult();
this.initResult(zongji);
zongji.setAreaName("总计");
Map<String, String> dzzmcddMap = new HashMap<>();
Map<String, String> dzzmclhMap = new HashMap<>();
for (OrhonFgqy orhonFgqy : allFgqy) {
ReportOneResult tmpResult = null;
if ( qiquMap.get(orhonFgqy.getDeptId()) == null) {
......@@ -64,75 +71,178 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
} else {
tmpResult = qiquMap.get(orhonFgqy.getDeptId());
}
zongji.setDwl(zongji.getDwl() + 1);
tmpResult.setDwl(tmpResult.getDwl() + 1);
if (orhonFgqy.getType()!=null && orhonFgqy.getType().equals("1")) {
tmpResult.setGmysfgqy(tmpResult.getGmysfgqy() + 1);
} else if (orhonFgqy.getType()!=null && orhonFgqy.getType().equals("2")) {
tmpResult.setGmyxfgqy(tmpResult.getGmyxfgqy() + 1);
}
if ( orhonFgqy.getIsdzz() != null && orhonFgqy.getIsdzz().equals("1")) {
// 已建立党组织
tmpResult.setSl(tmpResult.getSl() + 1);
// tmpResult.setDdjldzzdfgqy(tmpResult.getDdjldzzdfgqy() + 1);
if("1".equals(orhonFgqy.getIssqlh())) {
zongji.setSl(zongji.getSl() + 1);
if (orhonFgqy.getIssqlh()!=null && orhonFgqy.getIssqlh().equals("1")) {
tmpResult.setDdsqlhdfgqy(tmpResult.getDdsqlhdfgqy() + 1);
zongji.setDdsqlhdfgqy(zongji.getDdsqlhdfgqy() + 1);
}
if ( "1".equals(orhonFgqy.getIsgh())) {
if (orhonFgqy.getIsgh()!=null && orhonFgqy.getIsgh().equals("1")) {
tmpResult.setYjlghzzdfgqy(tmpResult.getYjlghzzdfgqy() + 1);
zongji.setYjlghzzdfgqy(zongji.getYjlghzzdfgqy() + 1);
}
if (orhonFgqy.getIstzz()!=null && orhonFgqy.getIstzz().equals("1")) {
tmpResult.setYjlgqtzzdfgqy(tmpResult.getYjlgqtzzdfgqy() + 1);
zongji.setYjlgqtzzdfgqy(zongji.getYjlgqtzzdfgqy() + 1);
}
if (orhonFgqy.getIsjljcfnzz()!=null && orhonFgqy.getIsjljcfnzz().equals("1")) {
tmpResult.setYjlfnjczzdfgqy(tmpResult.getYjlfnjczzdfgqy() + 1);
zongji.setYjlfnjczzdfgqy(zongji.getYjlfnjczzdfgqy() + 1);
}
if (orhonFgqy.getSfpdjzdy()!=null && orhonFgqy.getSfpdjzdy().equals("1")) {
tmpResult.setDjzdyhdjzdzlxdfgqy(tmpResult.getDjzdyhdjzdzlxdfgqy() + 1);
zongji.setDjzdyhdjzdzlxdfgqy(zongji.getDjzdyhdjzdzlxdfgqy() + 1);
}
try {
tmpResult.setDys(Integer.parseInt(orhonFgqy.getDys()) + tmpResult.getDys());
zongji.setDys(Integer.parseInt(orhonFgqy.getDys()) + zongji.getDys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setCyrysl( Integer.parseInt( orhonFgqy.getCyrs()) + tmpResult.getCyrysl());
zongji.setCyrysl( Integer.parseInt( orhonFgqy.getCyrs()) + zongji.getCyrysl());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setNnfzdydfgqy ( Integer.parseInt( orhonFgqy.getNnfzdys()) + tmpResult.getNnfzdydfgqy());
zongji.setNnfzdydfgqy ( Integer.parseInt( orhonFgqy.getNnfzdys()) + zongji.getNnfzdydfgqy());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
// tmpResult.setFzdys( Integer.parseInt( orhonFgqy.getFzdxsl()) + tmpResult.getFzdys());
tmpResult.setFzdys( Integer.parseInt( orhonFgqy.getFzdxsl()) + tmpResult.getFzdys());
zongji.setFzdys( Integer.parseInt( orhonFgqy.getFzdxsl()) + zongji.getFzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
if ( "1".equals(orhonFgqy.getDzzlx()) ) {
// 党委
tmpResult.setDws(tmpResult.getDws() + 1);
zongji.setDws(zongji.getDws() + 1);
} else if ( "2".equals(orhonFgqy.getDzzlx()) ) {
// 党支部
tmpResult.setDzbs(tmpResult.getDzbs() + 1);
zongji.setDzbs(zongji.getDzbs() + 1);
} if ( "3".equals(orhonFgqy.getDzzlx()) ) {
// 党总支
tmpResult.setDzzs(tmpResult.getDzzs() + 1);
zongji.setDzzs(zongji.getDzzs() + 1);
}
if ( "1".equals(orhonFgqy.getIshdzd())) {
tmpResult.setYgdhdcsdfgqy(tmpResult.getYgdhdcsdfgqy()+1);
zongji.setYgdhdcsdfgqy(zongji.getYgdhdcsdfgqy()+1);
tmpResult.setDdjldzzdfgqy(tmpResult.getDdjldzzdfgqy()+1);
zongji.setDdjldzzdfgqy(zongji.getDdjldzzdfgqy()+1);
// 单独建立
tmpResult.setDdjl(tmpResult.getDdjl() + 1);
} else if ( "2".equals(orhonFgqy.getIshdzd())) {
if(dzzmcddMap.size()>0){
boolean hes=false;
for(String s:dzzmcddMap.values()){
if(orhonFgqy.getDzzmc()!=null && orhonFgqy.getDzzmc().equals(s)){
hes=true;
}
}
if(orhonFgqy.getDzzmc()!=null &&!hes){
dzzmcddMap.put(orhonFgqy.getId(),orhonFgqy.getDzzmc());
tmpResult.setDdjl(tmpResult.getDdjl() + 1);
tmpResult.setJldzzzs(tmpResult.getJldzzzs()+1);
}
}
else if(orhonFgqy.getDzzmc()!=null){
dzzmcddMap.put(orhonFgqy.getId(),orhonFgqy.getDzzmc());
tmpResult.setDdjl(tmpResult.getDdjl() + 1);
tmpResult.setJldzzzs(tmpResult.getJldzzzs()+1);
}
}
else if ( "2".equals(orhonFgqy.getIshdzd())) {
tmpResult.setYgdhdcsdfgqy(tmpResult.getYgdhdcsdfgqy()+1);
zongji.setYgdhdcsdfgqy(zongji.getYgdhdcsdfgqy()+1);
// 公用阵地 != 联合建立
// tmpResult.setG
if(dzzmclhMap.size()>0){
boolean hes=false;
for(String s:dzzmclhMap.values()){
if(orhonFgqy.getDzzmc()!=null && orhonFgqy.getDzzmc().equals(s)){
hes=true;
}
}
if(orhonFgqy.getDzzmc()!=null && !hes){
dzzmclhMap.put(orhonFgqy.getId(),orhonFgqy.getDzzmc());
tmpResult.setLhjl(tmpResult.getLhjl() + 1);
tmpResult.setJldzzzs(tmpResult.getJldzzzs()+1);
}
}else if(orhonFgqy.getDzzmc()!=null){
dzzmclhMap.put(orhonFgqy.getId(),orhonFgqy.getDzzmc());
tmpResult.setLhjl(tmpResult.getLhjl() + 1);
tmpResult.setJldzzzs(tmpResult.getJldzzzs()+1);
}
}
// else{
// if(dzzmcMap.size()>0){
// boolean hes=false;
// for(String s:dzzmcMap.values()){
// if(orhonFgqy.getDzzmc()!=null && orhonFgqy.getDzzmc().equals(s)){
// hes=true;
// }
// }
// if(orhonFgqy.getDzzmc()!=null && !hes){
// dzzmcMap.put(orhonFgqy.getDeptId(),orhonFgqy.getDzzmc());
// }
// }else if(orhonFgqy.getDzzmc()!=null){
// dzzmcMap.put(orhonFgqy.getDeptId(),orhonFgqy.getDzzmc());
// }
// }
} else {
// 空或者不等于1的统统为未建立
if (orhonFgqy.getIsdy()!=null && orhonFgqy.getIsdy().equals("1")) {
tmpResult.setWeiydydfgqy(tmpResult.getWeiydydfgqy() + 1);
zongji.setWeiydydfgqy(zongji.getWeiydydfgqy() + 1);
}
if (orhonFgqy.getSfpdjzdy()!=null && orhonFgqy.getSfpdjzdy().equals("1")) {
tmpResult.setWeidjzdyhdjzdzlxdfgqy(tmpResult.getWeidjzdyhdjzdzlxdfgqy() + 1);
zongji.setWeidjzdyhdjzdzlxdfgqy(zongji.getWeidjzdyhdjzdzlxdfgqy() + 1);
}
if (orhonFgqy.getIsgh()!=null && orhonFgqy.getIsgh().equals("1")) {
tmpResult.setWeiyjlghzzdfgqy(tmpResult.getWeiyjlghzzdfgqy() + 1);
zongji.setWeiyjlghzzdfgqy(zongji.getWeiyjlghzzdfgqy() + 1);
}
if (orhonFgqy.getIstzz()!=null && orhonFgqy.getIstzz().equals("1")) {
tmpResult.setWeiyjlgqtzzdfgqy(tmpResult.getWeiyjlgqtzzdfgqy() + 1);
zongji.setWeiyjlgqtzzdfgqy(zongji.getWeiyjlgqtzzdfgqy() + 1);
}
if (orhonFgqy.getIsjljcfnzz()!=null && orhonFgqy.getIsjljcfnzz().equals("1")) {
tmpResult.setWeiyjlfnjczzdfgqy(tmpResult.getWeiyjlfnjczzdfgqy() + 1);
zongji.setWeiyjlfnjczzdfgqy(zongji.getWeiyjlfnjczzdfgqy() + 1);
}
try {
tmpResult.setWeidys(Integer.parseInt(orhonFgqy.getDys()) + tmpResult.getWeidys());
zongji.setWeidys(Integer.parseInt(orhonFgqy.getDys()) + zongji.getWeidys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeicyrs( Integer.parseInt( orhonFgqy.getCyrs()) + tmpResult.getWeicyrs());
zongji.setWeicyrs( Integer.parseInt( orhonFgqy.getCyrs()) + zongji.getWeicyrs());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeinnfzdys ( Integer.parseInt( orhonFgqy.getNnfzdys()) + tmpResult.getWeinnfzdys());
zongji.setWeinnfzdys ( Integer.parseInt( orhonFgqy.getNnfzdys()) + zongji.getWeinnfzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
}
}
List<ReportOneResult> reportOneResultList = new ArrayList<>(areaList.size());
zongji.setJldzzzs(dzzmcddMap.size()+dzzmclhMap.size());
zongji.setDdjl(dzzmcddMap.size());
zongji.setLhjl(dzzmclhMap.size());
List<ReportOneResult> reportOneResultList = new ArrayList<>(areaList.size()+1);
reportOneResultList.add(zongji);
for (SysDictData dictData : areaList) {
ReportOneResult result = qiquMap.get(Long.parseLong(dictData.getDictValue()));
if(result == null){
......@@ -148,6 +258,227 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
rspData.setTotal(reportOneResultList.size());
return rspData;
}
/**
* 第一个报表
* 非公企业"两个覆盖"专项行动摸底排查情况统计表 按类别
*/
@PostMapping("/onelb")
@ResponseBody
public TableDataInfo reportOnelb(){
SysDictData sysDictData = new SysDictData();
sysDictData.setDictType("orhon_qylx");
List<SysDictData> qylxList = this.dictDataService.selectDictDataList(sysDictData);
TableDataInfo rspData = new TableDataInfo();
List<OrhonFgqy> allFgqy = this.orhonFgqyService.selectOrhonFgqyList(new OrhonFgqy());
Map<String, ReportOneResult> qiquMap = new HashMap<>(12);
ReportOneResult zongji=new ReportOneResult();
this.initResult(zongji);
zongji.setType("总计");
Map<String, String> dzzmcddMap = new HashMap<>();
Map<String, String> dzzmclhMap = new HashMap<>();
for (OrhonFgqy orhonFgqy : allFgqy) {
ReportOneResult tmpResult = null;
zongji.setDwl(zongji.getDwl() + 1);
if(orhonFgqy.getType()==null) {
orhonFgqy.setType("0");
}
if ( qiquMap.get(orhonFgqy.getType()) == null) {
tmpResult = new ReportOneResult();
this.initResult(tmpResult);
qiquMap.put(orhonFgqy.getType(), tmpResult);
} else {
tmpResult = qiquMap.get(orhonFgqy.getType());
}
tmpResult.setDwl(tmpResult.getDwl() + 1);
if ( orhonFgqy.getIsdzz() != null && orhonFgqy.getIsdzz().equals("1")) {
// 已建立党组织
tmpResult.setSl(tmpResult.getSl() + 1);
zongji.setSl(zongji.getSl() + 1);
if (orhonFgqy.getIssqlh()!=null && orhonFgqy.getIssqlh().equals("1")) {
tmpResult.setDdsqlhdfgqy(tmpResult.getDdsqlhdfgqy() + 1);
zongji.setDdsqlhdfgqy(zongji.getDdsqlhdfgqy() + 1);
}
if (orhonFgqy.getIsgh()!=null && orhonFgqy.getIsgh().equals("1")) {
tmpResult.setYjlghzzdfgqy(tmpResult.getYjlghzzdfgqy() + 1);
zongji.setYjlghzzdfgqy(zongji.getYjlghzzdfgqy() + 1);
}
if (orhonFgqy.getIstzz()!=null && orhonFgqy.getIstzz().equals("1")) {
tmpResult.setYjlgqtzzdfgqy(tmpResult.getYjlgqtzzdfgqy() + 1);
zongji.setYjlgqtzzdfgqy(zongji.getYjlgqtzzdfgqy() + 1);
}
if (orhonFgqy.getIsjljcfnzz()!=null && orhonFgqy.getIsjljcfnzz().equals("1")) {
tmpResult.setYjlfnjczzdfgqy(tmpResult.getYjlfnjczzdfgqy() + 1);
zongji.setYjlfnjczzdfgqy(zongji.getYjlfnjczzdfgqy() + 1);
}
if (orhonFgqy.getSfpdjzdy()!=null && orhonFgqy.getSfpdjzdy().equals("1")) {
tmpResult.setDjzdyhdjzdzlxdfgqy(tmpResult.getDjzdyhdjzdzlxdfgqy() + 1);
zongji.setDjzdyhdjzdzlxdfgqy(zongji.getDjzdyhdjzdzlxdfgqy() + 1);
}
try {
tmpResult.setDys(Integer.parseInt(orhonFgqy.getDys()) + tmpResult.getDys());
zongji.setDys(Integer.parseInt(orhonFgqy.getDys()) + zongji.getDys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setCyrysl( Integer.parseInt( orhonFgqy.getCyrs()) + tmpResult.getCyrysl());
zongji.setCyrysl( Integer.parseInt( orhonFgqy.getCyrs()) + zongji.getCyrysl());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setNnfzdydfgqy ( Integer.parseInt( orhonFgqy.getNnfzdys()) + tmpResult.getNnfzdydfgqy());
zongji.setNnfzdydfgqy ( Integer.parseInt( orhonFgqy.getNnfzdys()) + zongji.getNnfzdydfgqy());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setFzdys( Integer.parseInt( orhonFgqy.getFzdxsl()) + tmpResult.getFzdys());
zongji.setFzdys( Integer.parseInt( orhonFgqy.getFzdxsl()) + zongji.getFzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
if ( "1".equals(orhonFgqy.getDzzlx()) ) {
// 党委
tmpResult.setDws(tmpResult.getDws() + 1);
zongji.setDws(zongji.getDws() + 1);
} else if ( "2".equals(orhonFgqy.getDzzlx()) ) {
// 党支部
tmpResult.setDzbs(tmpResult.getDzbs() + 1);
zongji.setDzbs(zongji.getDzbs() + 1);
} if ( "3".equals(orhonFgqy.getDzzlx()) ) {
// 党总支
tmpResult.setDzzs(tmpResult.getDzzs() + 1);
zongji.setDzzs(zongji.getDzzs() + 1);
}
if ( "1".equals(orhonFgqy.getIshdzd())) {
tmpResult.setYgdhdcsdfgqy(tmpResult.getYgdhdcsdfgqy()+1);
zongji.setYgdhdcsdfgqy(zongji.getYgdhdcsdfgqy()+1);
tmpResult.setDdjldzzdfgqy(tmpResult.getDdjldzzdfgqy()+1);
zongji.setDdjldzzdfgqy(zongji.getDdjldzzdfgqy()+1);
// 单独建立
if(dzzmcddMap.size()>0){
boolean hes=false;
for(String s:dzzmcddMap.values()){
if(orhonFgqy.getDzzmc()!=null && orhonFgqy.getDzzmc().equals(s)){
hes=true;
}
}
if(orhonFgqy.getDzzmc()!=null &&!hes){
dzzmcddMap.put(orhonFgqy.getId(),orhonFgqy.getDzzmc());
tmpResult.setDdjl(tmpResult.getDdjl() + 1);
tmpResult.setJldzzzs(tmpResult.getJldzzzs()+1);
}
}else if(orhonFgqy.getDzzmc()!=null){
dzzmcddMap.put(orhonFgqy.getId(),orhonFgqy.getDzzmc());
tmpResult.setDdjl(tmpResult.getDdjl() + 1);
tmpResult.setJldzzzs(tmpResult.getJldzzzs()+1);
}
}
else if ( "2".equals(orhonFgqy.getIshdzd())) {
tmpResult.setYgdhdcsdfgqy(tmpResult.getYgdhdcsdfgqy()+1);
zongji.setYgdhdcsdfgqy(zongji.getYgdhdcsdfgqy()+1);
// 公用阵地 != 联合建立
if(dzzmclhMap.size()>0){
boolean hes=false;
for(String s:dzzmclhMap.values()){
if(orhonFgqy.getDzzmc()!=null && orhonFgqy.getDzzmc().equals(s)){
hes=true;
}
}
if(orhonFgqy.getDzzmc()!=null && !hes){
dzzmclhMap.put(orhonFgqy.getId(),orhonFgqy.getDzzmc());
tmpResult.setLhjl(tmpResult.getLhjl() + 1);
tmpResult.setJldzzzs(tmpResult.getJldzzzs()+1);
}
}else if(orhonFgqy.getDzzmc()!=null){
dzzmclhMap.put(orhonFgqy.getId(),orhonFgqy.getDzzmc());
tmpResult.setLhjl(tmpResult.getLhjl() + 1);
tmpResult.setJldzzzs(tmpResult.getJldzzzs()+1);
}
}
// else{
// if(dzzmcMap.size()>0){
// boolean hes=false;
// for(String s:dzzmcMap.values()){
// if(orhonFgqy.getDzzmc()!=null && orhonFgqy.getDzzmc().equals(s)){
// hes=true;
// }
// }
// if(orhonFgqy.getDzzmc()!=null && !hes){
// dzzmcMap.put(orhonFgqy.getDeptId(),orhonFgqy.getDzzmc());
// }
// }else if(orhonFgqy.getDzzmc()!=null){
// dzzmcMap.put(orhonFgqy.getDeptId(),orhonFgqy.getDzzmc());
// }
// }
} else {
// 空或者不等于1的统统为未建立
if (orhonFgqy.getIsdy()!=null && orhonFgqy.getIsdy().equals("1")) {
tmpResult.setWeiydydfgqy(tmpResult.getWeiydydfgqy() + 1);
zongji.setWeiydydfgqy(zongji.getWeiydydfgqy() + 1);
}
if (orhonFgqy.getSfpdjzdy()!=null && orhonFgqy.getSfpdjzdy().equals("1")) {
tmpResult.setWeidjzdyhdjzdzlxdfgqy(tmpResult.getWeidjzdyhdjzdzlxdfgqy() + 1);
zongji.setWeidjzdyhdjzdzlxdfgqy(zongji.getWeidjzdyhdjzdzlxdfgqy() + 1);
}
if (orhonFgqy.getIsgh()!=null && orhonFgqy.getIsgh().equals("1")) {
tmpResult.setWeiyjlghzzdfgqy(tmpResult.getWeiyjlghzzdfgqy() + 1);
zongji.setWeiyjlghzzdfgqy(zongji.getWeiyjlghzzdfgqy() + 1);
}
if (orhonFgqy.getIstzz()!=null && orhonFgqy.getIstzz().equals("1")) {
tmpResult.setWeiyjlgqtzzdfgqy(tmpResult.getWeiyjlgqtzzdfgqy() + 1);
zongji.setWeiyjlgqtzzdfgqy(zongji.getWeiyjlgqtzzdfgqy() + 1);
}
if (orhonFgqy.getIsjljcfnzz()!=null && orhonFgqy.getIsjljcfnzz().equals("1")) {
tmpResult.setWeiyjlfnjczzdfgqy(tmpResult.getWeiyjlfnjczzdfgqy() + 1);
zongji.setWeiyjlfnjczzdfgqy(zongji.getWeiyjlfnjczzdfgqy() + 1);
}
try {
tmpResult.setWeidys(Integer.parseInt(orhonFgqy.getDys()) + tmpResult.getWeidys());
zongji.setWeidys(Integer.parseInt(orhonFgqy.getDys()) + zongji.getWeidys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeicyrs( Integer.parseInt( orhonFgqy.getCyrs()) + tmpResult.getWeicyrs());
zongji.setWeicyrs( Integer.parseInt( orhonFgqy.getCyrs()) + zongji.getWeicyrs());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeinnfzdys ( Integer.parseInt( orhonFgqy.getNnfzdys()) + tmpResult.getWeinnfzdys());
zongji.setWeinnfzdys ( Integer.parseInt( orhonFgqy.getNnfzdys()) + zongji.getWeinnfzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
}
}
zongji.setJldzzzs(dzzmcddMap.size()+dzzmclhMap.size());
zongji.setDdjl(dzzmcddMap.size());
zongji.setLhjl(dzzmclhMap.size());
List<ReportOneResult> reportOneResultList = new ArrayList<>(qylxList.size());
reportOneResultList.add(zongji);
for (SysDictData dictData : qylxList) {
ReportOneResult result = qiquMap.get(dictData.getDictValue());
if(result == null){
result = new ReportOneResult();
this.initResult(result);
}
result.setType(dictData.getDictLabel());
reportOneResultList.add(result);
}
ReportOneResult result = qiquMap.get("0");
result.setType("空");
reportOneResultList.add(result);
rspData.setRows(reportOneResultList);
rspData.setTotal(reportOneResultList.size());
return rspData;
}
private void initResult(ReportOneResult tmpResult) {
tmpResult.setDwl(0);
......@@ -159,6 +490,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
tmpResult.setYjlfnjczzdfgqy(0);
tmpResult.setDjzdyhdjzdzlxdfgqy(0);
tmpResult.setYgdhdcsdfgqy(0);
tmpResult.setJldzzzs(0);
tmpResult.setDdjl(0);
tmpResult.setLhjl(0);
tmpResult.setDws(0);
......@@ -196,14 +528,210 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
@ResponseBody
public TableDataInfo reporttwo(){
SysDictData sysDictData = new SysDictData();
sysDictData.setDictType("orhon_qyfl");
List<SysDictData> areaList = this.dictDataService.selectDictDataList(sysDictData);
TableDataInfo rspData = new TableDataInfo();
List<OrhonShzz> allShzz = this.orhonShzzService.selectOrhonShzzList(new OrhonShzz());
Map<Long, ReportTwoResult> qiquMap = new HashMap<>(12);
ReportTwoResult zongji=new ReportTwoResult();
this.initResultTwo(zongji);
zongji.setAreaName("总计");
for (OrhonShzz orhonShzz : allShzz) {
ReportTwoResult tmpResult = null;
if(orhonShzz.getDeptId()==null){
orhonShzz.setDeptId(0l);
}
if ( qiquMap.get(orhonShzz.getDeptId()) == null) {
tmpResult = new ReportTwoResult();
this.initResultTwo(tmpResult);
qiquMap.put(orhonShzz.getDeptId(), tmpResult);
} else {
tmpResult = qiquMap.get(orhonShzz.getDeptId());
}
tmpResult.setDws(tmpResult.getDws() + 1);
zongji.setDws(zongji.getDws() + 1);
if ( orhonShzz.getIsdzz() != null && orhonShzz.getIsdzz().equals("1")) {
// 已建立党组织
tmpResult.setSl(tmpResult.getSl() + 1);
zongji.setSl(zongji.getSl() + 1);
if( orhonShzz.getIssqlh() != null && "1".equals(orhonShzz.getIssqlh())) {
tmpResult.setDdlghdshzz(tmpResult.getDdlghdshzz() + 1);
zongji.setDdlghdshzz(zongji.getDdlghdshzz() + 1);
}
if ( orhonShzz.getIsgh() != null && "1".equals(orhonShzz.getIsgh())) {
tmpResult.setYjlghzzdshzz(tmpResult.getYjlghzzdshzz() + 1);
zongji.setYjlghzzdshzz(zongji.getYjlghzzdshzz() + 1);
}
if (orhonShzz.getIstzz() != null && "1".equals(orhonShzz.getIstzz())) {
tmpResult.setYjlgqtzzdshzz(tmpResult.getYjlgqtzzdshzz() + 1);
zongji.setYjlgqtzzdshzz(zongji.getYjlgqtzzdshzz() + 1);
}
if (orhonShzz.getIsjljcfnzz() != null && "1".equals(orhonShzz.getIsjljcfnzz())) {
tmpResult.setYjlfnjjzzdshzz(tmpResult.getYjlfnjjzzdshzz() + 1);
zongji.setYjlfnjjzzdshzz(zongji.getYjlfnjjzzdshzz() + 1);
}
// djzdyhdjzdzlxdshzz党建指导员或党建指导组联系的社会组织
if (orhonShzz.getIshdzd() != null && ("1".equals(orhonShzz.getIshdzd())||"2".equals(orhonShzz.getIshdzd()))) {
tmpResult.setYgdhdcsdshzz(tmpResult.getYgdhdcsdshzz() + 1);
zongji.setYgdhdcsdshzz(zongji.getYgdhdcsdshzz() + 1);
tmpResult.setDdjldzzdshzz(tmpResult.getDdjldzzdshzz() + 1);
zongji.setDdjldzzdshzz(zongji.getDdjldzzdshzz() + 1);
}
if ( orhonShzz.getIshdzd() != null && "1".equals(orhonShzz.getIshdzd())) {
tmpResult.setDdjl(tmpResult.getDdjl() + 1);
zongji.setDdjl(zongji.getDdjl() + 1);
}
if (orhonShzz.getIshdzd() != null && "2".equals(orhonShzz.getIshdzd())) {
tmpResult.setLhjl(tmpResult.getLhjl() + 1);
zongji.setLhjl(zongji.getLhjl() + 1);
}
if (orhonShzz.getDzzlx() != null && "1".equals(orhonShzz.getDzzlx()) ) {
// 党委
tmpResult.setDwys(tmpResult.getDwys() + 1);
zongji.setDwys(zongji.getDwys() + 1);
} else if (orhonShzz.getDzzlx() != null && "3".equals(orhonShzz.getDzzlx()) ) {
// 党总支
tmpResult.setDzzs(tmpResult.getDzzs() + 1);
zongji.setDzzs(zongji.getDzzs() + 1);
}else if (orhonShzz.getDzzlx() != null && "2".equals(orhonShzz.getDzzlx()) ) {
// 党支部数
tmpResult.setDzbs(tmpResult.getDzbs() + 1);
zongji.setDzbs(zongji.getDzbs() + 1);
}
//bndxjldzzdshzz 本年度新建立党组织的社会组织
//bndxjlddzzs本年度新建立的党组织数
try {
tmpResult.setCyrysl( Integer.parseInt( orhonShzz.getCyrs()) + tmpResult.getCyrysl());
zongji.setCyrysl( Integer.parseInt( orhonShzz.getCyrs()) + zongji.getCyrysl());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setDys(Integer.parseInt(orhonShzz.getDys()) + tmpResult.getDys());
zongji.setDys(Integer.parseInt(orhonShzz.getDys()) + zongji.getDys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setNnfzdydshzz ( Integer.parseInt( orhonShzz.getNnfzdys()) + tmpResult.getNnfzdydshzz());
zongji.setNnfzdydshzz ( Integer.parseInt( orhonShzz.getNnfzdys()) + zongji.getNnfzdydshzz());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setFzdys( Integer.parseInt( orhonShzz.getFzdxsl()) + tmpResult.getFzdys());
zongji.setFzdys( Integer.parseInt( orhonShzz.getFzdxsl()) + zongji.getFzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
if ( orhonShzz.getDjzdyxm()!= null) {
tmpResult.setXpdjgzzdys(tmpResult.getXpdjgzzdys() + 1);
zongji.setXpdjgzzdys(zongji.getXpdjgzzdys() + 1);
}
if ( orhonShzz.getDys()!= null && Integer.parseInt( orhonShzz.getDys())>0) {
tmpResult.setYdydshzz(tmpResult.getYdydshzz() + 1);
zongji.setYdydshzz(zongji.getYdydshzz() + 1);
}
}
else {
// 空或者不等于1的统统为未建立
//weidjzdyhdjzdzlxdshzz党建指导员或党建指导组联系的社会组织
// if (orhonShzz.getDys() != null && Integer.parseInt( orhonShzz.getDys()) >0) {
// tmpResult.setWeiydydshzz(tmpResult.getWeiydydshzz() + 1);
// zongji.setWeiydydshzz(zongji.getWeiydydshzz() + 1);
// }
if (orhonShzz.getIsgh() != null && "1".equals(orhonShzz.getIsgh())) {
tmpResult.setWeiyjlghzzdshzz(tmpResult.getWeiyjlghzzdshzz() + 1);
zongji.setWeiyjlghzzdshzz(zongji.getWeiyjlghzzdshzz() + 1);
}
if (orhonShzz.getIstzz() != null && "1".equals(orhonShzz.getIstzz())) {
tmpResult.setWeiyjlgqzzdshzz(tmpResult.getWeiyjlgqzzdshzz() + 1);
zongji.setWeiyjlgqzzdshzz(zongji.getWeiyjlgqzzdshzz() + 1);
}
if (orhonShzz.getIsjljcfnzz() != null && "1".equals(orhonShzz.getIsjljcfnzz())) {
tmpResult.setWeiyjlfnjczzdshzz(tmpResult.getWeiyjlfnjczzdshzz() + 1);
zongji.setWeiyjlfnjczzdshzz(zongji.getWeiyjlfnjczzdshzz() + 1);
}
// weihyzgbmzddshzz;行业主管部门指导的社会组织
// weismxz;苏木乡镇或街道社区党组织联系的社会组织
try {
tmpResult.setWeicyrs( Integer.parseInt( orhonShzz.getCyrs()) + tmpResult.getWeicyrs());
zongji.setWeicyrs( Integer.parseInt( orhonShzz.getCyrs()) + zongji.getWeicyrs());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeidys(Integer.parseInt(orhonShzz.getDys()) + tmpResult.getWeidys());
zongji.setWeidys(Integer.parseInt(orhonShzz.getDys()) + zongji.getWeidys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeinnfzdys( Integer.parseInt( orhonShzz.getNnfzdys()) + tmpResult.getWeinnfzdys());
zongji.setWeinnfzdys( Integer.parseInt( orhonShzz.getNnfzdys()) + zongji.getWeinnfzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
if ( orhonShzz.getDjzdyxm()!= null) {
tmpResult.setWeixpdjgzzdys(tmpResult.getWeixpdjgzzdys() + 1);
zongji.setWeixpdjgzzdys(zongji.getWeixpdjgzzdys() + 1);
}
}
}
List<ReportTwoResult> reportTwoResultList = new ArrayList<>(areaList.size());
reportTwoResultList.add(zongji);
for (SysDictData dictData : areaList) {
ReportTwoResult result = qiquMap.get(Long.parseLong(dictData.getDictValue()));
if(result == null){
result = new ReportTwoResult();
this.initResultTwo(result);
}
result.setAreaName(dictData.getDictLabel());
reportTwoResultList.add(result);
}
ReportTwoResult result = qiquMap.get(0l);
result.setAreaName("空");
reportTwoResultList.add(result);
rspData.setRows(reportTwoResultList);
rspData.setTotal(reportTwoResultList.size());
return rspData;
}
/**
* 第2个报表
* 社会组织“两个覆盖”专项行动摸底排查情况统计表
*/
@PostMapping("/twolb")
@ResponseBody
public TableDataInfo reporttwolb(){
SysDictData sysDictData = new SysDictData();
sysDictData.setDictType("orhon_shzz_type");
List<SysDictData> shzzTypeList = this.dictDataService.selectDictDataList(sysDictData);
TableDataInfo rspData = new TableDataInfo();
List<OrhonShzz> allShzz = this.orhonShzzService.selectOrhonShzzList(new OrhonShzz());
Map<String, ReportTwoResult> qiquMap = new HashMap<>(12);
ReportTwoResult zongji=new ReportTwoResult();
this.initResultTwo(zongji);
zongji.setType("总计");
for (OrhonShzz orhonShzz : allShzz) {
ReportTwoResult tmpResult = null;
if(orhonShzz.getType()==null) {
orhonShzz.setType("0");
}
if ( qiquMap.get(orhonShzz.getType()) == null) {
tmpResult = new ReportTwoResult();
this.initResultTwo(tmpResult);
......@@ -212,73 +740,91 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
tmpResult = qiquMap.get(orhonShzz.getType());
}
tmpResult.setDws(tmpResult.getDws() + 1);
zongji.setDws(zongji.getDws() + 1);
if ( orhonShzz.getIsdzz() != null && orhonShzz.getIsdzz().equals("1")) {
// 已建立党组织
tmpResult.setSl(tmpResult.getSl() + 1);
zongji.setSl(zongji.getSl() + 1);
tmpResult.setDdjldzzdshzz(tmpResult.getDdjldzzdshzz() + 1);
zongji.setDdjldzzdshzz(zongji.getDdjldzzdshzz() + 1);
if( orhonShzz.getIssqlh() != null && "1".equals(orhonShzz.getIssqlh())) {
tmpResult.setDdlghdshzz(tmpResult.getDdlghdshzz() + 1);
zongji.setDdlghdshzz(zongji.getDdlghdshzz() + 1);
}
if ( orhonShzz.getIsgh() != null && "1".equals(orhonShzz.getIsgh())) {
tmpResult.setYjlghzzdshzz(tmpResult.getYjlghzzdshzz() + 1);
zongji.setYjlghzzdshzz(zongji.getYjlghzzdshzz() + 1);
}
if (orhonShzz.getIstzz() != null && "1".equals(orhonShzz.getIstzz())) {
tmpResult.setYjlgqtzzdshzz(tmpResult.getYjlgqtzzdshzz() + 1);
zongji.setYjlgqtzzdshzz(zongji.getYjlgqtzzdshzz() + 1);
}
if (orhonShzz.getIsjljcfnzz() != null && "1".equals(orhonShzz.getIsjljcfnzz())) {
tmpResult.setYjlfnjjzzdshzz(tmpResult.getYjlfnjjzzdshzz() + 1);
zongji.setYjlfnjjzzdshzz(zongji.getYjlfnjjzzdshzz() + 1);
}
// djzdyhdjzdzlxdshzz党建指导员或党建指导组联系的社会组织
if (orhonShzz.getIshdzd() != null && ("1".equals(orhonShzz.getIshdzd())||"2".equals(orhonShzz.getIshdzd()))) {
tmpResult.setYgdhdcsdshzz(tmpResult.getYgdhdcsdshzz() + 1);
zongji.setYgdhdcsdshzz(zongji.getYgdhdcsdshzz() + 1);
}
if ( orhonShzz.getIshdzd() != null && "1".equals(orhonShzz.getIshdzd())) {
tmpResult.setDdjl(tmpResult.getDdjl() + 1);
zongji.setDdjl(zongji.getDdjl() + 1);
}
if (orhonShzz.getIshdzd() != null && "2".equals(orhonShzz.getIshdzd())) {
tmpResult.setLhjl(tmpResult.getLhjl() + 1);
zongji.setLhjl(zongji.getLhjl() + 1);
}
if (orhonShzz.getDzzlx() != null && "1".equals(orhonShzz.getDzzlx()) ) {
// 党委
tmpResult.setDwys(tmpResult.getDwys() + 1);
zongji.setDwys(zongji.getDwys() + 1);
} else if (orhonShzz.getDzzlx() != null && "3".equals(orhonShzz.getDzzlx()) ) {
// 党总支
tmpResult.setDzzs(tmpResult.getDzzs() + 1);
zongji.setDzzs(zongji.getDzzs() + 1);
}else if (orhonShzz.getDzzlx() != null && "2".equals(orhonShzz.getDzzlx()) ) {
// 党支部数
tmpResult.setDzbs(tmpResult.getDzbs() + 1);
zongji.setDzbs(zongji.getDzbs() + 1);
}
//bndxjldzzdshzz 本年度新建立党组织的社会组织
//bndxjlddzzs本年度新建立的党组织数
try {
tmpResult.setCyrysl( Integer.parseInt( orhonShzz.getCyrs()) + tmpResult.getCyrysl());
zongji.setCyrysl( Integer.parseInt( orhonShzz.getCyrs()) + zongji.getCyrysl());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setDys(Integer.parseInt(orhonShzz.getDys()) + tmpResult.getDys());
zongji.setDys(Integer.parseInt(orhonShzz.getDys()) + zongji.getDys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setNnfzdydshzz ( Integer.parseInt( orhonShzz.getNnfzdys()) + tmpResult.getNnfzdydshzz());
zongji.setNnfzdydshzz ( Integer.parseInt( orhonShzz.getNnfzdys()) + zongji.getNnfzdydshzz());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setFzdys( Integer.parseInt( orhonShzz.getFzdxsl()) + tmpResult.getFzdys());
zongji.setFzdys( Integer.parseInt( orhonShzz.getFzdxsl()) + zongji.getFzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
if ( orhonShzz.getDjzdyxm()!= null) {
tmpResult.setXpdjgzzdys(tmpResult.getXpdjgzzdys() + 1);
zongji.setXpdjgzzdys(zongji.getXpdjgzzdys() + 1);
}
if ( orhonShzz.getDys()!= null && Integer.parseInt( orhonShzz.getDys())>0) {
tmpResult.setYdydshzz(tmpResult.getYdydshzz() + 1);
zongji.setYdydshzz(zongji.getYdydshzz() + 1);
}
} else {
......@@ -287,39 +833,47 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
//weidjzdyhdjzdzlxdshzz党建指导员或党建指导组联系的社会组织
if (orhonShzz.getIsgh() != null && "1".equals(orhonShzz.getIsgh())) {
tmpResult.setWeiyjlghzzdshzz(tmpResult.getWeiyjlghzzdshzz() + 1);
zongji.setWeiyjlghzzdshzz(zongji.getWeiyjlghzzdshzz() + 1);
}
if (orhonShzz.getIstzz() != null && "1".equals(orhonShzz.getIstzz())) {
tmpResult.setWeiyjlgqzzdshzz(tmpResult.getWeiyjlgqzzdshzz() + 1);
zongji.setWeiyjlgqzzdshzz(zongji.getWeiyjlgqzzdshzz() + 1);
}
if (orhonShzz.getIsjljcfnzz() != null && "1".equals(orhonShzz.getIsjljcfnzz())) {
tmpResult.setWeiyjlfnjczzdshzz(tmpResult.getWeiyjlfnjczzdshzz() + 1);
zongji.setWeiyjlfnjczzdshzz(zongji.getWeiyjlfnjczzdshzz() + 1);
}
// weihyzgbmzddshzz;行业主管部门指导的社会组织
// weismxz;苏木乡镇或街道社区党组织联系的社会组织
try {
tmpResult.setWeicyrs( Integer.parseInt( orhonShzz.getCyrs()) + tmpResult.getWeicyrs());
zongji.setWeicyrs( Integer.parseInt( orhonShzz.getCyrs()) + zongji.getWeicyrs());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeidys(Integer.parseInt(orhonShzz.getDys()) + tmpResult.getWeidys());
zongji.setWeidys(Integer.parseInt(orhonShzz.getDys()) + zongji.getWeidys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
try {
tmpResult.setWeinnfzdys( Integer.parseInt( orhonShzz.getNnfzdys()) + tmpResult.getWeinnfzdys());
zongji.setWeinnfzdys( Integer.parseInt( orhonShzz.getNnfzdys()) + zongji.getWeinnfzdys());
} catch (NumberFormatException e ) {
// 数据问题先不管
}
if ( orhonShzz.getDjzdyxm()!= null) {
tmpResult.setWeixpdjgzzdys(tmpResult.getWeixpdjgzzdys() + 1);
zongji.setWeixpdjgzzdys(zongji.getWeixpdjgzzdys() + 1);
}
}
}
List<ReportTwoResult> reportTwoResultList = new ArrayList<>(shzzTypeList.size());
reportTwoResultList.add(zongji);
for (SysDictData dictData : shzzTypeList) {
ReportTwoResult result = qiquMap.get(dictData.getDictValue());
if(result == null){
......@@ -328,9 +882,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
}
result.setType(dictData.getDictLabel());
reportTwoResultList.add(result);
}
ReportTwoResult result = qiquMap.get("0");
result.setType("空");
reportTwoResultList.add(result);
rspData.setRows(reportTwoResultList);
rspData.setTotal(reportTwoResultList.size());
return rspData;
......@@ -362,6 +917,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
tmpResult.setXpdjgzzdys(0);
tmpResult.setYdydshzz(0);
tmpResult.setWeiydydshzz(0);
tmpResult.setWeidjzdyhdjzdzlxdshzz(0);
tmpResult.setWeiyjlghzzdshzz(0);
tmpResult.setWeiyjlgqzzdshzz(0);
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/ReportOneResult.java
......@@ -2,7 +2,9 @@ package com.ruoyi.web.controller.demo.domain;
public class ReportOneResult {
private String areaName;
private String type;
private Integer dwl;
private Integer sl;
private Integer ddjldzzdfgqy;
private Integer ddsqlhdfgqy;
......@@ -11,6 +13,8 @@ public class ReportOneResult {
private Integer yjlfnjczzdfgqy;
private Integer djzdyhdjzdzlxdfgqy;
private Integer ygdhdcsdfgqy;
private Integer jldzzzs;
private Integer ddjl;
private Integer lhjl;
private Integer dws;
......@@ -39,6 +43,22 @@ public class ReportOneResult {
private Integer gmysfgqy;
private Integer gmyxfgqy;
public Integer getJldzzzs() {
return jldzzzs;
}
public void setJldzzzs(Integer jldzzzs) {
this.jldzzzs = jldzzzs;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public Integer getGmysfgqy() {
return gmysfgqy;
}
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/ReportTwoResult.java
package com.ruoyi.web.controller.demo.domain;
public class ReportTwoResult {
private String areaName;
private String type;
private Integer dws;
private Integer sl;
......@@ -25,6 +26,7 @@ public class ReportTwoResult {
private Integer xpdjgzzdys;
private Integer ydydshzz;
private Integer weiydydshzz;
private Integer weidjzdyhdjzdzlxdshzz;
private Integer weiyjlghzzdshzz;
private Integer weiyjlgqzzdshzz;
......@@ -36,6 +38,22 @@ public class ReportTwoResult {
private Integer weinnfzdys;
private Integer weixpdjgzzdys;
public Integer getWeiydydshzz() {
return weiydydshzz;
}
public void setWeiydydshzz(Integer weiydydshzz) {
this.weiydydshzz = weiydydshzz;
}
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
public Integer getDzbs() {
return dzbs;
}
......
ruoyi-admin/src/main/resources/templates/demo/table/reportone.html
......@@ -29,11 +29,11 @@
{
title: '汇总信息',
align: 'center',
colspan: 4
colspan: 2
},{
title: '已建立党组织的',
align: 'center',
colspan: 20
colspan: 21
}, {
title: '未建立党组织的',
align: 'center',
......@@ -47,12 +47,6 @@
field: 'dwl',
title: '单位数量'
}, {
field: 'gmysfgqy',
title: '规模以上非公企业'
}, {
field: 'gmyxfgqy',
title: '规模以下非公企业'
}, {
field: 'sl',
title: '数量'
}, {
......@@ -77,6 +71,9 @@
field : 'ygdhdcsdfgqy',
title : '有固定活动场所的非公企业'
},{
field : 'jldzzzs',
title : '已建立党组织总数'
},{
field : 'ddjl',
title : '单独建立'
},{
......
ruoyi-admin/src/main/resources/templates/demo/table/reporttwo.html
......@@ -42,8 +42,8 @@
}
],
[ {
field: 'type',
title: '类别'
field: 'areaName',
title: '旗区'
}, {
field: 'dws',
title: '单位数'
......
ruoyi-admin/src/main/resources/templates/system/shzz/shzz.html
......@@ -131,6 +131,12 @@
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:shzz:export">
<i class="fa fa-download"></i> 导出
</a>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!-- <a-button >导入</a-button>-->
<!-- </a-upload>-->
<!-- <a class="btn btn-warning" onclick="$.table.importExcel()" shiro:hasPermission="system:shzz:importExcel">-->
<!-- <i class="fa fa-download"></i> 导入-->
<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
......
ruoyi-admin/target/classes/templates/demo/table/reportone.html
......@@ -29,11 +29,11 @@
{
title: '汇总信息',
align: 'center',
colspan: 4
colspan: 2
},{
title: '已建立党组织的',
align: 'center',
colspan: 20
colspan: 21
}, {
title: '未建立党组织的',
align: 'center',
......@@ -47,12 +47,6 @@
field: 'dwl',
title: '单位数量'
}, {
field: 'gmysfgqy',
title: '规模以上非公企业'
}, {
field: 'gmyxfgqy',
title: '规模以下非公企业'
}, {
field: 'sl',
title: '数量'
}, {
......@@ -77,6 +71,9 @@
field : 'ygdhdcsdfgqy',
title : '有固定活动场所的非公企业'
},{
field : 'jldzzzs',
title : '已建立党组织总数'
},{
field : 'ddjl',
title : '单独建立'
},{
......
ruoyi-admin/target/classes/templates/demo/table/reporttwo.html
......@@ -42,8 +42,8 @@
}
],
[ {
field: 'type',
title: '类别'
field: 'areaName',
title: '旗区'
}, {
field: 'dws',
title: '单位数'
......
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