个体户修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/ReportController.java

@@ -482,6 +482,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
             orhonFgqy.setDeptId(sysUser.getUserDeptId().longValue());
             orhonGtxx.setDeptId(sysUser.getUserDeptId());
         }
+        orhonFgqy.setIsdzz("1");
         java.util.List<com.ruoyi.system.domain.OrhonFgqy> listOrhonFgqy = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
         List<ReportEightResult>  list1=new ArrayList<>();
         for(OrhonFgqy f:listOrhonFgqy){
@@ -490,6 +491,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
             list1.add(r);
         }
         BeanUtils.copyProperties(listOrhonFgqy, list1);
+        orhonGtxx.setIsdzz("1");
         List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
         List<ReportEightResult>  list2=new ArrayList<>();
         for(OrhonGtxx gtxx:listOrhonGtxx){
@@ -530,6 +532,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
             orhonFgqy.setDeptId(sysUser.getUserDeptId().longValue());
             orhonGtxx.setDeptId(sysUser.getUserDeptId());
         }
+        orhonFgqy.setIsdzz("1");
         java.util.List<com.ruoyi.system.domain.OrhonFgqy> listOrhonFgqy = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
         List<ReportTwelveResult>  list1=new ArrayList<>();
         for(OrhonFgqy f:listOrhonFgqy){
@@ -537,6 +540,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
             BeanUtils.copyProperties(f, r);
             list1.add(r);
         }
+        orhonGtxx.setIsdzz("1");
         List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
         List<ReportTwelveResult>  list2=new ArrayList<>();
         for(OrhonGtxx gtxx:listOrhonGtxx){
@@ -574,6 +578,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
             orhonFgqy.setDeptId(sysUser.getUserDeptId().longValue());
             orhonGtxx.setDeptId(sysUser.getUserDeptId());
         }
+        orhonFgqy.setIsdzz("1");
         java.util.List<com.ruoyi.system.domain.OrhonFgqy> listOrhonFgqy = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
         List<ReportFourteenResult>  list1=new ArrayList<>();
         for(OrhonFgqy f:listOrhonFgqy){
@@ -581,6 +586,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
             BeanUtils.copyProperties(f, r);
             list1.add(r);
         }
+        orhonGtxx.setIsdzz("1");
         List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
         List<ReportFourteenResult>  list2=new ArrayList<>();
         for(OrhonGtxx gtxx:listOrhonGtxx){
@@ -617,6 +623,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
             orhonFgqy.setDeptId(sysUser.getUserDeptId().longValue());
             orhonGtxx.setDeptId(sysUser.getUserDeptId());
         }
+        orhonFgqy.setIsdzz("1");
         java.util.List<com.ruoyi.system.domain.OrhonFgqy> listOrhonFgqy = orhonFgqyService.selectOrhonFgqyList(orhonFgqy);
         List<ReportSixteenResult>  list1=new ArrayList<>();
         for(OrhonFgqy f:listOrhonFgqy){
@@ -624,6 +631,7 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
             BeanUtils.copyProperties(f, r);
             list1.add(r);
         }
+        orhonGtxx.setIsdzz("1");
         List<OrhonGtxx> listOrhonGtxx = orhonGtxxService.selectOrhonGtxxList(orhonGtxx);
         List<ReportSixteenResult>  list2=new ArrayList<>();
         for(OrhonGtxx gtxx:listOrhonGtxx){
@@ -640,4 +648,20 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
         list.addAll(list2);
         return getDataTable(list);
     }
+    /**
+     * 有党组织的社会组织列表
+     */
+    @PostMapping("/shzzList")
+    @ResponseBody
+    public TableDataInfo shzzList(OrhonShzz orhonShzz)
+    {
+        SysUser sysUser = ShiroUtils.getSysUser();
+        startPage();
+        if ( !sysUser.getLoginName().equals("admin") ) {
+            orhonShzz.setDeptId(sysUser.getUserDeptId().longValue());
+        }
+        orhonShzz.setIsdzz("1");
+        java.util.List<com.ruoyi.system.domain.OrhonShzz> list = orhonShzzService.selectOrhonShzzList(orhonShzz);
+        return getDataTable(list);
+    }
 }

ruoyi-admin/src/main/resources/templates/demo/table/reportfifteen.html

@@ -13,14 +13,14 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
-    var prefix = ctx + "system/shzz";
+    var prefix = ctx + "report";
     var datas = [[${@dict.getType('sys_normal_disable')}]];
     var isHdzdDatas = [[${@dict.getType('is_hdzd')}]];
 
 
     $(function () {
         var options = {
-            url: prefix + "/list",
+            url: prefix + "/shzzList",
             showSearch: false,
             showRefresh: false,
             showToggle: false,

ruoyi-admin/src/main/resources/templates/demo/table/reportnine.html

@@ -13,13 +13,13 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
-    var prefix = ctx + "system/shzz";
+    var prefix = ctx + "report";
     var datas = [[${@dict.getType('sys_normal_disable')}]];
     var dzzlxDatas = [[${@dict.getType('orhon_dzzlx')}]];
 
     $(function () {
         var options = {
-            url: prefix + "/list",
+            url: prefix + "/shzzList",
             showSearch: false,
             showRefresh: false,
             showToggle: false,

ruoyi-admin/src/main/resources/templates/demo/table/reportseventeen.html

@@ -13,13 +13,13 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
-    var prefix = ctx + "system/shzz";
+    var prefix = ctx + "report";
     var datas = [[${@dict.getType('sys_normal_disable')}]];
     var issqlhDatas = [[${@dict.getType('is_sqlh')}]];
 
     $(function () {
         var options = {
-            url: prefix + "/list",
+            url: prefix + "/shzzList",
             showSearch: false,
             showRefresh: false,
             showToggle: false,

ruoyi-admin/src/main/resources/templates/demo/table/reportthirteen.html

@@ -13,12 +13,12 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
-    var prefix = ctx + "system/shzz";
+    var prefix = ctx + "report";
     var datas = [[${@dict.getType('sys_normal_disable')}]];
 
     $(function () {
         var options = {
-            url: prefix + "/list",
+            url: prefix + "/shzzList",
             showSearch: false,
             showRefresh: false,
             showToggle: false,