机构补充信息和GA38信息导出修改

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

@@ -526,7 +526,7 @@ public class SysDeptController extends BaseController {
     }
 
     /**
-     * 机构补充信息导出
+     * GA38填写情况导出
      * @param dept
      * @param response
      */

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

@@ -1206,6 +1206,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                     List<OrgExtendJKZXExport> jkzxList = new ArrayList<>();
                     for (OrgExtendExport export : orgExtendExports) {
                         OrgExtendJKZXExport jkzxExport = new OrgExtendJKZXExport();
+                        export.setCashAddingRoom(export.getCashAddingRoom() - export.getCashAddingRoomControlCount());
+                        export.setRemoteCount(export.getRemoteCount() - export.getRemoteControlCount());
                         BeanUtils.copyProperties(export, jkzxExport);
                         jkzxList.add(jkzxExport);
                     }
@@ -1232,6 +1234,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             xh.getAndIncrement();
             orgExtendExports.forEach(e -> {
                 e.setXh(String.valueOf(xh.getAndIncrement()));
+                e.setCashAddingRoom(e.getCashAddingRoom() - e.getCashAddingRoomControlCount());
+                e.setRemoteCount(e.getRemoteCount() - e.getRemoteControlCount());
             });
             // 数据导出
             EasyExcel.write(response.getOutputStream(), OrgExtendExport.class)

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

@@ -27,7 +27,7 @@ public class OrgExtendExport {
     @ExcelProperty(value = "地区", index = 1)
     private String city;
 
-    @ExcelProperty(value = "行社", index = 2)
+    @ExcelProperty(value = "单位", index = 2)
     private String affiliatedBank;
 
     @ExcelProperty(value = "机构简称", index = 3)
@@ -39,33 +39,31 @@ public class OrgExtendExport {
     @ExcelProperty(value = "地址", index = 5)
     private String address;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ExcelProperty(value = "建设时间", index = 6)
-    private Date constructionTime;
+    @ExcelProperty(value = "中心建设时间(年)", index = 6)
+    private String constructionTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ExcelProperty(value = "最近一次改造时间", index = 7)
-    private Date lastUpdateTime;
+    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 7)
+    private String lastUpdateTime;
 
-    @ExcelProperty(value = "系统平台品牌", index = 8)
+    @ExcelProperty(value = "监控中心平台品牌", index = 8)
     private String platformBrand;
 
-    @ExcelProperty(value = "离行式加钞间出入口数量", index = 9)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 9)
     private Integer cashAddingRoom;
 
-    @ExcelProperty(value = "可远程控制和实时授权出入口数量(离行式)", index = 10)
-    private Integer cashAddingRoomControlCount;
-
-    @ExcelProperty(value = "业务库防控隔离门出入口数量", index = 11)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 10)
     private Integer remoteCount;
 
-    @ExcelProperty(value = "可远程控制和实时授权出入口数量(业务库)", index = 12)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 11)
+    private Integer cashAddingRoomControlCount;
+
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 12)
     private Integer remoteControlCount;
 
-    @ExcelProperty(value= "全辖摄像头总路数", index = 13)
+    @ExcelProperty(value= "视频监控摄像头总路数", index = 13)
     private Integer totalCameraCount;
 
-    @ExcelProperty(value = "全辖高清摄像头路数", index = 14)
+    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 14)
     private Integer hdCameraCount;
 
     @ExcelProperty(value = "产权类型", index = 15)
