Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java =================================================================== diff -u -r18218 -r19416 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java (.../MaterialDefinition.java) (revision 18218) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java (.../MaterialDefinition.java) (revision 19416) @@ -181,6 +181,7 @@ ColumnNameAndPoPropertyNameMap.put("清洗质量检查关注点", "washQualityCheckPoint"); ColumnNameAndPoPropertyNameMap.put("功能检查", "functionCheck"); ColumnNameAndPoPropertyNameMap.put("是否外来器械材料", "isForeignMaterial"); + ColumnNameAndPoPropertyNameMap.put("是否停用", "disable"); } @Override Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls =================================================================== diff -u -r19038 -r19416 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls =================================================================== diff -u -r19058 -r19416 Binary files differ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r19170 -r19416 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 19170) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 19416) @@ -1367,6 +1367,8 @@ String functionCheck = ParerUtils.getCellFormatValue(row, 15); // 是否外来器械材料 String isForeignMaterial = ParerUtils.getCellFormatValue(row, 16); + // 是否停用 + String isDisable = ParerUtils.getCellFormatValue(row, 17); MaterialDefinition materialDefinition = null; if(Constants.STR_YES.equals(isForeignMaterial)){ @@ -1403,6 +1405,7 @@ materialDefinition.setWashQualityCheckPoint(washQualityCheckPoint); materialDefinition.setFunctionCheck(functionCheck); materialDefinition.setIsForeignMaterial(isForeignMaterial); + materialDefinition.setDisable(isDisable); }else { // 更新数据 如果导入项为空,不做数据库里面的值. if( maxStorage != null){ @@ -1450,6 +1453,9 @@ if(StringUtils.isNotBlank(isForeignMaterial)){ materialDefinition.setIsForeignMaterial(isForeignMaterial); } + if(StringUtils.isNotBlank(isDisable)){ + materialDefinition.setDisable(isDisable); + } } totalCount = saveOrUpdateAndClearCache(totalCount, materialDefinition);