diff --git a/build/classes/cn/tsy/cas/idsse/dsds/control/search/SearchControl.class b/build/classes/cn/tsy/cas/idsse/dsds/control/search/SearchControl.class index a50678c..0d176e1 100644 Binary files a/build/classes/cn/tsy/cas/idsse/dsds/control/search/SearchControl.class and b/build/classes/cn/tsy/cas/idsse/dsds/control/search/SearchControl.class differ diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchControl.java index 9d5a934..2d9e0e8 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/search/SearchControl.java @@ -10,6 +10,7 @@ import cn.hme.framework.frame.control.HmeAjax; import cn.hme.framework.frame.control.HmeAjaxControl; import cn.hme.framework.helper.lang.HmeCollectionHelper; import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.helper.log.HmeLogHelper; import cn.tsy.cas.idsse.dsds.helper.DSDSWebHelper; import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictDataMapper; import cn.tsy.data.cas.idsse.dsds.mapper.dict.IDictEquipmentMapper; @@ -109,7 +110,7 @@ public class SearchControl extends HmeAjaxControl { boolean dataset_search = false; if (HmeStringHelper.hasValue(search_value)) { - if ("航次名称".equals(search_type)) { + if ("航次编号".equals(search_type)) { where += " and t.voyage_name like concat('%','" + search_value + "','%') "; } else if ("平台类型".equals(search_type)) { where += " and (platform_type like concat('%','" + search_value + "','%') or platform_alias like concat('%','" + search_value + "','%')) "; @@ -141,7 +142,7 @@ public class SearchControl extends HmeAjaxControl { String sql = "select t.* from voyage_reg t where 1=1" + where +" order by t.create_time desc"; if(dataset_search) sql = "select t.* from voyage_reg t where tsy_id in (" + "select distinct t.voyage_id from sample_dataset t,voyage_reg y where y.tsy_id=t.voyage_id " + " " + where + ") order by t.create_time desc"; - + HmeLogHelper.info(sql); return new HmeAjax(this.mVoyage.pageBySql(group, start, limit, sql)); }