Revert "行社用户导出物防建设达标情况汇总和安全保卫工作情况统计添加合计"

This reverts commit 20c13863a65ef8222092dd66b9ac8c2379c564fe.

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

@@ -205,25 +205,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
          *根据查询机构机构，统计查询数据
          */
         List<OrgPhysicalDefenseConstructionExport> excelData = getExcelData(sysOrgs,allChildOrgs,allOrgGA38Datas);
-        //如果是登录用户是行社，需要添加合计
-        if(Objects.equals(sysOrg.getType(), OrgTypeEnum.HANG_SHE.getCode()) && excelData.size() > 0){
-            OrgPhysicalDefenseConstructionExport export = new OrgPhysicalDefenseConstructionExport();
-            export.setNetworkNumber(excelData.stream().mapToInt(OrgPhysicalDefenseConstructionExport::getNetworkNumber).sum());
-            export.setReachNumber(excelData.stream().mapToInt(OrgPhysicalDefenseConstructionExport::getReachNumber).sum());
-            export.setOldReachNumber(excelData.stream().mapToInt(OrgPhysicalDefenseConstructionExport::getOldReachNumber).sum());
-            export.setNewReachNumber(excelData.stream().mapToInt(OrgPhysicalDefenseConstructionExport::getNewReachNumber).sum());
-            export.setNewYearReachNumber(excelData.stream().mapToInt(OrgPhysicalDefenseConstructionExport::getNewYearReachNumber).sum());
-            export.setNewYeaTransformOldReachNumber(excelData.stream().mapToInt(OrgPhysicalDefenseConstructionExport::getNewYeaTransformOldReachNumber).sum());
-            export.setNewYeaTransformInconformityNumber(excelData.stream().mapToInt(OrgPhysicalDefenseConstructionExport::getNewYeaTransformInconformityNumber).sum());
-            //达标率
-            Double avg = 0d;
-            if (export.getNewReachNumber() != 0 || export.getReachNumber() != 0) {
-                avg = (double) export.getReachNumber() / export.getNetworkNumber() * 100;
-            }
-            export.setReachRate(Double.valueOf(String.format("%.2f", avg)) + "%");
-            excelData.add(export);
-        }
-
         return excelData;
     }
 
@@ -580,12 +561,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             securityWorkExport.setQuarterAllNetworkDrillPeopleNumber(quarterAllNetworkDrillPeopleNumber);
             securityWorkExportList.add(securityWorkExport);
         });
-        //如果是登录用户是行社，需要添加合计
-        if(Objects.equals(org.getType(), OrgTypeEnum.HANG_SHE.getCode()) && securityWorkExportList.size() > 0){
-            SecurityWorkExport export = getHeJiRow(securityWorkExportList);
-            securityWorkExportList.add(export);
-        }
-
         return securityWorkExportList;
     }
 
@@ -1500,62 +1475,4 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         }
         return org.getAffiliatedArea()+"-"+org.getAffiliatedBank()+"-"+org.getShortName();
     }
