Browse Source

机构补充信息

gaoxiong 1 năm trước cách đây
mục cha
commit
8d7f041a8e

+ 20 - 1
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;
 	
 
 

+ 8 - 0
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() {