Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/satisfactionsurvey/SatisfactionSurveyTable.java =================================================================== diff -u -r23492 -r26809 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/satisfactionsurvey/SatisfactionSurveyTable.java (.../SatisfactionSurveyTable.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/satisfactionsurvey/SatisfactionSurveyTable.java (.../SatisfactionSurveyTable.java) (revision 26809) @@ -6,13 +6,16 @@ import javax.persistence.Column; import javax.persistence.Entity; + import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.Lob; import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.Table; @@ -91,7 +94,7 @@ this.departCoding = departCoding; } - @Column(length=2000) + @Lob public String getRemark() { return remark; } @@ -145,7 +148,7 @@ this.surveyDate = surveyDate; } - @Column(length=2000) + @Lob public String getInstructions() { return instructions; } Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js =================================================================== diff -u -r21279 -r26809 --- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js (.../satisfactionSurveyTemplateForm.js) (revision 21279) +++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js (.../satisfactionSurveyTemplateForm.js) (revision 26809) @@ -332,10 +332,10 @@ if(!departcodes || departcodes.length == 0){ showResult('科室不能为空！'); return false; - }else if(departcodes.length >= 3980){ + }/*else if(departcodes.length >= 3980){ showResult('所选科室太多,请重新选择！'); return false; - } + }*/ top.Ext.getCmp("treeItemData").setValue("["+treeData+"]"); var b = this; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java =================================================================== diff -u -r23492 -r26809 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java (.../FormDefinition.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java (.../FormDefinition.java) (revision 26809) @@ -6,8 +6,10 @@ import javax.persistence.Column; import javax.persistence.Entity; + import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -16,6 +18,7 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.JoinColumn; +import javax.persistence.Lob; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; @@ -222,7 +225,7 @@ this.createUserName = createUserName; } - @Column(length = 4000) + @Lob public String getDescription() { return description; } @@ -264,7 +267,7 @@ return save; } - @Column(length=4000) + @Lob public String getDepartCodes() { return departCodes; } @@ -273,7 +276,7 @@ this.departCodes = departCodes; } - @Column(length=4000) + @Lob public String getDepartNames() { return departNames; } Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.38_4.9.39_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.38_4.9.39_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.38_4.9.39_sqlserver.sql (revision 26809) @@ -0,0 +1,11 @@ +ALTER TABLE FormDefinition ALTER COLUMN departCodes text; +ALTER TABLE FormDefinition ALTER COLUMN departNames text; +ALTER TABLE FormDefinition ALTER COLUMN description text; + +ALTER TABLE SatisfactionSurveyTemplate ALTER COLUMN summary text; +ALTER TABLE SatisfactionSurveyTemplate ALTER COLUMN readers text; +ALTER TABLE SatisfactionSurveyTemplate ALTER COLUMN readerOrgUnitCode text; +ALTER TABLE SatisfactionSurveyTemplate ALTER COLUMN instructions text; + +ALTER TABLE SatisfactionSurveyTable ALTER COLUMN remark text; +ALTER TABLE SatisfactionSurveyTable ALTER COLUMN instructions text; \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/satisfactionsurvey/SatisfactionSurveyTemplate.java =================================================================== diff -u -r23492 -r26809 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/satisfactionsurvey/SatisfactionSurveyTemplate.java (.../SatisfactionSurveyTemplate.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/satisfactionsurvey/SatisfactionSurveyTemplate.java (.../SatisfactionSurveyTemplate.java) (revision 26809) @@ -6,13 +6,16 @@ import javax.persistence.Column; import javax.persistence.Entity; + import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.Lob; import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.Table; @@ -47,7 +50,7 @@ private String name; /** - * 描述说明 + * 描述说明(页面上的调查表说明) */ private String instructions; @@ -92,8 +95,12 @@ private String editorsForDisplay; private String companyId; - private String summary;//总结 + /** + * 总结 + */ + private String summary; + private String readerOrgUnitCode; @@ -115,7 +122,7 @@ this.status = status; } - @Column(length=2000) + @Lob public String getSummary() { return summary; } @@ -162,7 +169,7 @@ this.itemList = itemList; } - @Column(length=4000) + @Lob public String getReaders() { return readers; } @@ -221,7 +228,8 @@ public void setCompanyId(String companyId) { this.companyId = companyId; } - @Column(length=4000) + + @Lob public String getReaderOrgUnitCode() { return readerOrgUnitCode; } @@ -238,7 +246,7 @@ this.entryDate = entryDate; } - @Column(length=2000) + @Lob public String getInstructions() { return instructions; } Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.38_4.9.39_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.38_4.9.39_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.38_4.9.39_oracle.sql (revision 26809) @@ -0,0 +1,57 @@ +execute immediate 'alter table FormDefinition add departCodes1 CLOB'; +execute immediate 'update FormDefinition set departCodes1 = TO_CLOB(departCodes)'; +execute immediate 'commit'; +execute immediate 'alter table FormDefinition drop column departCodes'; +execute immediate 'alter table FormDefinition rename column departCodes1 to departCodes'; + +execute immediate 'alter table FormDefinition add departNames1 CLOB'; +execute immediate 'update FormDefinition set departNames1 = TO_CLOB(departNames)'; +execute immediate 'commit'; +execute immediate 'alter table FormDefinition drop column departNames'; +execute immediate 'alter table FormDefinition rename column departNames1 to departNames'; + +execute immediate 'alter table FormDefinition add description1 CLOB'; +execute immediate 'update FormDefinition set description1 = TO_CLOB(description)'; +execute immediate 'commit'; +execute immediate 'alter table FormDefinition drop column description'; +execute immediate 'alter table FormDefinition rename column description1 to description'; + + + +execute immediate 'alter table SatisfactionSurveyTemplate add summary1 CLOB'; +execute immediate 'update SatisfactionSurveyTemplate set summary1 = TO_CLOB(summary)'; +execute immediate 'commit'; +execute immediate 'alter table SatisfactionSurveyTemplate drop column summary'; +execute immediate 'alter table SatisfactionSurveyTemplate rename column summary1 to summary'; + +execute immediate 'alter table SatisfactionSurveyTemplate add readers1 CLOB'; +execute immediate 'update SatisfactionSurveyTemplate set readers1 = TO_CLOB(readers)'; +execute immediate 'commit'; +execute immediate 'alter table SatisfactionSurveyTemplate drop column readers'; +execute immediate 'alter table SatisfactionSurveyTemplate rename column readers1 to readers'; + +execute immediate 'alter table SatisfactionSurveyTemplate add readerOrgUnitCode1 CLOB'; +execute immediate 'update SatisfactionSurveyTemplate set readerOrgUnitCode1 = TO_CLOB(readerOrgUnitCode)'; +execute immediate 'commit'; +execute immediate 'alter table SatisfactionSurveyTemplate drop column readerOrgUnitCode'; +execute immediate 'alter table SatisfactionSurveyTemplate rename column readerOrgUnitCode1 to readerOrgUnitCode'; + +execute immediate 'alter table SatisfactionSurveyTemplate add instructions1 CLOB'; +execute immediate 'update SatisfactionSurveyTemplate set instructions1 = TO_CLOB(instructions)'; +execute immediate 'commit'; +execute immediate 'alter table SatisfactionSurveyTemplate drop column instructions'; +execute immediate 'alter table SatisfactionSurveyTemplate rename column instructions1 to instructions'; + + + +execute immediate 'alter table satisfactionsurveytable add instructions1 CLOB'; +execute immediate 'update satisfactionsurveytable set instructions1 = TO_CLOB(instructions)'; +execute immediate 'commit'; +execute immediate 'alter table satisfactionsurveytable drop column instructions'; +execute immediate 'alter table satisfactionsurveytable rename column instructions1 to instructions'; + +execute immediate 'alter table satisfactionsurveytable add remark1 CLOB'; +execute immediate 'update satisfactionsurveytable set remark1 = TO_CLOB(remark)'; +execute immediate 'commit'; +execute immediate 'alter table satisfactionsurveytable drop column remark'; +execute immediate 'alter table satisfactionsurveytable rename column remark1 to remark'; \ No newline at end of file Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r26752 -r26809 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 26752) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 26809) @@ -24,7 +24,7 @@ "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.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.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.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {