修改缺陷

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskOneVo.java

@@ -43,28 +43,28 @@ public class CoreMonitoringRetrievalTaskOneVo {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "开始时间")
     private Date planStartTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "结束时间")
     private Date planEndTime;
 
     /**
      * 调阅开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "调阅开始时间")
     private Date startTime;
 
     /**
      * 调阅结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "调阅结束时间")
     private Date endTime;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysOrgMapper.java

@@ -128,13 +128,24 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
     Map getDuty(String orgPath);
 
     Map getCertificate(String orgPath);
+    Integer getHaveSecurityNetworkNumber(String orgPath);
+
     Map getMonitorPeople(String orgPath);
-Integer getAlone(String orgPath);
+
+    Integer getAlone(String orgPath);
+
     Integer getManagerCertificate(String orgPath);
-    String getIsMonitor(@Param("orgPath") String orgPath,@Param("duties") String duties);
-Integer getManager(@Param("orgPath") String orgPath,@Param("isFull") String isFull);
+
+    String getIsMonitor(@Param("orgPath") String orgPath, @Param("duties") String duties);
+
+    Integer getManager(@Param("orgPath") String orgPath, @Param("isFull") String isFull);
+
     Integer getSafe(@Param("orgPath") String orgPath, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
+    Integer getSafeHeadToNetwork(@Param("type") Integer type, @Param("level") Integer level, @Param("orgPath") String orgPath);
+
+    Integer getJointHeadToNetwork(@Param("type") Integer type, @Param("level") Integer level, @Param("orgPath") String orgPath);
+
     Integer getEduNumber(@Param("orgPath") String orgPath, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     Integer getEduUser(String orgPath);

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

@@ -221,11 +221,11 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             securityWorkExport.setDepartureThroughWalls(Integer.valueOf(selfEquipment.get("departureThroughWalls").toString()));
             //中心建设时间
             Map centerConstruction = baseMapper.getCenterConstruction(s.getId());
-         if (null!=centerConstruction){
-             securityWorkExport.setCenterConstructionTime(centerConstruction.get("centerConstructionTime").toString());
-             securityWorkExport.setTransformTime(centerConstruction.get("transformTime").toString());
-             securityWorkExport.setBrand(centerConstruction.get("brand").toString());
-         }
+            if (null != centerConstruction) {
+                securityWorkExport.setCenterConstructionTime(centerConstruction.get("centerConstructionTime").toString());
+                securityWorkExport.setTransformTime(centerConstruction.get("transformTime").toString());
+                securityWorkExport.setBrand(centerConstruction.get("brand").toString());
+            }
 
             //高清摄像头
             Map camera = baseMapper.getCamera(s.getPath());
@@ -266,6 +266,21 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             securityWorkExport.setCertificateTotal(Integer.valueOf(certificate.get("certificateTotal").toString()));
             securityWorkExport.setInternalCertificateNumber(Integer.valueOf(certificate.get("internalCertificateNumber").toString()));
             securityWorkExport.setOutsourceCertificateNumber(Integer.valueOf(certificate.get("outsourceCertificateNumber").toString()));
+            //配有保安网点数
+            Integer haveSecurityNetworkNumber = baseMapper.getHaveSecurityNetworkNumber(s.getPath());
+            securityWorkExport.setHaveSecurityNetworkNumber(haveSecurityNetworkNumber);
+
+            //安全责任总到网
+            Integer safeHeadToNetwork = baseMapper.getSafeHeadToNetwork(1, 1, s.getPath());
+            securityWorkExport.setSafeHeadToNetwork(safeHeadToNetwork);
+            Integer safeHeadToNetwork1 = baseMapper.getSafeHeadToNetwork(1, 2, s.getPath());
+            securityWorkExport.setJointNetworkToPeople(safeHeadToNetwork1);
+            Integer jointHeadToNetwork = baseMapper.getJointHeadToNetwork(2, 1, s.getPath());
+            securityWorkExport.setJointHeadToNetwork(jointHeadToNetwork);
+            Integer jointHeadToNetwork1 = baseMapper.getJointHeadToNetwork(2, 2, s.getPath());
+            securityWorkExport.setJointNetworkToPeople(jointHeadToNetwork1);
+            //总行安全检查
+
             //安全检查
             DateTime beginOfQuarter = DateUtil.beginOfQuarter(new java.util.Date());
             DateTime endOfQuarter = DateUtil.endOfQuarter(new Date());

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

@@ -109,6 +109,14 @@ public class SecurityWorkExport {
     private Integer outsourceCertificateNumber;
     @ExcelProperty(value = {"机构及人员配备","配有保安网点数"}, index = 44)
     private Integer haveSecurityNetworkNumber;
+    @ExcelProperty(value = {"责任制落实","各级治安保卫责任书签订情况（份）","总行（联社）与各职能部门、营业网点签订数"}, index = 44)
+private Integer safeHeadToNetwork;
+    @ExcelProperty(value = {"责任制落实","各级治安保卫责任书签订情况（份）","各职能部门、营业网点与各员工签订数"}, index = 44)
+    private Integer safeNetworkToPeople;
+    @ExcelProperty(value = {"责任制落实","各级联防协议书签订情况（份）","总行（联社）与当地机关、单位或居民签订协议书数量"}, index = 44)
+    private Integer jointHeadToNetwork;
+    @ExcelProperty(value = {"责任制落实","各级联防协议书签订情况（份）"," 各营业网点（离行式自助银行）与当地机关、单位或居民签订协议书数量"}, index = 44)
+    private Integer jointNetworkToPeople;
     @ExcelProperty(value = {"营业网点安全检查","本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）"}, index = 45)
     private Integer quarterSelfInspectNumber;
     @ExcelProperty(value =  {"安全教育","本季度度总行(联社)组织开展安全教育次数"}, index = 46)

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

@@ -1071,6 +1071,46 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             a.duties IN ( 2, 4, 5 )
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
+    <select id="getSafeHeadToNetwork" resultType="java.lang.Integer">
+        SELECT
+            COUNT( a.id )
+        FROM
+            core_safety_book_new a
+                LEFT JOIN sys_org b ON a.party_b_org = b.id
+        WHERE
+            type = #{type}
+          AND sign_level = #{level}
+          AND b.path LIKE concat(#{orgPath}, '%')
+    </select>
+    <select id="getJointHeadToNetwork" resultType="java.lang.Integer">
+        SELECT
+            COUNT( a.id )
+        FROM
+            core_safety_book_new a
+                LEFT JOIN sys_org b ON a.party_a_org = b.id
+        WHERE
+            a.type = #{type}
+          AND a.sign_level = #{level}
+          AND b.path LIKE concat(#{orgPath}, '%')
+    </select>
+    <select id="getHaveSecurityNetworkNumber" resultType="java.lang.Integer">
+        SELECT
+            COUNT( 1 )
+        FROM
+            sys_org
+        WHERE
+                id IN (
+                SELECT
+                    IF
+                        ( SUM( a.inner_count )+ SUM( a.outside_count )> 0, b.id, 0 )
+                FROM
+                    sys_org_extend a
+                        LEFT JOIN sys_org b ON a.org_id = b.id
+                WHERE
+                    b.path LIKE concat(#{orgPath}, '%')
+                GROUP BY
+                    a.id)
+    </select>
 
 
 </mapper>