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

project_data/sql/0.0.3/soc/soc.sql

@@ -597,10 +597,29 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_resumption_plan_to_point'
                     AND column_name = 'validate_date') THEN
-		ALTER TABLE `soc`.`core_resumption_plan_to_point` 
+		ALTER TABLE `core_resumption_plan_to_point`
 			ADD COLUMN `effective_date` date NULL COMMENT '生效日期。不为null';
 		UPDATE core_resumption_plan_to_point set effective_date='2000-01-01';
     END IF;
+
+
+       IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'sys_org_physical_defense_construction'
+                    AND column_name = 'date_of_complete') THEN
+		ALTER TABLE `sys_org_physical_defense_construction`
+			ADD COLUMN `date_of_complete` datetime NULL DEFAULT NULL COMMENT '计划达标日期';
+    END IF;
+
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'sys_org_physical_defense_construction'
+                    AND column_name = 'reason') THEN
+		ALTER TABLE `sys_org_physical_defense_construction`
+			ADD COLUMN `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '未达标原因';
+    END IF;
 	
 
 
@@ -890,4 +909,22 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 0171419510995796
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01714195109957963777);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01714195109957963777);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01714195109957963777);
-INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01714195109957963777);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01714195109957963777);
+
+
+
+delete from sys_dict_data where dict_type = 'org_extend_type';
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113001, 1, '营业网点', '1', 'org_extend_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-04 15:34:57', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113002, 2, '在行式自助银行', '2', 'org_extend_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-04 15:35:17', '超级管理员', '2023-11-13 11:34:10', NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113003, 3, '离行式自助银行', '3', 'org_extend_type', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 11:34:31', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113004, 4, '中心业务库', '4', 'org_extend_type', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 11:34:50', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113005, 5, '网点业务库', '5', 'org_extend_type', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 11:35:04', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113006, 6, '保管箱库', '6', 'org_extend_type', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 11:35:16', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113007, 7, '监控中心', '7', 'org_extend_type', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 11:35:36', '', NULL, NULL);
+
+
+delete from sys_dict_type where dict_type = 'duty_options';
+delete from sys_dict_data where dict_type = 'duty_options';
+INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113001, '夜间值守方式', 'duty_options', '0', '超级管理员', '2023-11-13 12:00:27', '', NULL, '同楼 和 远程');
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113008, 1, '远程中心值守', '1', 'duty_options', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 12:01:10', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113009, 2, '同楼异地值守', '2', 'duty_options', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 12:01:25', '', NULL, NULL);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysPhysicalDefenseConstruction.java

@@ -50,6 +50,11 @@ public class SysPhysicalDefenseConstruction extends BaseEntity {
     @ApiModelProperty(value = "达标日期")
     private Date dateOfCompliance;
 
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "计划达标日期")
+    private Date dateOfComplete;
+
     /**
      * 是否证书佐证
      */
@@ -78,6 +83,9 @@ public class SysPhysicalDefenseConstruction extends BaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
+    @ApiModelProperty(value = "未达标原因")
+    private String reason;
+
 
     @Override
     public String toString() {