机构补充信息和GA38信息导出添加机构状态

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

@@ -36,79 +36,82 @@ public class OrgExtendExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "中心建设时间(年)", index = 6)
+    @ExcelProperty(value = "中心建设时间(年)", index = 7)
     private String constructionTime;
 
-    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 7)
+    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 8)
     private String lastUpdateTime;
 
-    @ExcelProperty(value = "监控中心平台品牌", index = 8)
+    @ExcelProperty(value = "监控中心平台品牌", index = 9)
     private String platformBrand;
 
-    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 9)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 10)
     private Integer cashAddingRoom;
 
-    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 10)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 11)
     private Integer remoteCount;
 
-    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 11)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 12)
     private Integer cashAddingRoomControlCount;
 
-    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 12)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 13)
     private Integer remoteControlCount;
 
-    @ExcelProperty(value= "视频监控摄像头总路数", index = 13)
+    @ExcelProperty(value= "视频监控摄像头总路数", index = 14)
     private Integer totalCameraCount;
 
-    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 14)
+    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 15)
     private Integer hdCameraCount;
 
-    @ExcelProperty(value = "产权类型", index = 15)
+    @ExcelProperty(value = "产权类型", index = 16)
     private String ownerShipName;
 
-    @ExcelProperty(value = "所在位置", index = 16)
+    @ExcelProperty(value = "所在位置", index = 17)
     private String outsideArea;
 
-    @ExcelProperty(value = "夜间值守方式", index = 17)
+    @ExcelProperty(value = "夜间值守方式", index = 18)
     private String dutyMode;
 
-    @ExcelProperty(value = "是否设立保管箱库", index = 18)
+    @ExcelProperty(value = "是否设立保管箱库", index = 19)
     private String safeBox;
 
-    @ExcelProperty(value = "是否设立在行式自助银行", index = 19)
+    @ExcelProperty(value = "是否设立在行式自助银行", index = 20)
     private String selfServiceBank;
 
     @ExcelProperty(value = "在行式大堂式机具", index = 21)
     private Integer onLineLobbyEquipment;
 
-    @ExcelProperty(value = "在行式穿墙式机具", index = 20)
+    @ExcelProperty(value = "在行式穿墙式机具", index = 22)
     private Integer onLineWallPenetratingEquipment;
 
-    @ExcelProperty(value = "离行式大堂式机具", index = 22)
+    @ExcelProperty(value = "离行式大堂式机具", index = 23)
     private Integer departureLobbyEquipment;
 
-    @ExcelProperty(value = "离行式穿墙式机具", index = 23)
+    @ExcelProperty(value = "离行式穿墙式机具", index = 24)
     private Integer departureWallPenetratingEquipment;
 
-    @ExcelProperty(value = "是否设立业务库", index = 24)
+    @ExcelProperty(value = "是否设立业务库", index = 25)
     private String businessLibrary;
 
-    @ExcelProperty(value = "业务库类型", index = 25)
+    @ExcelProperty(value = "业务库类型", index = 26)
     private String businessLibraryTypeName;
 
-    @ExcelProperty(value = "是否配备保安人员", index = 26)
+    @ExcelProperty(value = "是否配备保安人员", index = 27)
     private String askari;
 
-    @ExcelProperty(value = "内部保安人数(含派遣)", index = 27)
+    @ExcelProperty(value = "内部保安人数(含派遣)", index = 28)
     private Integer innerCount;
 
-    @ExcelProperty(value = "外聘保安人数", index = 28)
+    @ExcelProperty(value = "外聘保安人数", index = 29)
     private Integer outsideCount;
 
-    @ExcelProperty(value = "是否取得保安证书", index = 29)
+    @ExcelProperty(value = "是否取得保安证书", index = 30)
     private String isAskariCertificate;
 
 //    @ExcelProperty(value = "保安证", index = 30,converter = ImgUrlConverter.class)

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

@@ -36,33 +36,36 @@ public class OrgExtendJKZXExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "中心建设时间(年)", index = 6)
+    @ExcelProperty(value = "中心建设时间(年)", index = 7)
     private String constructionTime;
 
-    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 7)
+    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 8)
     private String lastUpdateTime;
 
-    @ExcelProperty(value = "监控中心平台品牌", index = 8)
+    @ExcelProperty(value = "监控中心平台品牌", index = 9)
     private String platformBrand;
 
-    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 9)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 10)
     private Integer cashAddingRoom;
 
-    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 10)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 11)
     private Integer remoteCount;
 
-    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 11)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 12)
     private Integer cashAddingRoomControlCount;
 
-    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 12)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 13)
     private Integer remoteControlCount;
 
-    @ExcelProperty(value= "视频监控摄像头总路数", index = 13)
+    @ExcelProperty(value= "视频监控摄像头总路数", index = 14)
     private Integer totalCameraCount;
 
-    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 14)
+    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 15)
     private Integer hdCameraCount;
 }

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

@@ -36,13 +36,16 @@ public class OrgExtendLHSZZExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "离行式大堂式机具", index = 6)
+    @ExcelProperty(value = "离行式大堂式机具", index = 7)
     private Integer departureLobbyEquipment;
 
-    @ExcelProperty(value = "离行式穿墙式机具", index = 7)
+    @ExcelProperty(value = "离行式穿墙式机具", index = 8)
     private Integer departureWallPenetratingEquipment;
 
 }

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

