Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.59_4.9.60_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.59_4.9.60_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.59_4.9.60_sqlserver.sql (revision 29925) @@ -0,0 +1 @@ +ALTER TABLE FormDefinitionItem ALTER COLUMN name varchar(4000); \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinitionItem.java =================================================================== diff -u -r29888 -r29925 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinitionItem.java (.../FormDefinitionItem.java) (revision 29888) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinitionItem.java (.../FormDefinitionItem.java) (revision 29925) @@ -6,6 +6,7 @@ import javax.persistence.Entity; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -30,7 +31,8 @@ @Entity @DynamicInsert(false) @DynamicUpdate(true) -@Table(indexes = {@Index(columnList = "formDefinition_id", name = "fdi_fdid_index"), +@Table(indexes = {@Index( columnList = "name", name = "name_index"), + @Index(columnList = "formDefinition_id", name = "fdi_fdid_index"), @Index(columnList = "type", name = "fdi_type_index"), @Index(columnList = "orderNumber", name = "fdi_on_index") }) @@ -97,7 +99,7 @@ this.id = id; } - @Lob + @Column(length=4000) public String getName() { return name; } Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.59_4.9.60_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.59_4.9.60_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.59_4.9.60_oracle.sql (revision 29925) @@ -0,0 +1,5 @@ +execute immediate 'alter table FormDefinitionItem add (foo varchar2(4000))'; +execute immediate 'update FormDefinitionItem set foo = name'; +execute immediate 'commit'; +execute immediate 'alter table FormDefinitionItem drop column name'; +execute immediate 'alter table FormDefinitionItem rename column foo to name'; Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r29888 -r29925 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 29888) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 29925) @@ -25,7 +25,7 @@ "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6", "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24", "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39","4.9.40","4.9.41","4.9.42","4.9.43","4.9.44", - "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59"}; + "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {