根据以上三种业务库值守方式，修改安全工作统计情况表样式统计规则及样式（统计包含所有业务库值守方式，网点业务库及行社中心业务库）

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

@@ -200,6 +200,8 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
         sysOrgExtend.setUpdateTime(DateUtils.getNowDate());
         sysOrgExtendMapper.delete(new LambdaQueryWrapper<SysOrgExtend>().eq(SysOrgExtend::getOrgId,sysOrgExtend.getOrgId()));
         sysOrgExtend.setId(null);
+        // 清除缓存
+        RedisUtils.deleteObject(CacheConstants.ORG_EXTEND_CACHE_CONCAT_INFO+sysOrgExtend.getOrgId());
         return sysOrgExtendMapper.insert(sysOrgExtend);
     }
 

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

@@ -479,6 +479,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             Map duty = baseMapper.getDuty(s.getPath());
             securityWorkExport.setLocalDutyNetworkNumber(Integer.valueOf(duty.get("localDutyNetworkNumber").toString()));
             securityWorkExport.setRemoteDutyNetworkNumber(Integer.valueOf(duty.get("remoteDutyNetworkNumber").toString()));
+            securityWorkExport.setSameFloorRemoteDutyNetworkNumber(Integer.valueOf(duty.get("sameFloorRemoteDutyNetworkNumber").toString()));
 
 
 

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

@@ -81,69 +81,71 @@ public class SecurityWorkExport {
     private Integer cashAddingRoomControlCount;
     @ExcelProperty(value = {"监控中心建设", "实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 30)
     private Integer remoteControlCount;
-    @ExcelProperty(value = {"营业网点夜间值守", "本地值守网点数量(由员工进行同楼异地值守)"}, index = 31)
+    @ExcelProperty(value = {"业务库值守", "本地值守数量"}, index = 31)
     private Integer localDutyNetworkNumber;
-    @ExcelProperty(value = {"营业网点夜间值守", "异地值守网点数量（由监控中心进行远程值守）"}, index = 32)
+    @ExcelProperty(value = {"业务库值守", "远程异地值守数量"}, index = 32)
     private Integer remoteDutyNetworkNumber;
-    @ExcelProperty(value = {"机构及人员配备", "是否设立独立机构数"}, index = 33)
+    @ExcelProperty(value = {"业务库值守", "同楼异地值守数量"}, index = 33)
+    private Integer sameFloorRemoteDutyNetworkNumber;
+    @ExcelProperty(value = {"机构及人员配备", "是否设立独立机构数"}, index = 34)
     private String isAlone;
-    @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为专职人数"}, index = 34)
+    @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为专职人数"}, index = 35)
     private Integer managerFullTime;
-    @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为兼职人数"}, index = 35)
+    @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为兼职人数"}, index = 36)
     private Integer managerPartTime;
-    @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人安保持证人数"}, index = 36)
+    @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人安保持证人数"}, index = 37)
     private Integer managerCertificate;
-    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "是否设专（兼）职主任"}, index = 37)
+    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "是否设专（兼）职主任"}, index = 38)
     private String isLeader;
-    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "是否设专（兼）职技术维护岗"}, index = 38)
+    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "是否设专（兼）职技术维护岗"}, index = 39)
     private String isTechnology;
-    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "人员合计"}, index = 39)
+    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "人员合计"}, index = 40)
     private Integer monitorTotal;
-    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "其中，内部员工人数（含派遣）"}, index = 40)
+    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "其中，内部员工人数（含派遣）"}, index = 41)
     private Integer innerPeople;
-    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "其中，外聘员工人数"}, index = 41)
+    @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "其中，外聘员工人数"}, index = 42)
     private Integer outPeople;
-    @ExcelProperty(value = {"机构及人员配备", "监控中心安全保卫持证人数"}, index = 42)
+    @ExcelProperty(value = {"机构及人员配备", "监控中心安全保卫持证人数"}, index = 43)
     private Integer certificatePeopleNumber;
-    @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "人员合计"}, index = 43)
+    @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "人员合计"}, index = 44)
     private Integer certificateTotal;
-    @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "其中，内部保安人数（含派遣）"}, index = 44)
+    @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "其中，内部保安人数（含派遣）"}, index = 45)
     private Integer internalCertificateNumber;
-    @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "其中，外聘保安人数"}, index = 45)
+    @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "其中，外聘保安人数"}, index = 46)
     private Integer outsourceCertificateNumber;
-    @ExcelProperty(value = {"机构及人员配备", "配有保安网点数"}, index = 46)
+    @ExcelProperty(value = {"机构及人员配备", "配有保安网点数"}, index = 47)
     private Integer haveSecurityNetworkNumber;
-    @ExcelProperty(value = {"责任制落实", "各级治安保卫责任书签订情况（份）", "总行（联社）与各职能部门、营业网点签订数"}, index = 47)
+    @ExcelProperty(value = {"责任制落实", "各级治安保卫责任书签订情况（份）", "总行（联社）与各职能部门、营业网点签订数"}, index = 48)
     private Integer safeHeadToNetwork;
-    @ExcelProperty(value = {"责任制落实", "各级治安保卫责任书签订情况（份）", "各职能部门、营业网点与各员工签订数"}, index = 48)
+    @ExcelProperty(value = {"责任制落实", "各级治安保卫责任书签订情况（份）", "各职能部门、营业网点与各员工签订数"}, index = 49)
     private Integer safeNetworkToPeople;