@@ -33,46 +33,49 @@ public class OrgExtendYYWDExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "产权类型", index = 6)
+    @ExcelProperty(value = "产权类型", index = 7)
     private String ownerShipName;
 
-    @ExcelProperty(value = "所在位置", index = 7)
+    @ExcelProperty(value = "所在位置", index = 8)
     private String outsideArea;
 
-    @ExcelProperty(value = "夜间值守方式", index = 8)
+    @ExcelProperty(value = "夜间值守方式", index = 9)
     private String dutyMode;
 
-    @ExcelProperty(value = "是否设立保管箱库", index = 9)
+    @ExcelProperty(value = "是否设立保管箱库", index = 10)
     private String safeBox;
 
-    @ExcelProperty(value = "是否设立业务库", index = 10)
+    @ExcelProperty(value = "是否设立业务库", index = 11)
     private String businessLibrary;
 
-    @ExcelProperty(value = "是否设立在行式自助银行", index = 11)
+    @ExcelProperty(value = "是否设立在行式自助银行", index = 12)
     private String selfServiceBank;
 
-    @ExcelProperty(value = "在行式大堂式机具", index = 12)
+    @ExcelProperty(value = "在行式大堂式机具", index = 13)
     private Integer onLineLobbyEquipment;
 
-    @ExcelProperty(value = "在行式穿墙式机具", index = 13)
+    @ExcelProperty(value = "在行式穿墙式机具", index = 14)
     private Integer onLineWallPenetratingEquipment;
 
-    @ExcelProperty(value = "业务库类型", index = 14)
+    @ExcelProperty(value = "业务库类型", index = 15)
     private String businessLibraryTypeName;
 
-    @ExcelProperty(value = "是否配备保安人员", index = 15)
+    @ExcelProperty(value = "是否配备保安人员", index = 16)
     private String askari;
 
-    @ExcelProperty(value = "内部保安人数(含派遣)", index = 16)
+    @ExcelProperty(value = "内部保安人数(含派遣)", index = 17)
     private Integer innerCount;
 
-    @ExcelProperty(value = "外聘保安人数", index = 17)
+    @ExcelProperty(value = "外聘保安人数", index = 18)
     private Integer outsideCount;
 
-    @ExcelProperty(value = "是否取得保安证书", index = 18)
+    @ExcelProperty(value = "是否取得保安证书", index = 19)
     private String isAskariCertificate;
 
 //    @ExcelProperty(value = "保安证", index = 19,converter = ImgUrlConverter.class)

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

@@ -33,16 +33,19 @@ public class OrgExtendZXYWKExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "是否设立业务库", index = 6)
+    @ExcelProperty(value = "是否设立业务库", index = 7)
     private String businessLibrary;
 
-    @ExcelProperty(value = "业务库类型", index = 7)
+    @ExcelProperty(value = "业务库类型", index = 8)
     private String businessLibraryTypeName;
 
-    @ExcelProperty(value = "夜间值守方式", index = 8)
+    @ExcelProperty(value = "夜间值守方式", index = 9)
     private String dutyMode;
 
 }

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

@@ -40,19 +40,22 @@ public class OrgPhysicalDefenseConstructionDetailExport {
     @ExcelProperty(value = "机构类型", index = 5)
     private String typeName;
 
-    @ExcelProperty(value = "GA38机构类型", index = 6)
+    @ExcelProperty(value = "状态", index = 6)
+    private String status;
+
+    @ExcelProperty(value = "GA38机构类型", index = 7)
     private String extendTypeName;
 
-    @ExcelProperty(value = "GA38标准", index = 7)
+    @ExcelProperty(value = "GA38标准", index = 8)
     private String standard;
 
-    @ExcelProperty(value = "达标日期", index = 8)
+    @ExcelProperty(value = "达标日期", index = 9)
     private String dateOfCompliance;
 
-    @ExcelProperty(value = "未达标原因", index = 9)
+    @ExcelProperty(value = "未达标原因", index = 10)
     private String reason;
 
-    @ExcelProperty(value = "计划达标日期", index = 10)
+    @ExcelProperty(value = "计划达标日期", index = 11)
     private String dateOfComplete;
 
 //    @ExcelProperty(value = "证书", index = 11,converter = ImgUrlConverter.class)

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

@@ -1333,6 +1333,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             b.affiliated_bank AS affiliatedBank,
             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,
+            ( CASE b.is_lock WHEN 1 THEN '停用' ELSE '正常' END ) AS status,
             b.address AS address,
             IFNULL(SUBSTR( a.construction_time, 1, 4 ), '' ) AS constructionTime,
             IFNULL(SUBSTR( a.last_update_time, 1, 4 ), '' ) AS lastUpdateTime,
@@ -1386,6 +1387,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
                     #{orgType}
                 </foreach>
             </if>
+        order by b.affiliated_bank asc,b.is_lock asc
     </select>
     <select id="exportDefenseDetailExtend" resultType="com.xunmei.system.util.OrgPhysicalDefenseConstructionDetailExport">
         SELECT
@@ -1394,6 +1396,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             b.affiliated_bank AS affiliatedBank,
             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,
+            ( CASE b.is_lock WHEN 1 THEN '停用' ELSE '正常' END ) AS status,
             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,
@@ -1421,6 +1424,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
                     #{orgType}
                 </foreach>
             </if>
+        order by b.affiliated_bank asc,b.is_lock asc
     </select>
 
 </mapper>