Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.8.1_4.8.2_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.8.1_4.8.2_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.8.1_4.8.2_sqlserver.sql (revision 17941) @@ -0,0 +1 @@ +if exists (select * from syscolumns where name='level' and id=object_id('urgentlevel')) update UrgentLevel set grade = level where grade is null else print '不存在' \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java =================================================================== diff -u -r17897 -r17941 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java (.../UrgentLevelAction.java) (revision 17897) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java (.../UrgentLevelAction.java) (revision 17941) @@ -68,7 +68,7 @@ JSONObject json = new JSONObject(); json.put("id", ul.getId()); json.put("enable", ul.getEnable()); - json.put("level", ul.getLevel()); + json.put("grade", ul.getGrade()); json.put("name", ul.getName()); json.put("urgent", ul.getUrgent()); array.add(json); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java =================================================================== diff -u -r17897 -r17941 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java (.../UrgentLevel.java) (revision 17897) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java (.../UrgentLevel.java) (revision 17941) @@ -29,7 +29,7 @@ /** * 等级的级别。级别越大,优先级越高。 */ - private Integer level; + private Integer grade; /** * 是否启用 */ @@ -52,11 +52,12 @@ public void setName(String name) { this.name = name; } - public Integer getLevel() { - return level; + + public Integer getGrade() { + return grade; } - public void setLevel(Integer level) { - this.level = level; + public void setGrade(Integer grade) { + this.grade = grade; } public String getEnable() { return enable; Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r17722 -r17941 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 17722) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 17941) @@ -14,14 +14,14 @@ * */ public class Constants { - + public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { "3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4", "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", "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.7.8","4.7.9","4.8.0","4.8.1","4.8.2"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java =================================================================== diff -u -r17897 -r17941 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java (.../UrgentLevelManagerImpl.java) (revision 17897) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java (.../UrgentLevelManagerImpl.java) (revision 17941) @@ -53,15 +53,15 @@ current.setName(object.getName()); current.setUrgent(object.getUrgent()); } - if(current.getLevel() == null){ - Integer maxlevel = getMaxProperty("level"); - if(maxlevel == null){ - maxlevel = 1; + if(current.getGrade() == null){ + Integer maxGrade = getMaxProperty("grade"); + if(maxGrade == null){ + maxGrade = 1; }else{ - maxlevel += 1; + maxGrade += 1; } - current.setLevel(maxlevel); - }else if(current.getLevel().intValue() == 0){ + current.setGrade(maxGrade); + }else if(current.getGrade().intValue() == 0){ throw new RuntimeException("加急级别为无的为系统预定义,不能修改"); } super.save(current); @@ -72,16 +72,16 @@ */ @Override public List getAll() { - return getAll("level desc"); + return getAll("grade desc"); } @Override public UrgentLevel getLowestUrgentLevel() { - String condition = "level <> 0 order by level asc"; + String condition = "grade <> 0 order by grade asc"; return getFirst(condition); } @Override public List getAllExceptDisabled() { - String condition = "enable='" + Constants.STR_YES + "' order by level asc"; + String condition = "enable='" + Constants.STR_YES + "' order by grade asc"; return getByHql(condition); } @Override @@ -93,22 +93,22 @@ for(int i = 0; i < array.size();++i){ JSONObject item = array.optJSONObject(i); Long id = JSONUtil.optLong(item, "id", 0L); - Integer level = JSONUtil.optInteger(item, "level", -1); - if(level == -1){ + Integer grade = JSONUtil.optInteger(item, "grade", -1); + if(grade == -1){ continue; } - Integer newLevel = JSONUtil.optInteger(item, "newLevel", -1); - if(newLevel == -1){ + Integer newGrade = JSONUtil.optInteger(item, "newGrade", -1); + if(newGrade == -1){ continue; } - if(level == newLevel){ + if(grade == newGrade){ continue; } UrgentLevel ul = getForUpdate(id); if(ul == null){ continue; } - ul.setLevel(newLevel); + ul.setGrade(newGrade); save(ul); changeArray.add(item); } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js =================================================================== diff -u -r17897 -r17941 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js (.../urgentLevelView.js) (revision 17897) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js (.../urgentLevelView.js) (revision 17941) @@ -15,9 +15,9 @@ {name : 'id'}, {name : 'enable'}, {name : 'name'}, - {name : 'level'}, + {name : 'grade'}, {name : 'urgent'}, - {name : 'newLevel'} + {name : 'newGrade'} ] }); @@ -59,11 +59,11 @@ } function setRecordLevel(store){ - var newLevel = 1; + var newGrade = 1; for(var i=store.getCount() - 1;i>=0;--i){ var record = store.getAt(i); - record.data.newLevel = newLevel++; -// record.set('newLevel',i+1); 速度会很慢,ext会刷新grid + record.data.newGrade = newGrade++; +// record.set('newGrade',i+1); 速度会很慢,ext会刷新grid } } function setRecordSequenceAndGetSupplyRoomItemsStr(store){ @@ -195,6 +195,7 @@ if(result.message){ showResult(result.message); } + refreshData(); }, failure : function(response, options) { myMask.hide();