@@ -83,30 +81,36 @@ public class OrgExtendExport {
     @ExcelProperty(value = "是否设立在行式自助银行", index = 19)
     private String selfServiceBank;
 
-    @ExcelProperty(value = "穿墙式设备", index = 20)
-    private Integer detachedWallPenetratingEquipment;
+    @ExcelProperty(value = "在行式大堂式机具", index = 21)
+    private Integer onLineLobbyEquipment;
+
+    @ExcelProperty(value = "在行式穿墙式机具", index = 20)
+    private Integer onLineWallPenetratingEquipment;
+
+    @ExcelProperty(value = "离行式大堂式机具", index = 22)
+    private Integer departureLobbyEquipment;
 
-    @ExcelProperty(value = "大堂式设备", index = 21)
-    private Integer detachedLobbyEquipment;
+    @ExcelProperty(value = "离行式穿墙式机具", index = 23)
+    private Integer departureWallPenetratingEquipment;
 
-    @ExcelProperty(value = "是否设立业务库", index = 22)
+    @ExcelProperty(value = "是否设立业务库", index = 24)
     private String businessLibrary;
 
-    @ExcelProperty(value = "业务库类型", index = 23)
+    @ExcelProperty(value = "业务库类型", index = 25)
     private String businessLibraryTypeName;
 
-    @ExcelProperty(value = "是否配备保安人员", index = 24)
+    @ExcelProperty(value = "是否配备保安人员", index = 26)
     private String askari;
 
-    @ExcelProperty(value = "内部保安人数", index = 25)
+    @ExcelProperty(value = "内部保安人数(含派遣)", index = 27)
     private Integer innerCount;
 
-    @ExcelProperty(value = "外聘保安人数", index = 26)
+    @ExcelProperty(value = "外聘保安人数", index = 28)
     private Integer outsideCount;
 
-    @ExcelProperty(value = "是否取得保安证书", index = 27)
+    @ExcelProperty(value = "是否取得保安证书", index = 29)
     private String isAskariCertificate;
 
-    @ExcelProperty(value = "保安证", index = 28,converter = ImgUrlConverter.class)
-    private String askariCertificate;
+//    @ExcelProperty(value = "保安证", index = 30,converter = ImgUrlConverter.class)
+//    private String askariCertificate;
 }

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

@@ -27,7 +27,7 @@ public class OrgExtendJKZXExport {
     @ExcelProperty(value = "地区", index = 1)
     private String city;
 
-    @ExcelProperty(value = "行社", index = 2)
+    @ExcelProperty(value = "单位", index = 2)
     private String affiliatedBank;
 
     @ExcelProperty(value = "机构简称", index = 3)
@@ -39,32 +39,30 @@ public class OrgExtendJKZXExport {
     @ExcelProperty(value = "地址", index = 5)
     private String address;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ExcelProperty(value = "建设时间", index = 6)
-    private Date constructionTime;
+    @ExcelProperty(value = "中心建设时间(年)", index = 6)
+    private String constructionTime;
 
-    @ExcelProperty(value = "最近一次改造时间", index = 7)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date lastUpdateTime;
+    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 7)
+    private String lastUpdateTime;
 
-    @ExcelProperty(value = "系统平台品牌", index = 8)
+    @ExcelProperty(value = "监控中心平台品牌", index = 8)
     private String platformBrand;
 
-    @ExcelProperty(value = "离行式加钞间出入口数量", index = 9)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 9)
     private Integer cashAddingRoom;
 
-    @ExcelProperty(value = "可远程控制和实时授权出入口数量(离行式)", index = 10)
-    private Integer cashAddingRoomControlCount;
-
-    @ExcelProperty(value = "业务库防控隔离门出入口数量", index = 11)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 10)
     private Integer remoteCount;
 
-    @ExcelProperty(value = "可远程控制和实时授权出入口数量(业务库)", index = 12)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 11)
+    private Integer cashAddingRoomControlCount;
+
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 12)
     private Integer remoteControlCount;
 
-    @ExcelProperty(value= "全辖摄像头总路数", index = 13)
+    @ExcelProperty(value= "视频监控摄像头总路数", index = 13)
     private Integer totalCameraCount;
 
-    @ExcelProperty(value = "全辖高清摄像头路数", index = 14)
+    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 14)
     private Integer hdCameraCount;
 }

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

