git-svn-id: https://192.168.57.71/svn/jsgkj@207 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtmain.jsp

@@ -40,7 +40,7 @@
 		<div class="box-content" >
 <form action="${app }/mt/main" id="mtform" method="post"> 	
 			<div >
-				<table class="search_table" cellpadding="0" cellspacing="0">
+				<table class="search_table" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 						<th width="12%"></th>
 						<th width="22%"></th>	

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgadd.jsp

@@ -124,7 +124,7 @@
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgedit.jsp

@@ -123,7 +123,7 @@
 								<span id="xmlxsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgview.jsp

@@ -88,7 +88,7 @@
 							<td >
 								${record.xmlxzw }
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								${record.jsdd }
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqadd.jsp

@@ -124,7 +124,7 @@
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp

@@ -123,7 +123,7 @@
 								<span id="xmlxsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp

@@ -88,7 +88,7 @@
 							<td >
 								${record.xmlxzw }
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								${record.jsdd }
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxadd.jsp

@@ -124,7 +124,7 @@
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxedit.jsp

@@ -123,7 +123,7 @@
 								<span id="xmlxsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxview.jsp

@@ -88,7 +88,7 @@
 							<td >
 								${record.xmlxzw }
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								${record.jsdd }
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgadd.jsp

@@ -124,7 +124,7 @@
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgedit.jsp

@@ -123,7 +123,7 @@
 								<span id="xmlxsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgview.jsp

@@ -88,7 +88,7 @@
 							<td >
 								${record.xmlxzw }
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								${record.jsdd }
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjadd.jsp

@@ -124,7 +124,7 @@
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp

@@ -123,7 +123,7 @@
 								<span id="xmlxsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp

@@ -89,7 +89,7 @@
 							<td >
 								${record.xmlxzw }
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								${record.jsdd }
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgladd.jsp

@@ -104,7 +104,7 @@ text-align:center;
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>
@@ -436,7 +436,7 @@ text-align:center;
 						<th width="10%">港口</th>
 						<th width="10%">港区</th>
 						<th width="10%">项目法人</th>
-						<th width="10%">建设地点</th>
+						<th width="10%">建设地址</th>
 						<th width="15%">项目类型</th>
 						<th width="15%">操作</th>
 					</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp

@@ -219,7 +219,7 @@
 					    	<input type="text" readonly class="form-control" id="xmlx" name="xmlx" value="${record.xmlxzw }">
 					    	<input type="hidden" id="xmlxid" name="xmlxid" value="${record.xmlx }">
 					    	</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" id="jsdd" name="jsdd" value="${record.jsdd }">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglview.jsp

@@ -112,7 +112,7 @@
 							<td >
 								<span id="xmlxzw">${record.xmlxzw }</span>
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								<span id="jsdd">${record.jsdd }</span>
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglxiugai.jsp

@@ -117,7 +117,7 @@ text-align:center;
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>
@@ -423,7 +423,7 @@ text-align:center;
 						<th width="10%">港口</th>
 						<th width="10%">港区</th>
 						<th width="10%">项目法人</th>
-						<th width="10%">建设地点</th>
+						<th width="10%">建设地址</th>
 						<th width="15%">项目类型</th>
 						<th width="15%">操作</th>
 					</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl2/jsjdgladd.jsp

@@ -134,7 +134,7 @@ text-align:center;
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>
@@ -898,7 +898,7 @@ text-align:center;
 						<th width="10%">港口</th>
 						<th width="10%">港区</th>
 						<th width="10%">项目法人</th>
-						<th width="10%">建设地点</th>
+						<th width="10%">建设地址</th>
 						<th width="15%">项目类型</th>
 						<th width="15%">操作</th>
 					</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl2/jsjdglview.jsp

@@ -112,7 +112,7 @@
 							<td >
 								<span id="xmlxzw">${record.xmlxzw }</span>
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								<span id="jsdd">${record.jsdd }</span>
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl2/jsjdglxiugai.jsp

@@ -190,7 +190,7 @@ text-align:center;
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>
@@ -280,31 +280,30 @@ text-align:center;
       </a>
    </li>
 </ul>
