更改ga38统计

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -94,12 +94,12 @@ public class SysDeptController extends BaseController {
         }
         try {
             // 设置响应头
-            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("物防建设达标情况汇总", "utf-8"));
+            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("物防建设达标情况明细", "utf-8"));
             response.setContentType("application/octet-stream;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
             // 数据导出
             EasyExcel.write(response.getOutputStream(), ConstructionDetailExport.class)
-                    .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("物防建设达标情况汇总").doWrite(constructionDetailExports);
+                    .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("物防建设达标情况明细").doWrite(constructionDetailExports);
         } catch (Exception e) {
             // 重置response
             response.reset();
@@ -155,11 +155,11 @@ public class SysDeptController extends BaseController {
         }
         try {
             // 设置响应头
-            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("物防建设达标情况明细", "utf-8"));
+            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("物防建设达标情况汇总", "utf-8"));
             response.setContentType("application/octet-stream;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
             // 数据导出
-            EasyExcel.write(response.getOutputStream(), OrgPhysicalDefenseConstructionExport.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("物防建设达标情况明细").doWrite(excel);
+            EasyExcel.write(response.getOutputStream(), OrgPhysicalDefenseConstructionExport.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("物防建设达标情况汇总").doWrite(excel);
         } catch (Exception e) {
             // 重置response
             response.reset();

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -166,6 +166,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         OrgPhysicalDefenseConstructionExport export = null;
         for (SysOrg s : orgs) {
             export = baseMapper.complianceStatus(s.getPath());
+            export.setCity(s.getAffiliatedArea());
+            export.setOrgName(s.getAffiliatedBank());
             Integer orgSize = baseMapper.selectNetworkNumberByPath(s.getPath());
             Double avg = 0d;
             if (orgSize != 0 || export.getReachNumber() != 0) {

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -730,9 +730,7 @@ and
                             '%'
                         ),
                     '0%'
-                ) AS reachRate,
-            b.affiliated_area  as city,
-            b.affiliated_bank as org_name
+                ) AS reachRate
         FROM
             sys_org_physical_defense_construction a
                 INNER JOIN sys_org b ON a.org_id = b.id AND b.deleted=0 AND b.is_lock=0