@@ -27,7 +27,7 @@ public class OrgExtendLHSZZExport {
     @ExcelProperty(value = "地区", index = 1)
     private String city;
 
-    @ExcelProperty(value = "行社", index = 2)
+    @ExcelProperty(value = "单位", index = 2)
     private String affiliatedBank;
 
     @ExcelProperty(value = "机构简称", index = 3)
@@ -39,9 +39,10 @@ public class OrgExtendLHSZZExport {
     @ExcelProperty(value = "地址", index = 5)
     private String address;
 
-    @ExcelProperty(value = "穿墙式设备", index = 6)
-    private Integer detachedWallPenetratingEquipment;
+    @ExcelProperty(value = "离行式大堂式机具", index = 6)
+    private Integer departureLobbyEquipment;
+
+    @ExcelProperty(value = "离行式穿墙式机具", index = 7)
+    private Integer departureWallPenetratingEquipment;
 
-    @ExcelProperty(value = "大堂式设备", index = 7)
-    private Integer detachedLobbyEquipment;
 }

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

@@ -6,11 +6,8 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 @ColumnWidth(15) //列宽,最大值为255
 @HeadRowHeight(32) //表头行高
@@ -27,7 +24,7 @@ public class OrgExtendYYWDExport {
     @ExcelProperty(value = "地区", index = 1)
     private String city;
 
-    @ExcelProperty(value = "行社", index = 2)
+    @ExcelProperty(value = "单位", index = 2)
     private String affiliatedBank;
 
     @ExcelProperty(value = "机构简称", index = 3)
@@ -51,25 +48,25 @@ public class OrgExtendYYWDExport {
     @ExcelProperty(value = "是否设立保管箱库", index = 9)
     private String safeBox;
 
-    @ExcelProperty(value = "穿墙式设备", index = 10)
-    private Integer detachedWallPenetratingEquipment;
-
-    @ExcelProperty(value = "大堂式设备", index = 11)
-    private Integer detachedLobbyEquipment;
-
-    @ExcelProperty(value = "是否设立业务库", index = 12)
+    @ExcelProperty(value = "是否设立业务库", index = 10)
     private String businessLibrary;
 
-    @ExcelProperty(value = "是否设立在行式自助银行", index = 13)
+    @ExcelProperty(value = "是否设立在行式自助银行", index = 11)
     private String selfServiceBank;
 
+    @ExcelProperty(value = "在行式大堂式机具", index = 12)
+    private Integer onLineLobbyEquipment;
+
+    @ExcelProperty(value = "在行式穿墙式机具", index = 13)
+    private Integer onLineWallPenetratingEquipment;
+
     @ExcelProperty(value = "业务库类型", index = 14)
     private String businessLibraryTypeName;
 
     @ExcelProperty(value = "是否配备保安人员", index = 15)
     private String askari;
 
-    @ExcelProperty(value = "内部保安人数", index = 16)
+    @ExcelProperty(value = "内部保安人数(含派遣)", index = 16)
     private Integer innerCount;
 
     @ExcelProperty(value = "外聘保安人数", index = 17)
@@ -78,6 +75,6 @@ public class OrgExtendYYWDExport {
     @ExcelProperty(value = "是否取得保安证书", index = 18)
     private String isAskariCertificate;
 
-    @ExcelProperty(value = "保安证", index = 19,converter = ImgUrlConverter.class)
-    private String askariCertificate;
+//    @ExcelProperty(value = "保安证", index = 19,converter = ImgUrlConverter.class)
+//    private String askariCertificate;
 }

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

@@ -24,7 +24,7 @@ public class OrgExtendZXYWKExport {
     @ExcelProperty(value = "地区", index = 1)
     private String city;
 
-    @ExcelProperty(value = "行社", index = 2)
+    @ExcelProperty(value = "单位", index = 2)
     private String affiliatedBank;
 
     @ExcelProperty(value = "机构简称", index = 3)

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

@@ -6,11 +6,8 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author :
  * @date :
@@ -31,7 +28,7 @@ public class OrgPhysicalDefenseConstructionDetailExport {
     @ExcelProperty(value = "地区", index = 1)
     private String city;
 
-    @ExcelProperty(value = "行社", index = 2)
+    @ExcelProperty(value = "单位", index = 2)
     private String affiliatedBank;
 
     @ExcelProperty(value = "机构简称", index = 3)
@@ -49,17 +46,15 @@ public class OrgPhysicalDefenseConstructionDetailExport {
     @ExcelProperty(value = "GA38标准", index = 7)
     private String standard;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "达标日期", index = 8)
-    private Date dateOfCompliance;
+    private String dateOfCompliance;
 
     @ExcelProperty(value = "未达标原因", index = 9)
     private String reason;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "计划达标日期", index = 10)
-    private Date dateOfComplete;
+    private String dateOfComplete;
 
-    @ExcelProperty(value = "证书", index = 11,converter = ImgUrlConverter.class)
-    private String certificate;
+//    @ExcelProperty(value = "证书", index = 11,converter = ImgUrlConverter.class)
+//    private String certificate;
 }

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

@@ -1329,27 +1329,29 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             b.short_name AS shortName,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'sys_org_type' AND dict_value = b.type ) AS typeName,
             b.address AS address,
-            a.construction_time AS constructionTime,
-            a.last_update_time AS lastUpdateTime,
+            IFNULL(SUBSTR( a.construction_time, 1, 4 ), '' ) AS constructionTime,
+            IFNULL(SUBSTR( a.last_update_time, 1, 4 ), '' ) AS lastUpdateTime,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'org_platform_brand' AND dict_value = a.platform_brand ) AS platformBrand,
-            a.cash_adding_room AS cashAddingRoom,
-            a.cash_adding_room_control_count AS cashAddingRoomControlCount,
-            a.remote_count AS remoteCount,
-            a.remote_control_count AS remoteControlCount,
-            a.total_camera_count AS totalCameraCount,
-            a.hd_camera_count AS hdCameraCount,
+            IFNULL(a.cash_adding_room,0) AS cashAddingRoom,
+            IFNULL(a.cash_adding_room_control_count,0) AS cashAddingRoomControlCount,
+            IFNULL(a.remote_count,0) AS remoteCount,
+            IFNULL(a.remote_control_count,0) AS remoteControlCount,
+            IFNULL(a.total_camera_count,0) AS totalCameraCount,
+            IFNULL(a.hd_camera_count,0) AS hdCameraCount,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'property_situation' AND dict_value = a.ownership ) AS ownerShipName,
             ( CASE a.outside_area WHEN 1 THEN '区域内' WHEN 0 THEN '区域外' ELSE '' END ) AS outsideArea,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'duty_options' AND dict_value = a.duty_mode ) AS dutyMode,
             ( CASE a.safe_box WHEN 1 THEN '是' ELSE '否' END ) AS safeBox,
             ( CASE a.self_service_bank WHEN 1 THEN '是' ELSE '否' END ) AS selfServiceBank,