-
-    private SecurityWorkExport getHeJiRow(List<SecurityWorkExport> securityWorkExportList){
-        SecurityWorkExport export = new SecurityWorkExport();
-        export.setNetworkNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getNetworkNumber).sum());
-        export.setReachNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getReachNumber).sum());
-        export.setOwnPropertyNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getOwnPropertyNumber).sum());
-        export.setAreaOutsideNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getAreaOutsideNumber).sum());
-        export.setBusinessLibraryTotal(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getBusinessLibraryTotal).sum());
-        export.setOneLibrary(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getOneLibrary).sum());
-        export.setTwoLibrary(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getTwoLibrary).sum());
-        export.setThreeLibrary(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getThreeLibrary).sum());
-        export.setFourLibrary(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getFourLibrary).sum());
-        export.setCollectLibrary(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getCollectLibrary).sum());
-        export.setOnLineTotal(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getOnLineTotal).sum());
-        export.setOnLineReachNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getOnLineReachNumber).sum());
-        export.setDepartureTotal(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getDepartureTotal).sum());
-        export.setDepartureReachNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getDepartureReachNumber).sum());
-        export.setSelfServiceDevicesTotal(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getSelfServiceDevicesTotal).sum());
-        export.setOnLineLobbyImplement(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getOnLineLobbyImplement).sum());
-        export.setOnLineThroughWalls(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getOnLineThroughWalls).sum());
-        export.setDepartureLobbyImplement(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getDepartureLobbyImplement).sum());
-        export.setDepartureThroughWalls(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getDepartureThroughWalls).sum());
-        export.setCameraTotal(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getCameraTotal).sum());
-        export.setDefinitionNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getDefinitionNumber).sum());
-        export.setCashAddingRoom(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getCashAddingRoom).sum());
-        export.setRemoteCount(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getRemoteCount).sum());
-        export.setCashAddingRoomControlCount(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getCashAddingRoomControlCount).sum());
-        export.setRemoteControlCount(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getRemoteControlCount).sum());
-        export.setLocalDutyNetworkNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getLocalDutyNetworkNumber).sum());
-        export.setRemoteDutyNetworkNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getRemoteDutyNetworkNumber).sum());
-        export.setManagerFullTime(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getManagerFullTime).sum());
-        export.setManagerPartTime(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getManagerPartTime).sum());
-        export.setManagerCertificate(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getManagerCertificate).sum());
-        export.setMonitorTotal(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getMonitorTotal).sum());
-        export.setInnerPeople(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getInnerPeople).sum());
-        export.setOutPeople(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getOutPeople).sum());
-        export.setCertificatePeopleNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getCertificatePeopleNumber).sum());
-        export.setCertificateTotal(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getCertificateTotal).sum());
-        export.setInternalCertificateNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getInternalCertificateNumber).sum());
-        export.setOutsourceCertificateNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getOutsourceCertificateNumber).sum());
-        export.setHaveSecurityNetworkNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getHaveSecurityNetworkNumber).sum());
-        export.setSafeHeadToNetwork(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getSafeHeadToNetwork).sum());
-        export.setSafeNetworkToPeople(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getSafeNetworkToPeople).sum());
-        export.setJointHeadToNetwork(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getJointHeadToNetwork).sum());
-        export.setJointNetworkToPeople(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getJointNetworkToPeople).sum());
-        export.setHeadSafeCheckNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getHeadSafeCheckNumber).sum());
-        export.setHeadSafeCheckNetworkNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getHeadSafeCheckNetworkNumber).sum());
-        export.setFoundDangerNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getFoundDangerNumber).sum());
-        export.setRectificationDangerNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getRectificationDangerNumber).sum());
-        export.setNoRectificationDangerNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getNoRectificationDangerNumber).sum());
-        export.setQuarterSelfInspectNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getQuarterSelfInspectNumber).sum());
-        export.setQuarterSafetyEducationNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getQuarterSafetyEducationNumber).sum());
-        export.setQuarterDrillNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getQuarterDrillNumber).sum());
-        export.setQuarterAllNetworkDrillNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getQuarterAllNetworkDrillNumber).sum());
-        export.setQuarterAllNetworkDrillPeopleNumber(securityWorkExportList.stream().mapToInt(SecurityWorkExport::getQuarterAllNetworkDrillPeopleNumber).sum());
-
-        return export;
-    }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityWorkExport.java