-<table class="apply">
-<tr>
-                         <th style="width:7%"> 
-                                                                                        流程节点：&nbsp;
-                         </th>
-						 <td>
-			            	<select style="width:31.5%;height:35px;cursor:pointer;" name="lcjd" id="lcjd" onchange="jsjdgl.detail.lcjd(this.options[this.options.selectedIndex].value)">
-			            	<option></option>
-			            	<option value="1">岸线利用审批</option>
-			            	<option value="2">项目审批、核准、备案</option>
-			            	<option value="3">初步设计审批</option>
-			            	<option value="4">施工图设计审批</option>
-			            	<option value="5">开工备案</option>
-			            	<option value="6">交工验收</option>
-			            	<c:if test="${record.xmlx!=2202 }">
-			            	<option value="7">试运行备案</option>
-			            	</c:if>
-			            	<option value="8">竣工验收</option>
-			            	</select>
-			             </td>
-</tr>
-</table>
 <div id="myTabContent" class="tab-content">
    <div class="tab-pane fade in active" id="axlysp">
-      <div  style="background-color:#f4f4f4;">
+	<table class="apply">
+		<tr>
+			<th style="width: 7%">流程节点：&nbsp;</th>
+			<td><select
+				style="width: 31.5%; height: 35px; cursor: pointer;"
+				name="lcjd" id="lcjd"
+				onchange="jsjdgl.detail.lcjd(this.options[this.options.selectedIndex].value)">
+					<option></option>
+					<option value="1">岸线利用审批</option>
+					<option value="2">项目审批、核准、备案</option>
+					<option value="3">初步设计审批</option>
+					<option value="4">施工图设计审批</option>
+					<option value="5">开工备案</option>
+					<option value="6">交工验收</option>
+					<c:if test="${record.xmlx!=2202 }">
+						<option value="7">试运行备案</option>
+					</c:if>
+					<option value="8">竣工验收</option>
+			</select></td>
+		</tr>
+	</table>
+	<div  style="background-color:#f4f4f4;">
 				<table id="tb" class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="10%">流程节点</th>	
@@ -1066,7 +1065,7 @@ text-align:center;
 						<th width="10%">港口</th>
 						<th width="10%">港区</th>
 						<th width="10%">项目法人</th>
-						<th width="10%">建设地点</th>
+						<th width="10%">建设地址</th>
 						<th width="15%">项目类型</th>
 						<th width="15%">操作</th>
 					</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxadd.jsp

@@ -124,7 +124,7 @@
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxedit.jsp

@@ -123,7 +123,7 @@
 								<span id="xmlxsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxview.jsp

@@ -88,7 +88,7 @@
 							<td >
 								${record.xmlxzw }
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								${record.jsdd }
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/tzjhgl/tzjhgladd.jsp

@@ -130,7 +130,7 @@
 						<th width="10%">港口</th>
 						<th width="10%">港区</th>
 						<th width="10%">项目法人</th>
-						<th width="10%">建设地点</th>
+						<th width="10%">建设地址</th>
 						<th width="15%">项目类型</th>
 						<th width="15%">操作</th>
 					</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/tzjhgl/xmxxxz.jsp

@@ -71,7 +71,7 @@
 						<th width="10%">港口</th>
 						<th width="10%">港区</th>
 						<th width="10%">项目法人</th>
-						<th width="10%">建设地点</th>
+						<th width="10%">建设地址</th>
 						<th width="15%">项目类型</th>
 						<th width="15%">操作</th>
 					</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgladd.jsp

@@ -124,7 +124,7 @@
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgledit.jsp

@@ -123,7 +123,7 @@
 								<span id="xmlxsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>建设地点：&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglview.jsp

@@ -74,7 +74,7 @@
 							<td >
 								${record.xmlxzw }
 							</td>
-							<th>建设地点：&nbsp;</th>
+							<th>建设地址：&nbsp;</th>
 							<td >
 								${record.jsdd }
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp

@@ -141,10 +141,10 @@
 						<tr>
 							<th width="5%">序号</th>
 							<th width="15%">港口经营人</th>
+							<th width="15%">港口经营许可证号</th>
 							<th width="10%">法定代表人</th>
 							<th width="8%">所在港口</th>
 							<th width="8%">所在港区</th>
-							<th width="15%">港口经营许可证号</th>
 							<th width="10%">企业性质</th>
 							<th width="9%">有效期</th>
 							<th width="20%">操作</th>
@@ -153,10 +153,10 @@
 							<tr>
 								<td>${status.index+1 }</td>
 								<td>${gkjyr.gkjyr }</td>
+								<td>${gkjyr.gkjyxkzh }</td>
 								<td>${gkjyr.fddbr }</td>
 								<td>${gkjyr.szgkzw }</td>
 								<td>${gkjyr.szgqzw }</td>