-            a.wall_penetrating_equipment AS wallPenetratingEquipment,
-            a.lobby_equipment AS lobbyEquipment,
+            IF(b.type = 4,IFNULL(a.wall_penetrating_equipment,0),0) AS onLineWallPenetratingEquipment,
+            IF(b.type = 4,IFNULL(a.lobby_equipment,0),0) AS onLineLobbyEquipment,
+            IF(b.type = 5,IFNULL(a.wall_penetrating_equipment,0),0) AS departureWallPenetratingEquipment,
+            IF(b.type = 5,IFNULL(a.lobby_equipment,0),0) AS departureLobbyEquipment,
             ( CASE a.business_library WHEN 1 THEN '是' ELSE '否' END ) AS businessLibrary,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'business_type' AND dict_value = a.business_library_type ) AS businessLibraryTypeName,
             ( CASE a.askari WHEN 1 THEN '是' ELSE '否' END ) AS askari,
-            a.inner_count AS innerCount,
-            a.outside_count AS outsideCount,
+            IFNULL(a.inner_count,0) AS innerCount,
+            IFNULL(a.outside_count,0) AS outsideCount,
             ( CASE WHEN a.askari_certificate IS NULL THEN '否' ELSE '是' END ) AS isAskariCertificate,
             a.askari_certificate AS askariCertificate
         FROM
@@ -1390,9 +1392,9 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             b.address AS address,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'org_extend_type' AND dict_value = a.type ) AS extendTypeName,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'org_extend_standard' AND dict_value = a.standard ) AS standard,
-            a.date_of_compliance as dateOfCompliance,
+            IFNULL(SUBSTR( a.date_of_compliance, 1, 10 ), '' ) AS dateOfCompliance,
             a.reason as reason,
-            a.date_of_complete as dateOfComplete,
+            IFNULL(SUBSTR( a.date_of_complete, 1, 10 ), '' ) AS dateOfComplete,
             a.certificate as certificate
         FROM
             sys_org b