-    @ExcelProperty(value = {"责任制落实", "各级联防协议书签订情况（份）", "总行（联社）与当地机关、单位或居民签订协议书数量"}, index = 49)
+    @ExcelProperty(value = {"责任制落实", "各级联防协议书签订情况（份）", "总行（联社）与当地机关、单位或居民签订协议书数量"}, index = 50)
     private Integer jointHeadToNetwork;
-    @ExcelProperty(value = {"责任制落实", "各级联防协议书签订情况（份）", " 各营业网点（离行式自助银行）与当地机关、单位或居民签订协议书数量"}, index = 50)
+    @ExcelProperty(value = {"责任制落实", "各级联防协议书签订情况（份）", " 各营业网点（离行式自助银行）与当地机关、单位或居民签订协议书数量"}, index = 51)
     private Integer jointNetworkToPeople;
-    @ExcelProperty(value = {"总行（联社）安全检查 ", "组织开展检查次数"}, index = 51)
+    @ExcelProperty(value = {"总行（联社）安全检查 ", "组织开展检查次数"}, index = 52)
     private Integer headSafeCheckNumber;
-    @ExcelProperty(value = {"总行（联社）安全检查 ", "检查网点数量"}, index = 52)
+    @ExcelProperty(value = {"总行（联社）安全检查 ", "检查网点数量"}, index = 53)
     private Integer headSafeCheckNetworkNumber;
-    @ExcelProperty(value = {"总行（联社）安全检查 ", "发现隐患数"}, index = 53)
+    @ExcelProperty(value = {"总行（联社）安全检查 ", "发现隐患数"}, index = 54)
     private Integer foundDangerNumber;
-    @ExcelProperty(value = {"总行（联社）安全检查 ", "已整改隐患数"}, index = 54)
+    @ExcelProperty(value = {"总行（联社）安全检查 ", "已整改隐患数"}, index = 55)
     private Integer rectificationDangerNumber;
-    @ExcelProperty(value = {"总行（联社）安全检查 ", "未整改隐患数(包含待整改、已逾期、逾期整改)"}, index = 55)
+    @ExcelProperty(value = {"总行（联社）安全检查 ", "未整改隐患数(包含待整改、已逾期、逾期整改)"}, index = 56)
     private Integer noRectificationDangerNumber;
-    @ExcelProperty(value = {"营业网点安全检查", "本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）"}, index = 56)
+    @ExcelProperty(value = {"营业网点安全检查", "本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）"}, index = 57)
     private Integer quarterSelfInspectNumber;
-    @ExcelProperty(value = {"安全教育", "本季度总行(联社)组织开展安全教育次数"}, index = 57)
+    @ExcelProperty(value = {"安全教育", "本季度总行(联社)组织开展安全教育次数"}, index = 58)
     private Integer quarterSafetyEducationNumber;
 //    @ExcelProperty(value = {"安全教育", "共计参与安全教育员工人次"}, index = 58)
 //    private Integer safetyEducationPeopleNumber;
-    @ExcelProperty(value = {"总行（联社）预案演练", "本季度开展预案演练次数"}, index = 58)
+    @ExcelProperty(value = {"总行（联社）预案演练", "本季度开展预案演练次数"}, index = 59)
     private Integer quarterDrillNumber;
 //    @ExcelProperty(value = {"总行（联社）预案演练", "参与预案演练员工人次"}, index = 60)
 //    private Integer quarterDrillPeopleNumber;
-    @ExcelProperty(value = {"营业网点预案演练", "本季度辖内所有营业网点开展预案演练次数（每个网点演练次数的累计数）"}, index = 59)
+    @ExcelProperty(value = {"营业网点预案演练", "本季度辖内所有营业网点开展预案演练次数（每个网点演练次数的累计数）"}, index = 60)
     private Integer quarterAllNetworkDrillNumber;
-    @ExcelProperty(value = {"营业网点预案演练", "辖内所有营业网点参与预案演练员工人次"}, index = 60)
+    @ExcelProperty(value = {"营业网点预案演练", "辖内所有营业网点参与预案演练员工人次"}, index = 61)
     private Integer quarterAllNetworkDrillPeopleNumber;
 
 

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

@@ -1073,16 +1073,16 @@ and
     </select>
     <select id="getDuty" resultType="java.util.Map">
         SELECT
-            IFNULL( SUM( IF ( duty_mode = 2, 1, 0 )), 0 ) AS localDutyNetworkNumber,
-            IFNULL( SUM( IF ( duty_mode = 1, 1, 0 )), 0 ) AS remoteDutyNetworkNumber
+            IFNULL( SUM( IF ( duty_mode = 1, 1, 0 )), 0 ) AS remoteDutyNetworkNumber,
+            IFNULL( SUM( IF ( duty_mode = 2, 1, 0 )), 0 ) AS sameFloorRemoteDutyNetworkNumber,
+            IFNULL( SUM( IF ( duty_mode = 3, 1, 0 )), 0 ) AS localDutyNetworkNumber
         FROM
             sys_org_extend a
                 LEFT JOIN sys_org b ON a.org_id = b.id
         WHERE
-            1=1
-          and b.deleted = 0
+          b.deleted = 0
           and b.is_lock = 0
-          and b.type = 4
+          and b.type IN (4,6)
           and b.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getCertificate" resultType="java.util.Map">