Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java =================================================================== diff -u -r16971 -r17820 --- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java (.../FormDefinitionManagerImpl.java) (revision 16971) +++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java (.../FormDefinitionManagerImpl.java) (revision 17820) @@ -208,6 +208,7 @@ definition.setDepartCodes(formDefinitionVo.getDepartCodes()); definition.setDepartNames(formDefinitionVo.getDepartNames()); definition.setIsDisabled(formDefinitionVo.getIsDisabled()); + definition.setSortNumber(formDefinitionVo.getSortNumber()); //复制质量监测属性 if(definition instanceof QualityMonitoringDefinition){ List notToCopy = new ArrayList(); Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java =================================================================== diff -u -r16971 -r17820 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java (.../QualityMonitoringDefinitionManagerImpl.java) (revision 16971) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java (.../QualityMonitoringDefinitionManagerImpl.java) (revision 17820) @@ -156,6 +156,7 @@ sql += " and po.responsibilityPart = '" + responsiblePerson + "'"; } sql += " and (po.isDisabled is null or po.isDisabled = '" + Constants.STR_NO + "')"; + sql += " order by sortNumber asc "; return objectDao.findBySql(QualityMonitoringDefinition.class.getSimpleName(),sql); } /** Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java =================================================================== diff -u -r17390 -r17820 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java (.../FormDefinition.java) (revision 17390) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java (.../FormDefinition.java) (revision 17820) @@ -121,12 +121,24 @@ * 配置项 */ private List items = new ArrayList(); + /** + * 排序号 + */ + private Integer sortNumber = 0; /** * 是否停用 */ private String isDisabled = Constants.STR_NO; + public Integer getSortNumber() { + return sortNumber; + } + + public void setSortNumber(Integer sortNumber) { + this.sortNumber = sortNumber; + } + @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js =================================================================== diff -u -r17005 -r17820 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js (.../qualityMonitoringDefinitionView.js) (revision 17005) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js (.../qualityMonitoringDefinitionView.js) (revision 17820) @@ -657,6 +657,19 @@ anchor : '95%' }] },{ + columnWidth : .5, + layout : 'form', + labelWidth : 80, + items:[{ + xtype : 'numberfield', + fieldLabel : "排序号", + name : "sortNumber", + id : "sortNumber", + readOnly:false, + allowBlank : false, + anchor : '95%' + }] + },{ columnWidth : .36, layout : 'form', labelWidth : 80, @@ -1083,6 +1096,7 @@ {header : "版本号",width : 80,dataIndex : 'version'}, {header : "是否已部署",width : 120,dataIndex : 'isDeploy',renderer : showIsDeployStatus}, {header : "是否已停用",width : 120,dataIndex : 'isDisabled'}, + {header : "排序号",width : 120,dataIndex : 'sortNumber'}, {id : 'description',header : "描述",width : 120,dataIndex : 'description'} ]; @@ -1095,6 +1109,7 @@ {type:'string',dataIndex:'version'}, {type:'string',dataIndex:'isDeploy'}, {type:'string',dataIndex:'description'}, + {type:'string',dataIndex:'sortNumber'}, {type:'string',dataIndex:'isDisabled'} ] }); @@ -1108,6 +1123,7 @@ {name : 'version'}, {name : 'isDeploy'}, {name : 'description'}, + {name : 'sortNumber'}, {name : 'isDisabled'} ]; @@ -1149,8 +1165,8 @@ grid = new Ext.ux.ForgonPageGrid({ tbar : tbar, pageSize : 20, - defaultSortField : 'id', - defaultSortDirection : 'DESC', + defaultSortField : 'sortNumber', + defaultSortDirection : 'ASC', title : entityName + '列表', isCheckboxSelectionModel : true, rememberSelected : false,