-								<td>${gkjyr.gkjyxkzh }</td>
 								<td>${gkjyr.qyxzzw}</td>
 								<td>${gkjyr.xkzyxqfmt}</td>
 								<td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrxkzfz/xkzfzmain.jsp

@@ -127,13 +127,13 @@
 				    <thead>
 					    <tr>
 					    	<th width="5%">序号</th>
-							<th width="15%">证书编号</th>
-			        		<th width="15%">港口经营人</th>
-			    			<th width="15%">作业危险品名</th>
-							<th width="15%">发证日期</th>
-							<th width="15%">有效日期</th>
-							<th width="15%">证书状态</th>
-					        <th width="20%">操作</th>
+							<th width="18%">证书编号</th>
+			        		<th width="16%">港口经营人</th>
+			    			<th width="30%">作业危险品名</th>
+							<th width="8%">发证日期</th>
+							<th width="8%">有效日期</th>
+							<th width="8%">证书状态</th>
+					        <th width="6%">操作</th>
 					    </tr>
 				    </thead>
 				    <c:forEach items="${list}" var="xkzfz" varStatus="status">
@@ -144,7 +144,10 @@
 							<td >${xkzfz.wxhwpm }</td>
 							<td >${xkzfz.yxqkssjfmt }</td>
 							<td >${xkzfz.yxqjssjfmt }</td>
-							<td ><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
+							<td >
+								<c:if test="${xkzfz.recordStatus==1}">有效</c:if> 
+								<c:if test="${xkzfz.recordStatus==9}">无效</c:if> 
+							</td>
 					        <td>
 						        <authz:hasPermission name="${appName}:xkzfz:main">
 						        <a class="btn btn-default btn-xs" href="#" onclick="xkzfz.main.view('${xkzfz.id}')">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/gkaxzyhmtsslyxlfx/gkaxzytj.jsp

@@ -124,7 +124,7 @@
 						<th rowspan="2" width="5%">序号</th>	
 						<th rowspan="2" width="5%">项目名称</th>
 						<th rowspan="2" width="5%">项目法人</th>
-						<th rowspan="2" width="5%">建设地点</th>
+						<th rowspan="2" width="5%">建设地址</th>
 						<th rowspan="2" width="5%">吨级</th>
 						<th colspan="3" width="10%">泊位数</th>
 						<th rowspan="2" width="5%">泊位性质</th>

gkjsjy/trunk/WebContent/WEB-INF/pages/index/indexmain.jsp

@@ -71,7 +71,7 @@
 										</td>
 									</tr>
 									<tr>
-										<th>万吨级以上泊位个数<br>（内河千吨级）：</th>
+										<th>万吨级以上泊位个数&nbsp;&nbsp;<br>（内河千吨级）：&nbsp;</th>
 										<td id="prowdbwgs">
 										</td>
 									</tr>
@@ -277,7 +277,7 @@
 										</td>
 									</tr>
 									<tr>
-										<th>万吨级以上泊位个数<br>(内河千吨级)：</th>
+										<th>万吨级以上泊位个数&nbsp;<br>(内河千吨级)：&nbsp;</th>
 										<td id="wdbwgs">
 										</td>
 									</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/sys/main.jsp

@@ -70,7 +70,7 @@
 				<div class="tubiao">
 					<img alt="" style="margin-left: 20px;" onclick="main.index()" title="首页" src="${app }/static/biz/image/index/2.png">&nbsp;&nbsp;
 					<%-- <img alt="" title="数据交换" onclick="main.jiaohuan()" src="${app }/static/biz/image/index/3.png">&nbsp;&nbsp; --%>
-					<img alt="" title="待办一览" onclick="main.menuClick('todo','待办一览','/todo')" src="${app }/static/biz/image/index/1.png">&nbsp;&nbsp;
+					<img alt="" title="待办事务" onclick="main.menuClick('todo','待办事务','/todo')" src="${app }/static/biz/image/index/1.png">&nbsp;&nbsp;
 					<img alt="" title="修改密码" onclick="main.shenbao()" src="${app }/static/biz/image/index/editpwd.png">&nbsp;&nbsp;
 					<img alt="" title="注销" onclick="main.logout()" src="${app }/static/biz/image/index/4.png">
 				</div>

gkjsjy/trunk/WebContent/static/biz/js/gkjcxx/mt/mtmain.js