@@ -26,43 +26,43 @@ public class SecurityWorkExport {
     @ExcelProperty(value = {"项目", "单位"}, index = 2)
     private String orgName;
     @ExcelProperty(value = {"营业网点总数", "营业网点总量"}, index = 3)
-    private Integer networkNumber = 0;
+    private Integer networkNumber;
     @ExcelProperty(value = {"营业网点总数", "营业网点达标数量（符合GA38-2015、2021标准）"}, index = 4)
-    private Integer reachNumber = 0;
+    private Integer reachNumber;
     @ExcelProperty(value = {"营业网点总数", "自有产权网点数"}, index = 5)
-    private Integer ownPropertyNumber = 0;
+    private Integer ownPropertyNumber;
     @ExcelProperty(value = {"营业网点总数", "区域外网点数"}, index = 6)
-    private Integer areaOutsideNumber = 0;
+    private Integer areaOutsideNumber;
     @ExcelProperty(value = {"业务库", "业务库总量"}, index = 7)
-    private Integer businessLibraryTotal = 0;
+    private Integer businessLibraryTotal;
     @ExcelProperty(value = {"业务库", "一类库"}, index = 8)
-    private Integer oneLibrary = 0;
+    private Integer oneLibrary;
     @ExcelProperty(value = {"业务库", "二类库"}, index = 9)
-    private Integer twoLibrary = 0;
+    private Integer twoLibrary;
     @ExcelProperty(value = {"业务库", "三类库"}, index = 10)
-    private Integer threeLibrary = 0;
+    private Integer threeLibrary;
     @ExcelProperty(value = {"业务库", "四类库"}, index = 11)
-    private Integer fourLibrary = 0;
+    private Integer fourLibrary;
     @ExcelProperty(value = "保管箱库", index = 12)
-    private Integer collectLibrary = 0;
+    private Integer collectLibrary;
     @ExcelProperty(value = {"自助银行", "在行式总量"}, index = 13)
-    private Integer onLineTotal = 0;
+    private Integer onLineTotal;
     @ExcelProperty(value = {"自助银行", "在行式达标数量（符合GA38-2021标准）"}, index = 14)
-    private Integer onLineReachNumber = 0;
+    private Integer onLineReachNumber;
     @ExcelProperty(value = {"自助银行", "离行式总量"}, index = 15)
-    private Integer departureTotal = 0;
+    private Integer departureTotal;
     @ExcelProperty(value = {"自助银行", "离行式达标数量（符合GA38-2021标准）"}, index = 16)
-    private Integer departureReachNumber = 0;
+    private Integer departureReachNumber;
     @ExcelProperty(value = {"自助设备", "自助设备总数"}, index = 17)
-    private Integer selfServiceDevicesTotal = 0;
+    private Integer selfServiceDevicesTotal;
     @ExcelProperty(value = {"自助设备", "在行式大堂式机具"}, index = 18)
-    private Integer onLineLobbyImplement = 0;
+    private Integer onLineLobbyImplement;
     @ExcelProperty(value = {"自助设备", "在行式穿墙式机具"}, index = 19)
-    private Integer onLineThroughWalls = 0;
+    private Integer onLineThroughWalls;
     @ExcelProperty(value = {"自助设备", "离行式大堂式机具"}, index = 20)
-    private Integer departureLobbyImplement = 0;
+    private Integer departureLobbyImplement;
     @ExcelProperty(value = {"自助设备", "离行式穿墙式机具"}, index = 21)
-    private Integer departureThroughWalls = 0;
+    private Integer departureThroughWalls;
     @ExcelProperty(value = {"监控中心建设", "中心建设时间（年）"}, index = 22)
     private String centerConstructionTime;
     @ExcelProperty(value = {"监控中心建设", "监控平台最近一次升级改造时间（年)"}, index = 23)
@@ -70,81 +70,81 @@ public class SecurityWorkExport {
     @ExcelProperty(value = {"监控中心建设", "监控中心平台品牌"}, index = 24)
     private String brand;
     @ExcelProperty(value = {"监控中心建设", "视频监控摄像头总路数"}, index = 25)
-    private Integer cameraTotal = 0;
+    private Integer cameraTotal;
     @ExcelProperty(value = {"监控中心建设", "视频监控摄像头高清摄像机路数"}, index = 26)
-    private Integer definitionNumber = 0;
+    private Integer definitionNumber;
     @ExcelProperty(value = {"监控中心建设", "未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 27)
-    private Integer cashAddingRoom = 0;
+    private Integer cashAddingRoom;
     @ExcelProperty(value = {"监控中心建设", "未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 28)
-    private Integer remoteCount = 0;
+    private Integer remoteCount;
     @ExcelProperty(value = {"监控中心建设", "实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 29)
-    private Integer cashAddingRoomControlCount = 0;
+    private Integer cashAddingRoomControlCount;
     @ExcelProperty(value = {"监控中心建设", "实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 30)
-    private Integer remoteControlCount = 0;
+    private Integer remoteControlCount;
     @ExcelProperty(value = {"营业网点夜间值守", "本地值守网点数量(由员工进行同楼异地值守)"}, index = 31)
-    private Integer localDutyNetworkNumber = 0;
+    private Integer localDutyNetworkNumber;
     @ExcelProperty(value = {"营业网点夜间值守", "异地值守网点数量（由监控中心进行远程值守）"}, index = 32)
-    private Integer remoteDutyNetworkNumber = 0;
+    private Integer remoteDutyNetworkNumber;
     @ExcelProperty(value = {"机构及人员配备", "是否设立独立机构数"}, index = 33)
     private String isAlone;
     @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为专职人数"}, index = 34)
-    private Integer managerFullTime = 0;
+    private Integer managerFullTime;
     @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为兼职人数"}, index = 35)
-    private Integer managerPartTime = 0;
+    private Integer managerPartTime;
     @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人安保持证人数"}, index = 36)
-    private Integer managerCertificate = 0;
+    private Integer managerCertificate;
     @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "是否设专（兼）职主任"}, index = 37)
     private String isLeader;
     @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "是否设专（兼）职技术维护岗"}, index = 38)
     private String isTechnology;
     @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "人员合计"}, index = 39)
-    private Integer monitorTotal = 0;
+    private Integer monitorTotal;
     @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "其中，内部员工人数（含派遣）"}, index = 40)
-    private Integer innerPeople = 0;
+    private Integer innerPeople;
     @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "其中，外聘员工人数"}, index = 41)
