Skip to content

F
fgqyxxlr
Commit 0ca98c03 by liru
Options

新增有无党员 

统计表结构修改
parent a00f7559
Showing with 564 additions and 145 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/ReportController.java
...@@ -246,6 +246,9 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr ...@@ -246,6 +246,9 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
} else if (orhonShzz.getDzzlx() != null && "3".equals(orhonShzz.getDzzlx()) ) { } else if (orhonShzz.getDzzlx() != null && "3".equals(orhonShzz.getDzzlx()) ) {
// 党总支 // 党总支
tmpResult.setDzzs(tmpResult.getDzzs() + 1); tmpResult.setDzzs(tmpResult.getDzzs() + 1);
}else if (orhonShzz.getDzzlx() != null && "2".equals(orhonShzz.getDzzlx()) ) {
// 党支部数
tmpResult.setDzbs(tmpResult.getDzbs() + 1);
} }
//bndxjldzzdshzz 本年度新建立党组织的社会组织 //bndxjldzzdshzz 本年度新建立党组织的社会组织
//bndxjlddzzs本年度新建立的党组织数 //bndxjlddzzs本年度新建立的党组织数
...@@ -349,6 +352,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr ...@@ -349,6 +352,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
tmpResult.setLhjl(0); tmpResult.setLhjl(0);
tmpResult.setDwys(0); tmpResult.setDwys(0);
tmpResult.setDzzs(0); tmpResult.setDzzs(0);
tmpResult.setDzbs(0);
tmpResult.setBndxjldzzdshzz(0); tmpResult.setBndxjldzzdshzz(0);
tmpResult.setBndxjlddzzs(0); tmpResult.setBndxjlddzzs(0);
tmpResult.setCyrysl(0); tmpResult.setCyrysl(0);
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/ReportTwoResult.java
...@@ -15,6 +15,7 @@ public class ReportTwoResult { ...@@ -15,6 +15,7 @@ public class ReportTwoResult {
private Integer lhjl; private Integer lhjl;
private Integer dwys; private Integer dwys;
private Integer dzzs; private Integer dzzs;
private Integer dzbs;
private Integer bndxjldzzdshzz; private Integer bndxjldzzdshzz;
private Integer bndxjlddzzs; private Integer bndxjlddzzs;
private Integer cyrysl; private Integer cyrysl;
...@@ -35,6 +36,14 @@ public class ReportTwoResult { ...@@ -35,6 +36,14 @@ public class ReportTwoResult {
private Integer weinnfzdys; private Integer weinnfzdys;
private Integer weixpdjgzzdys; private Integer weixpdjgzzdys;
public Integer getDzbs() {
return dzbs;
}
public void setDzbs(Integer dzbs) {
this.dzbs = dzbs;
}
public Integer getYdydshzz() { public Integer getYdydshzz() {
return ydydshzz; return ydydshzz;
} }
......
ruoyi-admin/src/main/resources/templates/demo/table/reporteight.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -100,5 +100,19 @@ ...@@ -100,5 +100,19 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportfifteen.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -77,5 +77,18 @@ ...@@ -77,5 +77,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportfive.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
var isghDatas = [[${@dict.getType('is_gh')}]]; var isghDatas = [[${@dict.getType('is_gh')}]];
var istzzDatas = [[${@dict.getType('is_tzz')}]]; var istzzDatas = [[${@dict.getType('is_tzz')}]];
var ishdzdDatas = [[${@dict.getType('is_hdzd')}]]; var ishdzdDatas = [[${@dict.getType('is_hdzd')}]];
var isdzzDatas = [[${@dict.getType('is_dzz')}]];
var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]]; var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
var hymldm = [[${@dict.getType('hymldm')}]]; var hymldm = [[${@dict.getType('hymldm')}]];
var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]]; var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]];
...@@ -36,14 +35,14 @@ ...@@ -36,14 +35,14 @@
{ {
title: '汇总信息', title: '汇总信息',
align: 'center', align: 'center',
colspan: 20 colspan: 19
} }
], ],
[ [
{ {
title: '', title: '',
align: 'center', align: 'center',
colspan: 6 colspan: 7
},{ },{
title: '经营者', title: '经营者',
align: 'center', align: 'center',
...@@ -51,7 +50,7 @@ ...@@ -51,7 +50,7 @@
},{ },{
title: '', title: '',
align: 'center', align: 'center',
colspan: 7 colspan: 6
},{ },{
title: '党组织书记', title: '党组织书记',
align: 'center', align: 'center',
...@@ -78,6 +77,9 @@ ...@@ -78,6 +77,9 @@
field: 'zjse', field: 'zjse',
title: '注册资本（万元）' title: '注册资本（万元）'
}, { }, {
field: 'nyysr',
title: '年营业收入（万元）'
}, {
field: 'cyrs', field: 'cyrs',
title: '从业人员数量（名）' title: '从业人员数量（名）'
}, { }, {
...@@ -120,12 +122,6 @@ ...@@ -120,12 +122,6 @@
return $.table.selectDictLabel(ishdzdDatas, value); return $.table.selectDictLabel(ishdzdDatas, value);
} }
},{ },{
field : 'isdzz',
title : '是否建立党组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isdzzDatas, value);
}
},{
field : 'dzzjlsj', field : 'dzzjlsj',
title : '党组织建立日期' title : '党组织建立日期'
},{ },{
...@@ -150,5 +146,18 @@ ...@@ -150,5 +146,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportfour.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
var isghDatas = [[${@dict.getType('is_gh')}]]; var isghDatas = [[${@dict.getType('is_gh')}]];
var istzzDatas = [[${@dict.getType('is_tzz')}]]; var istzzDatas = [[${@dict.getType('is_tzz')}]];
var ishdzdDatas = [[${@dict.getType('is_hdzd')}]]; var ishdzdDatas = [[${@dict.getType('is_hdzd')}]];
var isdzzDatas = [[${@dict.getType('is_dzz')}]];
var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]]; var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]]; var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]];
...@@ -36,7 +35,7 @@ ...@@ -36,7 +35,7 @@
{ {
title: '汇总信息', title: '汇总信息',
align: 'center', align: 'center',
colspan: 20 colspan: 18
} }
], ],
[ [
...@@ -51,7 +50,7 @@ ...@@ -51,7 +50,7 @@
},{ },{
title: '', title: '',
align: 'center', align: 'center',
colspan: 7 colspan: 6
},{ },{
title: '党组织书记', title: '党组织书记',
align: 'center', align: 'center',
...@@ -59,7 +58,7 @@ ...@@ -59,7 +58,7 @@
},{ },{
title: '', title: '',
align: 'center', align: 'center',
colspan: 2 colspan: 1
} }
], ],
[ { [ {
...@@ -120,12 +119,6 @@ ...@@ -120,12 +119,6 @@
return $.table.selectDictLabel(ishdzdDatas, value); return $.table.selectDictLabel(ishdzdDatas, value);
} }
},{ },{
field : 'isdzz',
title : '是否建立党组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isdzzDatas, value);
}
},{
field : 'dzzjlsj', field : 'dzzjlsj',
title : '党组织建立日期' title : '党组织建立日期'
},{ },{
...@@ -143,9 +136,6 @@ ...@@ -143,9 +136,6 @@
},{ },{
field : 'sjdzz', field : 'sjdzz',
title : '上级党组织' title : '上级党组织'
},{
field : 'bnzcyzsjjyy',
title : '不能正常运转时间及原因'
} }
] ]
] ]
...@@ -153,5 +143,18 @@ ...@@ -153,5 +143,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportfourteen.html
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-6 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -76,5 +76,18 @@ ...@@ -76,5 +76,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportnine.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -100,5 +100,18 @@ ...@@ -100,5 +100,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportone.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
},{ },{
title: '已建立党组织的', title: '已建立党组织的',
align: 'center', align: 'center',
colspan: 19 colspan: 20
}, { }, {
title: '未建立党组织的', title: '未建立党组织的',
align: 'center', align: 'center',
colspan: 12 colspan: 11
} }
], ],
[ { [ {
...@@ -53,26 +53,29 @@ ...@@ -53,26 +53,29 @@
field: 'gmyxfgqy', field: 'gmyxfgqy',
title: '规模以下非公企业' title: '规模以下非公企业'
}, { }, {
field: 'sl',
title: '数量'
}, {
field: 'ddjldzzdfgqy', field: 'ddjldzzdfgqy',
title: '单独建立党组织' title: '单独建立党组织'
}, { }, {
field: 'ddsqlhdfgqy', field: 'ddsqlhdfgqy',
title: '双强六好' title: '达到“双强六好”的非公企业'
}, { }, {
field: 'yjlghzzdfgqy', field: 'yjlghzzdfgqy',
title: '已建立工会' title: '已建立工会组织的非公企业'
}, { }, {
field: 'yjlgqtzzdfgqy', field: 'yjlgqtzzdfgqy',
title: '已建立共青团' title: '已建立共青团组织的非公企业'
}, { }, {
field: 'yjlfnjczzdfgqy', field: 'yjlfnjczzdfgqy',
title: '妇女基础组织' title: '已建立妇女基层组织的非公企业'
},{ },{
field : 'djzdyhdjzdzlxdfgqy', field : 'djzdyhdjzdzlxdfgqy',
title : '党建指导员或党建指导组联系' title : '党建指导员或党建指导组联系的非公企业'
},{ },{
field : 'ygdhdcsdfgqy', field : 'ygdhdcsdfgqy',
title : '固定活动场所' title : '有固定活动场所的非公企业'
},{ },{
field : 'ddjl', field : 'ddjl',
title : '单独建立' title : '单独建立'
...@@ -87,13 +90,13 @@ ...@@ -87,13 +90,13 @@
title : '党总支数' title : '党总支数'
}, { }, {
field : 'dzbs', field : 'dzbs',
title : '党总支数' title : '党支部数'
},{ },{
field : 'bndxjldzzdfgqy', field : 'bndxjldzzdfgqy',
title : '本年度新建立党组织的' title : '本年度新建立党组织的非公企业'
}, { }, {
field : 'bndxjlddzzs', field : 'bndxjlddzzs',
title : '本年度建立的党组织数' title : '本年度新建立的党组织数'
}, { }, {
field : 'cyrysl', field : 'cyrysl',
title : '从业人员数' title : '从业人员数'
...@@ -102,7 +105,7 @@ ...@@ -102,7 +105,7 @@
title : '党员数' title : '党员数'
},{ },{
field : 'nnfzdydfgqy', field : 'nnfzdydfgqy',
title : '年内发展党员数' title : '年内发展党员的非公企业'
},{ },{
field : 'fzdys', field : 'fzdys',
title : '发展党员数' title : '发展党员数'
...@@ -111,25 +114,25 @@ ...@@ -111,25 +114,25 @@
title : '选派党建工作指导员数' title : '选派党建工作指导员数'
},{ },{
field : 'weiydydfgqy', field : 'weiydydfgqy',
title : '有党员' title : '有党员的非公企业'
},{ },{
field : 'weidjzdyhdjzdzlxdfgqy', field : 'weidjzdyhdjzdzlxdfgqy',
title : '党建指导员或党建指导组联系' title : '党建指导员或党建指导组联系的非公企业'
},{ },{
field : 'weiyjlghzzdfgqy', field : 'weiyjlghzzdfgqy',
title : '已建立工会组织' title : '已建立工会组织的非公企业'
},{ },{
field : 'weiyjlgqtzzdfgqy', field : 'weiyjlgqtzzdfgqy',
title : '已建立共青团组织' title : '已建立共青团组织的非公企业'
},{ },{
field : 'weiyjlfnjczzdfgqy', field : 'weiyjlfnjczzdfgqy',
title : '已建立妇女基层组织的' title : '已建立妇女基层组织的非公企业'
},{ },{
field : 'weihyzgbmzddfgqy', field : 'weihyzgbmzddfgqy',
title : '行业主管部门指导' title : '行业主管部门指导的非公企业'
},{ },{
field : 'weismxzhjdsqdzzlxdfgqy', field : 'weismxzhjdsqdzzlxdfgqy',
title : '苏木乡镇或街道社区党组织联系' title : '苏木乡镇或街道社区党组织联系的非公企业'
},{ },{
field : 'weicyrs', field : 'weicyrs',
title : '从业人数' title : '从业人数'
...@@ -150,5 +153,18 @@ ...@@ -150,5 +153,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportseven.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -153,5 +153,19 @@ ...@@ -153,5 +153,19 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportsix.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
{ {
title: '汇总信息', title: '汇总信息',
align: 'center', align: 'center',
colspan: 20 colspan: 21
} }
], ],
[ [
{ {
title: '', title: '',
align: 'center', align: 'center',
colspan: 6 colspan: 7
},{ },{
title: '法定代表人', title: '法定代表人',
align: 'center', align: 'center',
...@@ -79,6 +79,9 @@ ...@@ -79,6 +79,9 @@
field: 'zczbwy', field: 'zczbwy',
title: '注册资本（万元）' title: '注册资本（万元）'
}, { }, {
field: 'nyysr',
title: '年营业收入（万元）'
}, {
field: 'cyrs', field: 'cyrs',
title: '从业人员数量（名）' title: '从业人员数量（名）'
}, { }, {
...@@ -154,5 +157,18 @@ ...@@ -154,5 +157,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportthirteen.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -79,5 +79,18 @@ ...@@ -79,5 +79,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reportthree.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
{ {
title: '汇总信息', title: '汇总信息',
align: 'center', align: 'center',
colspan: 20 colspan: 19
} }
], ],
[ [
{ {
title: '', title: '',
align: 'center', align: 'center',
colspan: 6 colspan: 7
},{ },{
title: '法定代表人', title: '法定代表人',
align: 'center', align: 'center',
...@@ -78,6 +78,9 @@ ...@@ -78,6 +78,9 @@
field: 'zczbwy', field: 'zczbwy',
title: '注册资本（万元）' title: '注册资本（万元）'
}, { }, {
field: 'nyysr',
title: '年营业收入（万元）'
}, {
field: 'cyrs', field: 'cyrs',
title: '从业人员数量（名）' title: '从业人员数量（名）'
}, { }, {
...@@ -144,5 +147,18 @@ ...@@ -144,5 +147,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reporttwelve.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -78,5 +78,18 @@ ...@@ -78,5 +78,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/src/main/resources/templates/demo/table/reporttwo.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
field : 'dzzs', field : 'dzzs',
title : '党总支数' title : '党总支数'
},{ },{
field : 'dzbs',
title : '党支部数'
},{
field : 'bndxjldzzdshzz', field : 'bndxjldzzdshzz',
title : '本年度新建立党组织的社会组织' title : '本年度新建立党组织的社会组织'
}, { }, {
...@@ -145,5 +148,18 @@ ...@@ -145,5 +148,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reporteight.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
var prefix = ctx + "report"; var prefix = ctx + "report";
var datas = [[${@dict.getType('sys_normal_disable')}]]; var datas = [[${@dict.getType('sys_normal_disable')}]];
var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]]; var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
var isDzz = [[${@dict.getType('is_dzz')}]];
var isTzz = [[${@dict.getType('is_tzz')}]];
var isGh = [[${@dict.getType('is_gh')}]];
var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]];
$(function () { $(function () {
var options = { var options = {
...@@ -37,7 +41,10 @@ ...@@ -37,7 +41,10 @@
title: '非公企业/个体户名称' title: '非公企业/个体户名称'
}, { }, {
field: 'isdzz', field: 'isdzz',
title: '是否建立党组织' title: '是否建立党组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isDzz, value);
}
}, { }, {
field: 'dzzjlsj', field: 'dzzjlsj',
title: '建立党组织日期' title: '建立党组织日期'
...@@ -58,13 +65,22 @@ ...@@ -58,13 +65,22 @@
title: '上级党组织名称' title: '上级党组织名称'
}, { }, {
field: 'isgh', field: 'isgh',
title: '是否建立工会' title: '是否建立工会',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isGh, value);
}
}, { }, {
field: 'istzz', field: 'istzz',
title: '是否建立团组织' title: '是否建立团组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isTzz, value);
}
},{ },{
field : 'isjljcfnzz', field : 'isjljcfnzz',
title : '是否建立基层妇女组织' title : '是否建立基层妇女组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isJljcfnzz, value);
}
},{ },{
field : 'hjxx', field : 'hjxx',
title : '换届信息' title : '换届信息'
...@@ -84,5 +100,19 @@ ...@@ -84,5 +100,19 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportfifteen.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -77,5 +77,18 @@ ...@@ -77,5 +77,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportfive.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -19,8 +19,9 @@ ...@@ -19,8 +19,9 @@
var isghDatas = [[${@dict.getType('is_gh')}]]; var isghDatas = [[${@dict.getType('is_gh')}]];
var istzzDatas = [[${@dict.getType('is_tzz')}]]; var istzzDatas = [[${@dict.getType('is_tzz')}]];
var ishdzdDatas = [[${@dict.getType('is_hdzd')}]]; var ishdzdDatas = [[${@dict.getType('is_hdzd')}]];
var isdzzDatas = [[${@dict.getType('is_dzz')}]];
var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]]; var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
var hymldm = [[${@dict.getType('hymldm')}]];
var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]];
$(function () { $(function () {
var options = { var options = {
...@@ -34,14 +35,14 @@ ...@@ -34,14 +35,14 @@
{ {
title: '汇总信息', title: '汇总信息',
align: 'center', align: 'center',
colspan: 20 colspan: 19
} }
], ],
[ [
{ {
title: '', title: '',
align: 'center', align: 'center',
colspan: 6 colspan: 7
},{ },{
title: '经营者', title: '经营者',
align: 'center', align: 'center',
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
},{ },{
title: '', title: '',
align: 'center', align: 'center',
colspan: 7 colspan: 6
},{ },{
title: '党组织书记', title: '党组织书记',
align: 'center', align: 'center',
...@@ -65,7 +66,10 @@ ...@@ -65,7 +66,10 @@
title: '个体户名称' title: '个体户名称'
}, { }, {
field: 'hyml', field: 'hyml',
title: '个体户类型' title: '个体户类型',
formatter: function(value, row, index) {
return $.table.selectDictLabel(hymldm, value);
}
}, { }, {
field: 'djjg', field: 'djjg',
title: '登记机关' title: '登记机关'
...@@ -73,6 +77,9 @@ ...@@ -73,6 +77,9 @@
field: 'zjse', field: 'zjse',
title: '注册资本（万元）' title: '注册资本（万元）'
}, { }, {
field: 'nyysr',
title: '年营业收入（万元）'
}, {
field: 'cyrs', field: 'cyrs',
title: '从业人员数量（名）' title: '从业人员数量（名）'
}, { }, {
...@@ -104,7 +111,10 @@ ...@@ -104,7 +111,10 @@
} }
},{ },{
field : 'isjljcfnzz', field : 'isjljcfnzz',
title : '是否建立基层妇女组织' title : '是否建立基层妇女组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isJljcfnzz, value);
}
},{ },{
field : 'ishdzd', field : 'ishdzd',
title : '是否有活动阵地', title : '是否有活动阵地',
...@@ -112,12 +122,6 @@ ...@@ -112,12 +122,6 @@
return $.table.selectDictLabel(ishdzdDatas, value); return $.table.selectDictLabel(ishdzdDatas, value);
} }
},{ },{
field : 'isdzz',
title : '是否建立党组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isdzzDatas, value);
}
},{
field : 'dzzjlsj', field : 'dzzjlsj',
title : '党组织建立日期' title : '党组织建立日期'
},{ },{
...@@ -142,5 +146,18 @@ ...@@ -142,5 +146,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportfour.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
var isghDatas = [[${@dict.getType('is_gh')}]]; var isghDatas = [[${@dict.getType('is_gh')}]];
var istzzDatas = [[${@dict.getType('is_tzz')}]]; var istzzDatas = [[${@dict.getType('is_tzz')}]];
var ishdzdDatas = [[${@dict.getType('is_hdzd')}]]; var ishdzdDatas = [[${@dict.getType('is_hdzd')}]];
var isdzzDatas = [[${@dict.getType('is_dzz')}]];
var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]]; var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]];
$(function () { $(function () {
var options = { var options = {
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
{ {
title: '汇总信息', title: '汇总信息',
align: 'center', align: 'center',
colspan: 20 colspan: 18
} }
], ],
[ [
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
},{ },{
title: '', title: '',
align: 'center', align: 'center',
colspan: 7 colspan: 6
},{ },{
title: '党组织书记', title: '党组织书记',
align: 'center', align: 'center',
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
},{ },{
title: '', title: '',
align: 'center', align: 'center',
colspan: 2 colspan: 1
} }
], ],
[ { [ {
...@@ -108,7 +108,10 @@ ...@@ -108,7 +108,10 @@
} }
},{ },{
field : 'isjljcfnzz', field : 'isjljcfnzz',
title : '是否建立基层妇女组织' title : '是否建立基层妇女组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isJljcfnzz, value);
}
},{ },{
field : 'ishdzd', field : 'ishdzd',
title : '是否有活动阵地', title : '是否有活动阵地',
...@@ -116,12 +119,6 @@ ...@@ -116,12 +119,6 @@
return $.table.selectDictLabel(ishdzdDatas, value); return $.table.selectDictLabel(ishdzdDatas, value);
} }
},{ },{
field : 'isdzz',
title : '是否建立党组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isdzzDatas, value);
}
},{
field : 'dzzjlsj', field : 'dzzjlsj',
title : '党组织建立日期' title : '党组织建立日期'
},{ },{
...@@ -139,9 +136,6 @@ ...@@ -139,9 +136,6 @@
},{ },{
field : 'sjdzz', field : 'sjdzz',
title : '上级党组织' title : '上级党组织'
},{
field : 'bnzcyzsjjyy',
title : '不能正常运转时间及原因'
} }
] ]
] ]
...@@ -149,5 +143,18 @@ ...@@ -149,5 +143,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportfourteen.html
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-6 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
var prefix = ctx + "report"; var prefix = ctx + "report";
var datas = [[${@dict.getType('sys_normal_disable')}]]; var datas = [[${@dict.getType('sys_normal_disable')}]];
var ishdzdDatas = [[${@dict.getType('is_hdzd')}]]; var ishdzdDatas = [[${@dict.getType('is_hdzd')}]];
var isPdjzdy = [[${@dict.getType('orhon_isdy')}]];
$(function () { $(function () {
var options = { var options = {
...@@ -55,7 +56,10 @@ ...@@ -55,7 +56,10 @@
title: '本级匹配额（万元）' title: '本级匹配额（万元）'
},{ },{
field : 'sfpdjzdy', field : 'sfpdjzdy',
title : '是否派党建指导员' title : '是否派党建指导员',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isPdjzdy, value);
}
},{ },{
field : 'djzdyxm', field : 'djzdyxm',
title : '党建指导员姓名' title : '党建指导员姓名'
...@@ -72,5 +76,18 @@ ...@@ -72,5 +76,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportnine.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -100,5 +100,18 @@ ...@@ -100,5 +100,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportone.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
},{ },{
title: '已建立党组织的', title: '已建立党组织的',
align: 'center', align: 'center',
colspan: 19 colspan: 20
}, { }, {
title: '未建立党组织的', title: '未建立党组织的',
align: 'center', align: 'center',
colspan: 12 colspan: 11
} }
], ],
[ { [ {
...@@ -53,26 +53,29 @@ ...@@ -53,26 +53,29 @@
field: 'gmyxfgqy', field: 'gmyxfgqy',
title: '规模以下非公企业' title: '规模以下非公企业'
}, { }, {
field: 'sl',
title: '数量'
}, {
field: 'ddjldzzdfgqy', field: 'ddjldzzdfgqy',
title: '单独建立党组织' title: '单独建立党组织'
}, { }, {
field: 'ddsqlhdfgqy', field: 'ddsqlhdfgqy',
title: '双强六好' title: '达到“双强六好”的非公企业'
}, { }, {
field: 'yjlghzzdfgqy', field: 'yjlghzzdfgqy',
title: '已建立工会' title: '已建立工会组织的非公企业'
}, { }, {
field: 'yjlgqtzzdfgqy', field: 'yjlgqtzzdfgqy',
title: '已建立共青团' title: '已建立共青团组织的非公企业'
}, { }, {
field: 'yjlfnjczzdfgqy', field: 'yjlfnjczzdfgqy',
title: '妇女基础组织' title: '已建立妇女基层组织的非公企业'
},{ },{
field : 'djzdyhdjzdzlxdfgqy', field : 'djzdyhdjzdzlxdfgqy',
title : '党建指导员或党建指导组联系' title : '党建指导员或党建指导组联系的非公企业'
},{ },{
field : 'ygdhdcsdfgqy', field : 'ygdhdcsdfgqy',
title : '固定活动场所' title : '有固定活动场所的非公企业'
},{ },{
field : 'ddjl', field : 'ddjl',
title : '单独建立' title : '单独建立'
...@@ -87,13 +90,13 @@ ...@@ -87,13 +90,13 @@
title : '党总支数' title : '党总支数'
}, { }, {
field : 'dzbs', field : 'dzbs',
title : '党总支数' title : '党支部数'
},{ },{
field : 'bndxjldzzdfgqy', field : 'bndxjldzzdfgqy',
title : '本年度新建立党组织的' title : '本年度新建立党组织的非公企业'
}, { }, {
field : 'bndxjlddzzs', field : 'bndxjlddzzs',
title : '本年度建立的党组织数' title : '本年度新建立的党组织数'
}, { }, {
field : 'cyrysl', field : 'cyrysl',
title : '从业人员数' title : '从业人员数'
...@@ -102,7 +105,7 @@ ...@@ -102,7 +105,7 @@
title : '党员数' title : '党员数'
},{ },{
field : 'nnfzdydfgqy', field : 'nnfzdydfgqy',
title : '年内发展党员数' title : '年内发展党员的非公企业'
},{ },{
field : 'fzdys', field : 'fzdys',
title : '发展党员数' title : '发展党员数'
...@@ -111,25 +114,25 @@ ...@@ -111,25 +114,25 @@
title : '选派党建工作指导员数' title : '选派党建工作指导员数'
},{ },{
field : 'weiydydfgqy', field : 'weiydydfgqy',
title : '有党员' title : '有党员的非公企业'
},{ },{
field : 'weidjzdyhdjzdzlxdfgqy', field : 'weidjzdyhdjzdzlxdfgqy',
title : '党建指导员或党建指导组联系' title : '党建指导员或党建指导组联系的非公企业'
},{ },{
field : 'weiyjlghzzdfgqy', field : 'weiyjlghzzdfgqy',
title : '已建立工会组织' title : '已建立工会组织的非公企业'
},{ },{
field : 'weiyjlgqtzzdfgqy', field : 'weiyjlgqtzzdfgqy',
title : '已建立共青团组织' title : '已建立共青团组织的非公企业'
},{ },{
field : 'weiyjlfnjczzdfgqy', field : 'weiyjlfnjczzdfgqy',
title : '已建立妇女基层组织的' title : '已建立妇女基层组织的非公企业'
},{ },{
field : 'weihyzgbmzddfgqy', field : 'weihyzgbmzddfgqy',
title : '行业主管部门指导' title : '行业主管部门指导的非公企业'
},{ },{
field : 'weismxzhjdsqdzzlxdfgqy', field : 'weismxzhjdsqdzzlxdfgqy',
title : '苏木乡镇或街道社区党组织联系' title : '苏木乡镇或街道社区党组织联系的非公企业'
},{ },{
field : 'weicyrs', field : 'weicyrs',
title : '从业人数' title : '从业人数'
...@@ -150,5 +153,18 @@ ...@@ -150,5 +153,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportseven.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
var ishdzdDatas = [[${@dict.getType('is_hdzd')}]]; var ishdzdDatas = [[${@dict.getType('is_hdzd')}]];
var isdzzDatas = [[${@dict.getType('is_dzz')}]]; var isdzzDatas = [[${@dict.getType('is_dzz')}]];
var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]]; var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]];
$(function () { $(function () {
var options = { var options = {
...@@ -108,7 +109,10 @@ ...@@ -108,7 +109,10 @@
} }
},{ },{
field : 'isjljcfnzz', field : 'isjljcfnzz',
title : '是否建立基层妇女组织' title : '是否建立基层妇女组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isJljcfnzz, value);
}
},{ },{
field : 'ishdzd', field : 'ishdzd',
title : '是否有活动阵地', title : '是否有活动阵地',
...@@ -149,5 +153,19 @@ ...@@ -149,5 +153,19 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportsix.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
var ishdzdDatas = [[${@dict.getType('is_hdzd')}]]; var ishdzdDatas = [[${@dict.getType('is_hdzd')}]];
var isdzzDatas = [[${@dict.getType('is_dzz')}]]; var isdzzDatas = [[${@dict.getType('is_dzz')}]];
var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]]; var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]];
var isDy = [[${@dict.getType('orhon_isdy')}]];
$(function () { $(function () {
...@@ -35,14 +37,14 @@ ...@@ -35,14 +37,14 @@
{ {
title: '汇总信息', title: '汇总信息',
align: 'center', align: 'center',
colspan: 20 colspan: 21
} }
], ],
[ [
{ {
title: '', title: '',
align: 'center', align: 'center',
colspan: 6 colspan: 7
},{ },{
title: '法定代表人', title: '法定代表人',
align: 'center', align: 'center',
...@@ -77,6 +79,9 @@ ...@@ -77,6 +79,9 @@
field: 'zczbwy', field: 'zczbwy',
title: '注册资本（万元）' title: '注册资本（万元）'
}, { }, {
field: 'nyysr',
title: '年营业收入（万元）'
}, {
field: 'cyrs', field: 'cyrs',
title: '从业人员数量（名）' title: '从业人员数量（名）'
}, { }, {
...@@ -90,7 +95,10 @@ ...@@ -90,7 +95,10 @@
title: '法定代表人联系方式' title: '法定代表人联系方式'
}, { }, {
field: 'isdy', field: 'isdy',
title: '法定代表人是否为党员' title: '法定代表人是否为党员',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isDy, value);
}
},{ },{
field : 'isgh', field : 'isgh',
title : '是否建立工会', title : '是否建立工会',
...@@ -105,7 +113,10 @@ ...@@ -105,7 +113,10 @@
} }
},{ },{
field : 'isjljcfnzz', field : 'isjljcfnzz',
title : '是否建立基层妇女组织' title : '是否建立基层妇女组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isJljcfnzz, value);
}
},{ },{
field : 'ishdzd', field : 'ishdzd',
title : '是否有活动阵地', title : '是否有活动阵地',
...@@ -146,5 +157,18 @@ ...@@ -146,5 +157,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportthirteen.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -79,5 +79,18 @@ ...@@ -79,5 +79,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reportthree.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
var ishdzdDatas = [[${@dict.getType('is_hdzd')}]]; var ishdzdDatas = [[${@dict.getType('is_hdzd')}]];
var isdzzDatas = [[${@dict.getType('is_dzz')}]]; var isdzzDatas = [[${@dict.getType('is_dzz')}]];
var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]]; var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
var isJljcfnzz = [[${@dict.getType('is_jcfnzz')}]];
$(function () { $(function () {
var options = { var options = {
...@@ -35,14 +36,14 @@ ...@@ -35,14 +36,14 @@
{ {
title: '汇总信息', title: '汇总信息',
align: 'center', align: 'center',
colspan: 20 colspan: 19
} }
], ],
[ [
{ {
title: '', title: '',
align: 'center', align: 'center',
colspan: 6 colspan: 7
},{ },{
title: '法定代表人', title: '法定代表人',
align: 'center', align: 'center',
...@@ -77,6 +78,9 @@ ...@@ -77,6 +78,9 @@
field: 'zczbwy', field: 'zczbwy',
title: '注册资本（万元）' title: '注册资本（万元）'
}, { }, {
field: 'nyysr',
title: '年营业收入（万元）'
}, {
field: 'cyrs', field: 'cyrs',
title: '从业人员数量（名）' title: '从业人员数量（名）'
}, { }, {
...@@ -108,7 +112,10 @@ ...@@ -108,7 +112,10 @@
} }
},{ },{
field : 'isjljcfnzz', field : 'isjljcfnzz',
title : '是否建立基层妇女组织' title : '是否建立基层妇女组织',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isJljcfnzz, value);
}
},{ },{
field : 'ishdzd', field : 'ishdzd',
title : '是否有活动阵地', title : '是否有活动阵地',
...@@ -140,5 +147,18 @@ ...@@ -140,5 +147,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reporttwelve.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "report"; var prefix = ctx + "report";
var datas = [[${@dict.getType('sys_normal_disable')}]]; var datas = [[${@dict.getType('sys_normal_disable')}]];
var ywDy = [[${@dict.getType('yw_dy')}]];
$(function () { $(function () {
var options = { var options = {
...@@ -36,7 +37,10 @@ ...@@ -36,7 +37,10 @@
title: '非公企业/个体户名称' title: '非公企业/个体户名称'
}, { }, {
field: 'ywdy', field: 'ywdy',
title: '有无党员' title: '有无党员',
formatter: function(value, row, index) {
return $.table.selectDictLabel(ywDy, value);
}
}, { }, {
field: 'dys', field: 'dys',
title: '党员数量' title: '党员数量'
...@@ -74,5 +78,18 @@ ...@@ -74,5 +78,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/demo/table/reporttwo.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table style="table-layout: fixed;width: 100%;" id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
field : 'dzzs', field : 'dzzs',
title : '党总支数' title : '党总支数'
},{ },{
field : 'dzbs',
title : '党支部数'
},{
field : 'bndxjldzzdshzz', field : 'bndxjldzzdshzz',
title : '本年度新建立党组织的社会组织' title : '本年度新建立党组织的社会组织'
}, { }, {
...@@ -145,5 +148,18 @@ ...@@ -145,5 +148,18 @@
$.table.init(options); $.table.init(options);
}); });
</script> </script>
<style>
.fixed-table-container tbody td .th-inner, .fixed-table-container thead th .th-inner {
white-space: break-spaces;
text-align: center;
margin: 0 auto;
}
td, th {
word-wrap: break-word;
}
.bootstrap-table .table>thead>tr>th {
vertical-align:middle;/*设置垂直居中*/
}
</style>
</body> </body>
</html> </html>
ruoyi-admin/target/classes/templates/system/fgqy/add.html
...@@ -585,9 +585,9 @@ ...@@ -585,9 +585,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">有无党员：</label> <label class="col-sm-3 control-label">有无党员：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}"> <div class="radio-box" th:each="dict : ${@dict.getType('yw_dy')}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="ywdy" th:value="${dict.dictValue}" th:checked="${dict.default}"> <input type="radio" th:id="${'ywdy_' + dict.dictCode}" name="ywdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> <label th:for="${'ywdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
ruoyi-admin/target/classes/templates/system/fgqy/edit.html
...@@ -587,9 +587,9 @@ ...@@ -587,9 +587,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">有无党员：</label> <label class="col-sm-3 control-label">有无党员：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}"> <div class="radio-box" th:each="dict : ${@dict.getType('yw_dy')}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="ywdy" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{ywdy}"> <input type="radio" th:id="${'ywdy_' + dict.dictCode}" name="ywdy" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{ywdy}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> <label th:for="${'ywdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
ruoyi-admin/target/classes/templates/system/shzz/add.html
...@@ -669,9 +669,9 @@ ...@@ -669,9 +669,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">有无党员：</label> <label class="col-sm-3 control-label">有无党员：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}"> <div class="radio-box" th:each="dict : ${@dict.getType('yw_dy')}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="ywdy" th:value="${dict.dictValue}" th:checked="${dict.default}"> <input type="radio" th:id="${'ywdy_' + dict.dictCode}" name="ywdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> <label th:for="${'ywdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
ruoyi-admin/target/classes/templates/system/shzz/edit.html
...@@ -659,9 +659,9 @@ ...@@ -659,9 +659,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">有无党员：</label> <label class="col-sm-3 control-label">有无党员：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}"> <div class="radio-box" th:each="dict : ${@dict.getType('yw_dy')}">
<input type="radio" th:field="*{ywdy}" th:id="${'isdy_' + dict.dictCode}" name="ywdy" th:value="${dict.dictValue}" th:checked="${dict.default}"> <input type="radio" th:field="*{ywdy}" th:id="${'ywdy_' + dict.dictCode}" name="ywdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> <label th:for="${'ywdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonGtxx.java
...@@ -214,6 +214,17 @@ public class OrhonGtxx extends BaseEntity ...@@ -214,6 +214,17 @@ public class OrhonGtxx extends BaseEntity
/** 党费账户*/ /** 党费账户*/
@Excel(name = "党费账户") @Excel(name = "党费账户")
private String dfzh; private String dfzh;
/** 年营业收入（万元） */
@Excel(name = "年营业收入", readConverterExp = "万=元")
private String nyysr;
public String getNyysr() {
return nyysr;
}
public void setNyysr(String nyysr) {
this.nyysr = nyysr;
}
public String getId() { public String getId() {
return id; return id;
......
ruoyi-system/src/main/resources/mapper/system/OrhonGtxxMapper.xml
...@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dzzsdgx" column="dzzsdgx" /> <result property="dzzsdgx" column="dzzsdgx" />
<result property="hjxx" column="hjxx" /> <result property="hjxx" column="hjxx" />
<result property="dfzh" column="dfzh" /> <result property="dfzh" column="dfzh" />
<result property="nyysr" column="nyysr" />
</resultMap> </resultMap>
<sql id="selectOrhonGtxxVo"> <sql id="selectOrhonGtxxVo">
...@@ -134,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -134,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dzzsdgx != null "> and dzzsdgx = #{dzzsdgx}</if> <if test="dzzsdgx != null "> and dzzsdgx = #{dzzsdgx}</if>
<if test="hjxx != null "> and hjxx = #{hjxx}</if> <if test="hjxx != null "> and hjxx = #{hjxx}</if>
<if test="dfzh != null "> and dfzh = #{dfzh}</if> <if test="dfzh != null "> and dfzh = #{dfzh}</if>
<if test="nyysr != null "> and nyysr = #{nyysr}</if>
</where> </where>
</select> </select>
...@@ -206,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -206,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dzzsdgx != null">dzzsdgx,</if> <if test="dzzsdgx != null">dzzsdgx,</if>
<if test="hjxx != null">hjxx,</if> <if test="hjxx != null">hjxx,</if>
<if test="dfzh != null">dfzh,</if> <if test="dfzh != null">dfzh,</if>
<if test="nyysr != null">nyysr,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
...@@ -269,6 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -269,6 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dzzsdgx != null">#{dzzsdgx},</if> <if test="dzzsdgx != null">#{dzzsdgx},</if>
<if test="hjxx != null">#{hjxx},</if> <if test="hjxx != null">#{hjxx},</if>
<if test="dfzh != null">#{dfzh},</if> <if test="dfzh != null">#{dfzh},</if>
<if test="nyysr != null">#{nyysr},</if>
</trim> </trim>
</insert> </insert>
...@@ -335,6 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -335,6 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dzzsdgx != null">dzzsdgx = #{dzzsdgx},</if> <if test="dzzsdgx != null">dzzsdgx = #{dzzsdgx},</if>
<if test="hjxx != null">hjxx = #{hjxx},</if> <if test="hjxx != null">hjxx = #{hjxx},</if>
<if test="dfzh != null">dfzh = #{dfzh},</if> <if test="dfzh != null">dfzh = #{dfzh},</if>
<if test="nyysr != null">nyysr = #{nyysr},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
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