@@ -161,7 +161,7 @@ mt.main.initMtyt=function(divid, existVal){
    if (data) {
 	   		var existValArr = new Array;
 	   		if(existVal!=null){
-	   			existValArr=existVal.split(",");
+	   			existValArr=existVal.split(";");
 	   		}
   			for(var i=0;i<data.length;i++){
   				var flag = false;

gkjsjy/trunk/src/cache/CacheSearchCondition.java

@@ -40,6 +40,7 @@ public class CacheSearchCondition {
 		if(null!=cacheSCmap){
 			try {
 				if(null!=beanMap&&!beanMap.isEmpty()){
+					cacheSCmap.clear();
 					for(Map.Entry et:beanMap.entrySet()){
 						if(et.getValue() instanceof String[]){
 							String[] vs=(String[])et.getValue();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/mt/ctl/MtCtl.java

@@ -192,12 +192,28 @@ public class MtCtl extends BaseWebCtl {
 //					list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + SearchCondition.mtfwlx + "%"));
 //				}
 				if (StringUtils.isNotEmpty(mtyt)) {
-					list.add(cb.like(root.get("mtyt").as(String.class), "%" + mtyt + "%"));
+					In<String> in = cb.in(root.get("mtyt").as(String.class));
+					String[] mtytStr = mtyt.split(",");
+					for(String tmp:mtytStr){
+						in.value(tmp);
+					}
+					list.add(in);
+					//list.add(cb.like(root.get("mtyt").as(String.class), "%" + v + "%"));
 				}else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mtyt");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("mtyt").as(String.class), "%" + v + "%"));
+					Object v= CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mtyt");
+					if(v!=null&&!"".equals(v)){
+						In<String> in = cb.in(root.get("mtyt").as(String.class));
+						if(v instanceof String){
+							in.value((String)v);
+						}else{
+							for(String tmp:(String[])v){
+								in.value(tmp);
+							}
+						}
+						list.add(in);
+						
 					}
+						//list.add(cb.like(root.get("mtyt").as(String.class), "%" + v + "%"));
 				}
 //				else if (StringUtils.isNotEmpty(SearchCondition.mtyt) && isGET(request)) {
 //					list.add(cb.like(root.get("mtyt").as(String.class), "%" + SearchCondition.mtyt + "%"));
@@ -364,7 +380,21 @@ public class MtCtl extends BaseWebCtl {
 		model.addAttribute("menuid", menuid);
 		model.addAttribute("sfdwkfid", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfdwkfid"));
 		model.addAttribute("fwlx", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fwlxid"));
-		model.addAttribute("mtyt", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mtyt"));
+		Object v= CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mtyt");
+		if(v!=null&&!"".equals(v)){
+			String mtytStr = "";
+			if(v instanceof String){
+				mtytStr = (String) v;
+			}else{
+				for(String tmp:(String[])v){
+					mtytStr+=tmp+";";
+				}
+				if(!"".equals(mtytStr)){
+					mtytStr = mtytStr.substring(0,mtytStr.length()-1);
+				}
+			}
+			model.addAttribute("mtyt", mtytStr);
+		}
 		
 		// 翻页共通
 		putPageInfo(model, page, list);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java

@@ -323,7 +323,7 @@ public class TzjhglCtl extends BaseWebCtl {
 		}
 		if (StringUtils.isEmpty(xmlbid)) {
 			wr.setSuccess(false);
-			wr.setMessage("请选择建设项目类型");
+			wr.setMessage("请选择所属计划");
 			return wr;
 		}
 

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java

@@ -7,6 +7,7 @@ import java.io.OutputStream;
 import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -258,6 +259,8 @@ public class XkzfzCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(fzpage)));
 		}
+		page.setSort("yxqjssj");
+		page.setOrder("desc");
 //		if(isPOST(request)){
 //			SearchCondition.fzpage=page.getPage();
 //			SearchCondition.fzsqh=fzsqh;
@@ -293,6 +296,15 @@ public class XkzfzCtl extends BaseWebCtl {
 				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+				Calendar time = Calendar.getInstance();
+				time.set(Calendar.HOUR_OF_DAY, 0);
+				time.set(Calendar.MINUTE, 0);
+				time.set(Calendar.SECOND, 0);
+				if (vo.getYxqjssjfmt() != null && DateTime.toDate(entity.getYxqjssj()).getTime() > time.getTimeInMillis()) {
+					vo.setRecordStatus(1);
+				} else {
+					vo.setRecordStatus(9);
+				}
 				voList.add(vo);
 			}
 		}