From 0f05d41ef1ac6eca148b72b034acc3407e3580a0 Mon Sep 17 00:00:00 2001
From: revisit <revisit@126.com>
Date: Tue, 26 May 2026 16:17:30 +0800
Subject: [PATCH] fix voyage search

---
 .../dsds/control/search/SearchControl.class   | Bin 8895 -> 9009 bytes
 .../dsds/control/search/SearchControl.java    |   5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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 a50678cc5551e45b620522cc9e6a572cde31fdef..0d176e1507464636076888765ea9e552b22c58cc 100644
GIT binary patch
delta 1241
zcmYk5d2Ccw6o<dlPCL_Kpwnrm?a*ZgTxcn^FbXKhQV7tbB!Yn=R9eT*bfK%Ih`3eJ
zgkq$CH<Ew}iAG~WY7|O9)*?nhTyO;!z?DT%ToA<#J#)(+<mG+$ckemxzH@%}y}oIi
zr+W`w-nkbjl@uolLfDihgf~wqPxZOjEqKm!Z93KS?CIU>POjc=R;7j~xjD!oCvOP_
zH7zCe&9Rc&_DFMVX={69NqwxTE!JMr)LK_k)*PGJT32QlJiN_2f}^3Ow$+?S%#sSz
zmwGVy2%kDRYF2rR<TJCwyV3E9i({rTEi5NYcUq2oWj3W%%QwdD%aiX+fiEnlOr<X(
zXUra7zMM73d^gGu#+yDb=e&?1p-4+K6peI5svDxAhL!>;47vE(EKeULzxHlTpDXg4
zar=AZceCA}FPF>_<zMEaKbZTE;J@nej%97J(1c+!OrO7OMrMZ9mfmRQY)KMTQ_VpC
zHRgEM$OK6;so8}|;uP}DUT?ms%w8>7z2~y`O6RpWxQ;<w&tQhBD$uKtn<-)%BbZGw
zRop;?67FFX4-;l3H?fY<JjWPbW-MDYdq3ki%y>TMR!%d43rrN4B#BIxbf!p%sZzvr
z8O;otNSVx`Toy7De{Vs~0V$qCGIL3#f)MkVsN)RoU>5UfVgXC2WG#2HfrV_Nsy8=p
zi=>>#$v}`Ub2PuhyDQ+_#*p=-1>6DGPWG6}V8HYQ-M%j0xGSNI{!pJ;6U>!;=B40Z
zdCeRQ<__Nv<J^uh170NCS9T?NP=E64@sO`PkZd;}YQ~3xodNew-q3ZAf53V?@!6a4
zS-|ru2X--Q{_w5bUQ|3H;Mu{PB(}5Q75!)v$xv=ohaswt$F$j6@~Bg{>($2wN?F8h
zG-|s|y3(Smjm7HuL$uSS>S;RE@g;P=z`bhuQuc5k`&h=i+^@Djz;PbrtfpVoL%Kw#
zB=Ly&cvSo>m!Ui+#jKFAtdv{mlF2+F6?98At0l@BX=bgo^Avt9uUkI`wUtb=bQV`t
zRHLV<>Mp7mkzi#+7Za_DQllNk!!cD!R@JIXw(4$GPOIuvxvbj2Go;{<$F=7g+%!s_
zw(%YVw6IL=yatb!R%o6aQqg%>Ye?Yz_#PTd<O3ZCYdJZU$YMU^Bb|S&_w(ea4Z;_e
z$1T6K{Mzzc%afL;Ex)%sXZfS$PnN$}Ua-7aWrsg3|Frzuvi~*xFSvT^t2h1EX8sqa
Sh}9SLhd>(^aY(Yb2>cIaiz|fy

delta 1143
zcmYk4ZBSHY6vuyuw}q92-DOvH5%y|gB;f>NrWJ}a=#0#iPKcGsy0Ji{hzV(wv1L=~
z2X&ZdYLY%U<K*<EnMQWT50oz%rCDV5o`t=dC223FX)n~-2R<-&?(g}Z^E~(5bN=`4
zTXd)<_xMQvL7-a1MT$^is#7ZVEv(HkyK^c`N$#<X_jupM33EBOH2tLTe2Iy8@=cXz
zOWI&2ADID9Md2qxK%D5hn6t6HE85Z&X^lCp>q_K$CzH>N&l?G!67ok+tX~`LY;NDs
zHvY_)rpH?$r_F#jDqoxFz9RY7)c9t}_omCYLVhqOeL?xr4ExIET%s^<xya9^!~e2e
zFixOIel_!zzng|YSpG2Gfl%6IVWzp@D>mo7S*e*^Nel*-NeX`%C%-<Oe}!VR+A~Q<
zn3&<>KcQ$WbeVztof1gY1rJL6TGE)tM2ZP9U3ncPdfm(nYA9tHH_$*CQD*WWH_}Zx
z+nB|3RI-QJyuwZNF^40}<plFM#VwrWRxWazK$WC2UwrDh!$K*gMrN}}s#q*_ERj{z
z;!pGx9F?*=$)JuLmg7)Qm9C3f!BXyGEqC(}_t3*idbyYVtV%pp*e6+MaB&UDlV(A<
zb4EDm+Rv0-c!KU=W<RgOJoiiN^;VAM1Ic`H=QVRW9Fha(YIw343cI~az13q!@<ty$
zWXhe%a@gGNgz{cbmhsjGGi>dtL3ck#%x0&^{f2I2`zP!o+iY^eas91Q$y4^Kh0v&$
z#&nt{3Taj|Thyfcsiu`XctB@aqfwi(oetLXm>Rp44LqyS9y-~p^Y*ck18m|j4>L%Y
z+WH7XJjyvXb4j1LLbs$77cY;CpZF6pl`T@n(=vyxGM8s$0o$aW?Gj;!#MmiqYM@_R
z+o4}tJtM#*jgqQ?2>Pj1tyYy{Ra8}~RWUnEa<@rUy3IAK%CPD_RW7L1?G}}pHrdMy
zWRWIuowX4+Yb2jHd5a0!R6wV0BwO2>W=5ve$B$|cDI7}{(Y;jO)-|N<6s$x#IL<p7
zzpM9)6!3xOKeYVV@>9#tEx)iFvi!>O8_Vx3&sd(d{K<0I@_d6`ezE+`@}lMFYeru%
czV!H_m+Z+uEw5S*^S8F@);9lPL@f>e54EZcng9R*

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));
 
 		}