Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java =================================================================== diff -u -r15158 -r15180 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java (.../ContainerAction.java) (revision 15158) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java (.../ContainerAction.java) (revision 15180) @@ -23,6 +23,7 @@ import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.StrutsParamUtils; @@ -113,9 +114,14 @@ if (searchKeyWord != null && searchColumns != null) { //关键字检索执行的函数(cjr) + String searchKeyWord2 = searchKeyWord.equals(TousseInstance.STATUS_STERILING) ? Container.CONTAINER_STATUS_STERILIZING : searchKeyWord; //如果状态是"灭菌中"转成"灭菌"去数据库查找 String[] searchColumnArray = searchColumns.split(";"); for (String searchColumn : searchColumnArray) { - sql += "po." + searchColumn + " like '%" + searchKeyWord + "%' or "; + if ("status".equals(searchColumn)) { + sql += "po." + searchColumn + " like '%" + searchKeyWord2 + "%' or "; + } else { + sql += "po." + searchColumn + " like '%" + searchKeyWord + "%' or "; + } } sql = sql.substring(0, sql.length() - 4); sql = " where 1 = 1 and (" + sql + ")" + " and po.purpose = '" + purpose + "'" + (departCode != null ? " and po.departCode = '" + departCode + "'" : "");