Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java =================================================================== diff -u -r38124 -r38157 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java (.../UrgentLevel.java) (revision 38124) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java (.../UrgentLevel.java) (revision 38157) @@ -102,6 +102,15 @@ private String urgentContactInfoNotBlank = Constants.STR_NO; /** + * 预计使用时间默认值ZSRY-97 + */ + private Integer expectUseTimeDefauleValue = 60; + /** + * 预计使用时间不得早于默认时间的值ZSRY-97 + */ + private Integer expectUseTimeOflimitTime = 0; + + /** * 语音通知GDSRMYY-604 */ private String notification = Constants.STR_NO; @@ -228,6 +237,22 @@ public void setUrgentContactInfoNotBlank(String urgentContactInfoNotBlank) { this.urgentContactInfoNotBlank = urgentContactInfoNotBlank; } + @Column(columnDefinition = "int default 60 not null ") + public Integer getExpectUseTimeDefauleValue() { + return expectUseTimeDefauleValue; + } + + public void setExpectUseTimeDefauleValue(Integer expectUseTimeDefauleValue) { + this.expectUseTimeDefauleValue = expectUseTimeDefauleValue; + } + @Column(columnDefinition = "int default 0 not null ") + public Integer getExpectUseTimeOflimitTime() { + return expectUseTimeOflimitTime; + } + + public void setExpectUseTimeOflimitTime(Integer expectUseTimeOflimitTime) { + this.expectUseTimeOflimitTime = expectUseTimeOflimitTime; + } @Column(columnDefinition=" varchar(20) default '" + Constants.STR_NO + "' not null ") public String getNotification() { Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r38136 -r38157 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 38136) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 38157) @@ -28,7 +28,7 @@ "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.9.61","4.9.62", "4.9.63","4.9.64","4.9.65","4.9.66","4.9.67","4.9.68","4.9.69","4.9.70","4.9.71","4.9.72","4.9.73","4.9.74","4.9.75","4.9.76","4.9.77","4.9.78","4.9.79","4.9.80","4.9.81","4.9.82","4.9.83","4.9.84","4.9.85", "4.9.86","4.9.87","4.9.88","4.9.89","4.9.90","4.9.91","4.9.92","4.9.93","4.9.94","4.9.95","4.9.96","4.9.97","4.9.98","4.9.99","5.0.0","5.0.1","5.0.2","5.0.3","5.0.4","5.0.5","5.0.6","5.0.7", - "5.0.8","5.0.9","5.0.10","5.0.11","5.0.12","5.0.13","5.0.14","5.0.15","5.0.16","5.0.17","5.0.18","5.0.19","5.0.20","5.0.21","5.0.22","5.0.23","5.0.24","5.0.25","5.0.26"}; + "5.0.8","5.0.9","5.0.10","5.0.11","5.0.12","5.0.13","5.0.14","5.0.15","5.0.16","5.0.17","5.0.18","5.0.19","5.0.20","5.0.21","5.0.22","5.0.23","5.0.24","5.0.25","5.0.26","5.0.27"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.26_5.0.27.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.26_5.0.27.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.26_5.0.27.sql (revision 38157) @@ -0,0 +1,2 @@ +update UrgentLevel set expectUseTimeDefauleValue = (select case when max(expectUseTimeDefauleValue) is null then 60 else max(expectUseTimeDefauleValue) end from AllUrgentAdditionalInfo); +update UrgentLevel set expectUseTimeOflimitTime = (select case when max(expectUseTimeOflimitTime) is null then 0 else max(expectUseTimeOflimitTime) end from AllUrgentAdditionalInfo); \ No newline at end of file