Merge remote-tracking branch 'origin/V0.1.0' into V0.1.0

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

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