统计12修改

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/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: '单位数'