-    private Integer outPeople = 0;
+    private Integer outPeople;
     @ExcelProperty(value = {"机构及人员配备", "监控中心安保卫持证人数"}, index = 42)
-    private Integer certificatePeopleNumber = 0;
+    private Integer certificatePeopleNumber;
     @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "人员合计"}, index = 43)
-    private Integer certificateTotal = 0;
+    private Integer certificateTotal;
     @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "其中，内部保安人数（含派遣）"}, index = 44)
-    private Integer internalCertificateNumber = 0;
+    private Integer internalCertificateNumber;
     @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "其中，外聘保安人数"}, index = 45)
-    private Integer outsourceCertificateNumber = 0;
+    private Integer outsourceCertificateNumber;
     @ExcelProperty(value = {"机构及人员配备", "配有保安网点数"}, index = 46)
-    private Integer haveSecurityNetworkNumber = 0;
+    private Integer haveSecurityNetworkNumber;
     @ExcelProperty(value = {"责任制落实", "各级治安保卫责任书签订情况（份）", "总行（联社）与各职能部门、营业网点签订数"}, index = 47)
-    private Integer safeHeadToNetwork = 0;
+    private Integer safeHeadToNetwork;
     @ExcelProperty(value = {"责任制落实", "各级治安保卫责任书签订情况（份）", "各职能部门、营业网点与各员工签订数"}, index = 48)
-    private Integer safeNetworkToPeople = 0;
+    private Integer safeNetworkToPeople;
     @ExcelProperty(value = {"责任制落实", "各级联防协议书签订情况（份）", "总行（联社）与当地机关、单位或居民签订协议书数量"}, index = 49)
-    private Integer jointHeadToNetwork = 0;
+    private Integer jointHeadToNetwork;
     @ExcelProperty(value = {"责任制落实", "各级联防协议书签订情况（份）", " 各营业网点（离行式自助银行）与当地机关、单位或居民签订协议书数量"}, index = 50)
-    private Integer jointNetworkToPeople = 0;
+    private Integer jointNetworkToPeople;
     @ExcelProperty(value = {"总行（联社）安全检查 ", "组织开展检查次数"}, index = 51)
-    private Integer headSafeCheckNumber = 0;
+    private Integer headSafeCheckNumber;
     @ExcelProperty(value = {"总行（联社）安全检查 ", "检查网点数量"}, index = 52)
-    private Integer headSafeCheckNetworkNumber = 0;
+    private Integer headSafeCheckNetworkNumber;
     @ExcelProperty(value = {"总行（联社）安全检查 ", "发现隐患数"}, index = 53)
-    private Integer foundDangerNumber = 0;
+    private Integer foundDangerNumber;
     @ExcelProperty(value = {"总行（联社）安全检查 ", "已整改隐患数"}, index = 54)
-    private Integer rectificationDangerNumber = 0;
+    private Integer rectificationDangerNumber;
     @ExcelProperty(value = {"总行（联社）安全检查 ", "未整改隐患数(包含待整改、已逾期、逾期整改)"}, index = 55)
-    private Integer noRectificationDangerNumber = 0;
+    private Integer noRectificationDangerNumber;
     @ExcelProperty(value = {"营业网点安全检查", "本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）"}, index = 56)
-    private Integer quarterSelfInspectNumber = 0;
+    private Integer quarterSelfInspectNumber;
     @ExcelProperty(value = {"安全教育", "本季度总行(联社)组织开展安全教育次数"}, index = 57)
-    private Integer quarterSafetyEducationNumber = 0;
+    private Integer quarterSafetyEducationNumber;
 //    @ExcelProperty(value = {"安全教育", "共计参与安全教育员工人次"}, index = 58)
 //    private Integer safetyEducationPeopleNumber;
     @ExcelProperty(value = {"总行（联社）预案演练", "本季度开展预案演练次数"}, index = 58)
-    private Integer quarterDrillNumber = 0;
+    private Integer quarterDrillNumber;
 //    @ExcelProperty(value = {"总行（联社）预案演练", "参与预案演练员工人次"}, index = 60)
 //    private Integer quarterDrillPeopleNumber;
     @ExcelProperty(value = {"营业网点预案演练", "本季度辖内所有营业网点开展预案演练次数（每个网点演练次数的累计数）"}, index = 59)
-    private Integer quarterAllNetworkDrillNumber = 0;
+    private Integer quarterAllNetworkDrillNumber;
     @ExcelProperty(value = {"营业网点预案演练", "辖内所有营业网点参与预案演练员工人次"}, index = 60)
-    private Integer quarterAllNetworkDrillPeopleNumber = 0;
+    private Integer quarterAllNetworkDrillPeopleNumber;
 
 
 }