fix voyage search
This commit is contained in:
parent
df8ab066a5
commit
0f05d41ef1
Binary file not shown.
|
|
@ -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));
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue