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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp

@@ -173,9 +173,9 @@
 		       	  			<a class="btn btn-default btn-sm" href="#" onclick="xkzxx.main.search()">
 						   		<i class="glyphicon glyphicon-search"></i>查询
 						   	</a>
-						   	<a class="btn btn-default btn-sm" href="#"  onclick="xkzxx.main.add()">
+						   	<!-- <a class="btn btn-default btn-sm" href="#"  onclick="xkzxx.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
-							            新增</a>
+							            新增</a> -->
 				            <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${gkjyrzw}','${szgq}','${gkjyxkzh}','${szd}','${szgk}','${yxq1}','${yxq2}','${sfyx}','${xkzsfdq}')">
 						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
@@ -225,14 +225,14 @@
 						        <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.view('${xkzxx.id}')" title="详情">
 						            <i class="glyphicon glyphicon-search"></i>
 						        </a>
-						        <c:if test ="${xkzxx.isflag == 1 }">
+						        <%-- <c:if test ="${xkzxx.isflag == 1 }">
 						        <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.edit('${xkzxx.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 								<a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.del('${xkzxx.id}')" title=" 删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									        </a>
-								</c:if>
+								</c:if> --%>
 								
 						        <c:if test="${xkzxx.sfyx=='1'}">
 						        <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.preview('${xkzxx.id}')" title="预览">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgjds.jsp

@@ -50,27 +50,27 @@
 		
 		<tr>
 			<td style="text-indent:2em" nowrap="true">你（单位）向本机关提出的&nbsp;</td>
-			<td colspan="3"><input type="text" class="form-control" id="jyrfwmc" name="jyrfwmc" value="港口经营范围变更"></td>
+			<td colspan="3">港口经营范围变更</td>
 		</tr>
 		<tr>
 			<td colspan="4">的交通行政许可申请。经审查，根据</td>
 		</tr>
 		<tr>
-			<td colspan="4"><textarea style="width: 99%;height: 60px" rows="3" cols="3" id="gjrn" name="gjrn" >《中华人民共和国港口法》和《港口经营管理规定》（中华人民共和国交通部令2014年第22号）</textarea></td>
+			<td colspan="4">《中华人民共和国港口法》和《港口经营管理规定》（中华人民共和国交通部令2014年第22号）</td>
 		</tr>
 		<tr>
 			<td colspan="4">的规定，本机关作出如下行政许可决定：</td>
 		</tr>
 		<tr>
-		<td colspan="4"><textarea style="width: 99%;height: 120px" rows="5" cols="3" id="xkzrn" name="xkzrn" >${jds.xkzrn }</textarea></td>
+		<td colspan="4">${jds.xkzrn }</td>
 		</tr>
 		<tr>
 			<td colspan="3" align="right">单位：</td>
-			<td><input type="text" class="form-control" id="dw" name="dw" value="${jds.dw }"></td>
+			<td>${jds.dw }</td>
 		</tr>
 		<tr>
 			<td colspan="3" align="right">日期：</td>
-			<td><input type="text" class="form-control" id="rq" name="rq" value="${jds.rq }"></td>
+			<td>${jds.rq }</td>
 		</tr>
 	</table>
 	

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp

@@ -115,14 +115,13 @@
 			<div  style="background-color:#f4f4f4;">
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
-						<th width="10%">序号</th>	
+						<th width="6%">序号</th>	
 						<th width="20%">港口经营人</th>
-						<th width="10%">办公地点</th>
+						<th width="20%">办公地点</th>
 						<th width="10%">法定代表</th>
 						<th width="10%">联系人 </th>
 						<th width="10%">联系电话</th>
 						<th width="1%" class="operatetd">操作</th>
-						<th width="1%" class="operatetd">审核</th>
 					</tr>
 					 <c:forEach items="${list}" var="xkz" varStatus="status">
 						<tr class="tr_bg">
@@ -166,8 +165,18 @@
 										class="glyphicon glyphicon-search"></i>
 									</a>
 								</c:if>
+								<c:if test="${xkz.taskState =='Y'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzbg.main.banli('${xkz.id}')" title=" 办理">
+									   <i class="glyphicon glyphicon-check"></i> 
+									         </a>
+							 </c:if>
+							  <c:if test="${xkz.taskState =='TH'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzbg.main.back('${xkz.id}')" title="">
+									   <i class="glyphicon glyphicon-check"></i> 
+									         </a>
+							 </c:if>
 							</td>
-							<td class="operatetd">
+							<%-- <td class="operatetd">
 							  <c:if test="${xkz.taskState =='Y'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzbg.main.banli('${xkz.id}')" title=" 办理">
 									   <i class="glyphicon glyphicon-check"></i> 
@@ -178,7 +187,7 @@
 									   <i class="glyphicon glyphicon-check"></i> 
 									         </a>
 							 </c:if>
-							</td>
+							</td> --%>
 						</tr>
 					</c:forEach>
 				</table>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqjds.jsp

@@ -51,27 +51,27 @@
 		
 		<tr>
 			<td style="text-indent:2em" nowrap="true">你（单位）向本机关提出的&nbsp;</td>
-			<td colspan="3"><input type="text" readonly="readonly" class="form-control" id="jyrfwmc" name="jyrfwmc" value="${jds.jyrfwmc }"></td>
+			<td colspan="3">${jds.jyrfwmc }</td>
 		</tr>
 		<tr>
 			<td colspan="4">的交通行政许可申请。经审查，根据</td>
 		</tr>
 		<tr>
-			<td colspan="4"><textarea readonly="readonly" style="width: 99%;height: 60px" rows="3" cols="3" id="gjrn" name="gjrn" >${jds.gjrn }</textarea></td>
+			<td colspan="4">${jds.gjrn }</td>
 		</tr>
 		<tr>
 			<td colspan="4">的规定，本机关作出如下行政许可决定：</td>
 		</tr>
 		<tr>
-		<td colspan="4"><textarea readonly="readonly" style="width: 99%;height: 120px" rows="5" cols="3" id="xkzrn" name="xkzrn" >${jds.xkzrn }</textarea></td>
+		<td colspan="4">${jds.xkzrn }</td>
 		</tr>
 		<tr>
 			<td colspan="3" align="right">单位：</td>
-			<td><input type="text" class="form-control" readonly="readonly" id="dw" name="dw" value="${jds.dw }"></td>
+			<td>${jds.dw }</td>
 		</tr>
 		<tr>
 			<td colspan="3" align="right">日期：</td>
-			<td><input type="text" class="form-control" readonly="readonly" id="rq" name="rq" value="${jds.rq }"></td>
+			<td>${jds.rq }</td>
 		</tr>
 	</table>
 	

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp

@@ -117,12 +117,12 @@
 			<div  style="background-color:#f4f4f4;">
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
-						<th width="10%">序号</th>	
-						<th width="10%">港口经营人</th>
-						<th width="10%">办公地点</th>
-						<th width="10%">法定代表人</th>
-						<th width="10%">联系人 </th>
-						<th width="20%">联系电话</th>
+						<th width="5%">序号</th>	
+						<th width="20%">港口经营人</th>
+						<th width="20%">办公地点</th>
+						<th width="15%">法定代表人</th>
+						<th width="15%">联系人 </th>
+						<th width="15%">联系电话</th>
 						<th width="1%" class="operatetd">操作</th>
 					</tr>
 					 <c:forEach items="${list}" var="xkz" varStatus="status">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxjds.jsp

@@ -53,8 +53,7 @@
 		</tr>
 		<tr>
 			<td>
-			<input type="text" class="form-control" id="jyrmc" name="jyrmc" value="${jds.xkzbh }">
-				
+			${jds.xkzbh }
 			</td>
 		</tr>
 		<tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp

@@ -101,14 +101,14 @@
 			<div  style="background-color:#f4f4f4;">
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
-						<th width="10%">序号</th>	
-						<th width="10%">港口经营人</th>
-						<th width="10%">办公地点</th>
-						<th width="10%">法定代表人</th>
-						<th width="10%">联系人 </th>
-						<th width="10%">联系电话</th>
+						<th width="5%">序号</th>	
+						<th width="20%">港口经营人</th>
+						<th width="20%">办公地点</th>
+						<th width="15%">法定代表人</th>
+						<th width="15%">联系人 </th>
+						<th width="15%">联系电话</th>
 						<th width="1%" class="operatetd">操作</th>
-						<th width="1%" class="operatetd">审核</th>
+						<!-- <th width="1%" class="operatetd">审核</th> -->
 					</tr>
 					 <c:forEach items="${list}" var="xkz" varStatus="status">
 						<tr class="tr_bg">
@@ -148,9 +148,18 @@
 										class="glyphicon glyphicon-search"></i>
 									</a>
 								</c:if>   
-									         
+									  <c:if test="${xkz.taskState =='Y'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzyx.main.banli('${xkz.id}')" title="办理">
+									   <i class="glyphicon glyphicon-check"></i> 
+									          </a>
+							 </c:if>
+							  <c:if test="${xkz.taskState =='TH'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzyx.main.back('${xkz.id}')" title="办理">
+									   <i class="glyphicon glyphicon-check"></i> 
+									          </a>
+							 </c:if>       
 							</td>
-								<td class="operatetd">
+								<%-- <td class="operatetd">
 							 <c:if test="${xkz.taskState =='Y'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzyx.main.banli('${xkz.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
@@ -161,7 +170,7 @@
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>
 							 </c:if>
-							 </td>
+							 </td> --%>
 						</tr>
 					</c:forEach>
 				</table>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxmain.jsp

@@ -102,14 +102,14 @@
 			<div  style="background-color:#f4f4f4;">
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
-						<th width="10%">序号</th>	
-						<th width="10%">港口经营人</th>
-						<th width="10%">办公地点</th>
-						<th width="10%">法定代表人</th>
-						<th width="10%">联系人 </th>
-						<th width="10%">联系电话</th>
+						<th width="5%">序号</th>	
+						<th width="20%">港口经营人</th>
+						<th width="20%">办公地点</th>
+						<th width="15%">法定代表人</th>
+						<th width="15%">联系人 </th>
+						<th width="15%">联系电话</th>
 						<th width="1%" class="operatetd">操作</th>
-						<th width="1%" class="operatetd">审批 </th>
+						<!-- <th width="1%" class="operatetd">审批 </th> -->
 					</tr>
 					 <c:forEach items="${list}" var="xkz" varStatus="status">
 						<tr class="tr_bg">
@@ -148,8 +148,18 @@
 										class="glyphicon glyphicon-search"></i>
 									</a>
 								</c:if>   
+								<c:if test="${xkz.taskState =='Y'  }">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzzx.main.banli('${xkz.id}')" title="办理">
+									   <i class="glyphicon glyphicon-check"></i> 
+									          </a>
+							 </c:if>
+							 <c:if test="${xkz.taskState =='TH'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzzx.main.back('${xkz.id}')" title="办理">
+									   <i class="glyphicon glyphicon-check"></i> 
+									          </a>
+							 </c:if>
 							</td>
-							<td class="operatetd">
+							<%-- <td class="operatetd">
 							 <c:if test="${xkz.taskState =='Y'  }">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzzx.main.banli('${xkz.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
@@ -160,7 +170,7 @@
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>
 							 </c:if>
-							 </td>
+							 </td> --%>
 						</tr>
 					</c:forEach>
 				</table>

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkbg/xkzbgdetail.js

@@ -485,6 +485,9 @@ xkzbg.detail.jydyxz = function(){
    		    	if(!isEmpty(jyzl.bwmc)){
    		    		strr = strr +jyzl.bwmc;
    		    	}
+   		    	if(strr!=""&&strr!=null&&strr.substr(-1)==","){
+					strr = strr.substr(0,strr.length-1);
+				}
    		    	str+='<td>'+strr +'</td>';
 		    	str+='<td>' +
 			'<a class="btn btn-default btn-xs" href="#" onclick="xkzbg.detail.del(\''+jyzl.id+'\')">' +
@@ -672,6 +675,9 @@ xkzbg.detail.savejydy = function(){
        		    	if(!isEmpty(data.attrs.xzjy.bwmc)){
        		    		strr = strr +data.attrs.xzjy.bwmc;
        		    	}
+       		    	if(strr!=""&&strr!=null&&strr.substr(-1)==","){
+						strr = strr.substr(0,strr.length-1);
+					}
        		    	str+='<td>'+strr +'</td>';
        		    	str+='<td>' +
 	    			'<a class="btn btn-default btn-xs" href="#" onclick="xkzbg.detail.del(\''+id+'\')">' +

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzksq/xkzsqdetail.js

@@ -446,6 +446,11 @@ xkzsq.detail.jydyxz = function() {
 								if (!isEmpty(jyzl.bwmc)) {
 									strr = strr + jyzl.bwmc;
 								}
+								//alert(strr);
+								if(strr!=""&&strr!=null&&strr.substr(-1)==","){
+									strr = strr.substr(0,strr.length-1);
+								}
+								//alert(strr);
 								str += '<td>' + strr + '</td>';
 								str += '<td>'
 										+ '<a class="btn btn-default btn-xs" href="#" onclick="xkzsq.detail.del(\''
@@ -672,6 +677,9 @@ xkzsq.detail.savejydy = function() {
 						if (!isEmpty(data.attrs.xzjy.bwmc)) {
 							strr = strr + data.attrs.xzjy.bwmc;
 						}
+						if(strr!=""&&strr!=null&&strr.substr(-1)==","){
+							strr = strr.substr(0,strr.length-1);
+						}
 						str += '<td>' + strr + '</td>';
 						str += '<td>'
 								+ '<a class="btn btn-default btn-xs" href="#" onclick="xkzsq.detail.del(\''

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkyx/xkzyxdetail.js

@@ -465,6 +465,9 @@ xkzyx.detail.jydyxz = function() {
 								if (!isEmpty(jyzl.bwmc)) {
 									strr = strr + jyzl.bwmc;
 								}
+								if(strr!=""&&strr!=null&&strr.substr(-1)==","){
+									strr = strr.substr(0,strr.length-1);
+								}
 								str += '<td>' + strr + '</td>';
 								str += '<td>'
 										+ '<a class="btn btn-default btn-xs" href="#" onclick="xkzyx.detail.del(\''
@@ -679,6 +682,9 @@ xkzyx.detail.savejydy = function() {
        		    	if(!isEmpty(data.attrs.xzjy.bwmc)){
        		    		strr = strr +data.attrs.xzjy.bwmc;
        		    	}
+       		    	if(strr!=""&&strr!=null&&strr.substr(-1)==","){
+						strr = strr.substr(0,strr.length-1);
+					}
        		    	str+='<td>'+strr +'</td>';
        		    	str+='<td>' +
 	    			'<a class="btn btn-default btn-xs" href="#" onclick="xkzyx.detail.del(\''+id+'\')">' +

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -115,7 +115,7 @@ import com.xtframe.util.StringUtils;
  * 许可证管理Controller
  * 
  * @author xuhx
- *
+ * 
  */
 @Controller
 @RequestMapping("/xkzbg")
@@ -184,6 +184,7 @@ public class XkzbgCtl extends BaseWebCtl {
 	private XkzsqfjService xkzsqfjService;
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
+
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("gkjyxkbg:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -960,6 +961,9 @@ public class XkzbgCtl extends BaseWebCtl {
 							str = str + bw.getBwmc();
 						}
 					}
+					if (str != null && str.endsWith(",")) {
+						str = str.substring(0, str.length() - 1);
+					}
 					jyfwstr = jyfwstr + str + ")<br/>";
 					jylzstr += str + jydy + "<br/>";
 					jyfwids.add(entity.getJyfwid());
@@ -1203,6 +1207,9 @@ public class XkzbgCtl extends BaseWebCtl {
 							str = str + bw.getBwmc();
 						}
 					}
+					if (str != null && str.endsWith(",")) {
+						str = str.substring(0, str.length() - 1);
+					}
 					jyfwstr = jyfwstr + str + ")<br/>";
 					jylzstr += str + jydy + "<br/>";
 					jyfwids.add(entity.getJyfwid());
@@ -1536,6 +1543,9 @@ public class XkzbgCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")<br/>";
 				jylzstr += str + jydy + "<br/>";
 				jyfwids.add(entity.getJyfwid());
@@ -2266,7 +2276,8 @@ public class XkzbgCtl extends BaseWebCtl {
 
 			}
 			// rtx提醒
-			//rtxSend(xkzbgEntity.getSzgq().getId(), Constants.ROLE_CLSC, "你有一条许可证变更待办事务，请及时处理！");
+			// rtxSend(xkzbgEntity.getSzgq().getId(), Constants.ROLE_CLSC,
+			// "你有一条许可证变更待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -2507,7 +2518,8 @@ public class XkzbgCtl extends BaseWebCtl {
 			}
 			xkzbgService.changeAudit(null, xkzbgEntity, true);
 			// rtx提醒
-			//rtxSend(xkzbgEntity.getSzgq().getId(), Constants.ROLE_CLSC, "你有一条许可证变更待办事务，请及时处理！");
+			// rtxSend(xkzbgEntity.getSzgq().getId(), Constants.ROLE_CLSC,
+			// "你有一条许可证变更待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -2675,7 +2687,8 @@ public class XkzbgCtl extends BaseWebCtl {
 				}
 			} else {
 				// rtx提醒
-				//rtxSend(entity.getSzgq().getId(), role, "你有一条许可证变更待办事务，请及时处理！");
+				// rtxSend(entity.getSzgq().getId(), role,
+				// "你有一条许可证变更待办事务，请及时处理！");
 			}
 			wr.setAttr("jflag", jflag);
 		} catch (Exception e) {
@@ -2757,6 +2770,9 @@ public class XkzbgCtl extends BaseWebCtl {
 							str = str + bw.getBwmc();
 						}
 					}
+					if (str != null && str.endsWith(",")) {
+						str = str.substring(0, str.length() - 1);
+					}
 					jylzstr += str + " ";
 				}
 				jds.setXkzrn("同意你（单位）人事以下港口经营业务：" + jyfwstr2);
@@ -2962,10 +2978,10 @@ public class XkzbgCtl extends BaseWebCtl {
 			xkz.setZyqyfw(jyfwstr2);
 			xkz.setCq(jylzstr);
 			if (!StringUtils.isEmpty(user.getSsglbm())) {
-				XzglbmxxEntity glbm= user.getSsglbm();
-				if("00".equals(glbm.getPid())){
+				XzglbmxxEntity glbm = user.getSsglbm();
+				if ("00".equals(glbm.getPid())) {
 					xkz.setFzjg(glbm.getGkglbmqc());
-				}else{
+				} else {
 					XzglbmxxEntity pglbm = xzglbmxxService.getPglbm(glbm.getPid());
 					xkz.setFzjg(pglbm.getGkglbmqc());
 				}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -621,6 +621,9 @@ public class XkzsqCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")<br/>";
 				jylzstr += str + jydy + "<br/>";
 				jyfwids.add(entity.getJyfwid());
@@ -821,6 +824,9 @@ public class XkzsqCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")\n";
 				jylzstr += str + jydy + "\n";
 				jyfwids.add(entity.getJyfwid());
@@ -1017,6 +1023,9 @@ public class XkzsqCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")\n";
 				jylzstr += str + jydy + "\n";
 				jyfwids.add(entity.getJyfwid());
@@ -1132,6 +1141,9 @@ public class XkzsqCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")<br/>";
 				jylzstr += str + jydy + "<br/>";
 				jyfwids.add(entity.getJyfwid());
@@ -2239,6 +2251,9 @@ public class XkzsqCtl extends BaseWebCtl {
 								str = str + bw.getBwmc();
 							}
 						}
+						if (str != null && str.endsWith(",")) {
+							str = str.substring(0, str.length() - 1);
+						}
 						jyfwstr = jyfwstr + str + ")\n";
 						jylzstr += str + jydy + "\n";
 						jyfwids.add(entity.getJyfwid());
@@ -2531,6 +2546,9 @@ public class XkzsqCtl extends BaseWebCtl {
 							str = str + bw.getBwmc();
 						}
 					}
+					if (str != null && str.endsWith(",")) {
+						str = str.substring(0, str.length() - 1);
+					}
 					jylzstr += str + " ";
 				}
 				jds.setJyrfwmc(jyfwstr);
@@ -2787,6 +2805,9 @@ public class XkzsqCtl extends BaseWebCtl {
 							str = str + bw.getBwmc();
 						}
 					}
+					if (str != null && str.endsWith(",")) {
+						str = str.substring(0, str.length() - 1);
+					}
 					jyfwstr = jyfwstr + str + ")\n";
 					jylzstr += str + jydy + "\n";
 					jyfwids.add(entity.getJyfwid());

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -406,6 +406,9 @@ public class XkzyxCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")\n";
 				jydystr += str + jydy + "\n";
 				jyfwids.add(entity.getJyfwid());
@@ -627,6 +630,9 @@ public class XkzyxCtl extends BaseWebCtl {
 							str = str + bw.getBwmc();
 						}
 					}
+					if (str != null && str.endsWith(",")) {
+						str = str.substring(0, str.length() - 1);
+					}
 					jyfwstr = jyfwstr + str + ")<br/>";
 					jydystr += str + jydy + "<br/>";
 					jyfwids.add(entity.getJyfwid());
@@ -671,6 +677,9 @@ public class XkzyxCtl extends BaseWebCtl {
 								str = str + bw.getBwmc();
 							}
 						}
+						if (str != null && str.endsWith(",")) {
+							str = str.substring(0, str.length() - 1);
+						}
 						jyfwstr = jyfwstr + str + ")\n";
 						jydystr += str + jydy + "\n";
 						jyfwids.add(entity.getJyfwid());
@@ -873,6 +882,9 @@ public class XkzyxCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")\n";
 				jydystr += str + jydy + "\n";
 				jyfwids.add(entity.getJyfwid());
@@ -918,6 +930,9 @@ public class XkzyxCtl extends BaseWebCtl {
 							str = str + bw.getBwmc();
 						}
 					}
+					if (str != null && str.endsWith(",")) {
+						str = str.substring(0, str.length() - 1);
+					}
 					jyfwstr = jyfwstr + str + ")\n";
 					jydystr += str + jydy + "\n";
 					jyfwids.add(entity.getJyfwid());
@@ -1118,6 +1133,9 @@ public class XkzyxCtl extends BaseWebCtl {
 							str = str + bw.getBwmc();
 						}
 					}
+					if (str != null && str.endsWith(",")) {
+						str = str.substring(0, str.length() - 1);
+					}
 					jyfwstr = jyfwstr + str + ")\n";
 					jydystr += str + jydy + "\n";
 					jyfwids.add(entity.getJyfwid());
@@ -1489,6 +1507,9 @@ public class XkzyxCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")<br/>";
 				jydystr += str + jydy + "<br/>";
 				jyfwids.add(entity.getJyfwid());
@@ -1584,6 +1605,9 @@ public class XkzyxCtl extends BaseWebCtl {
 					str = str + bw.getBwmc();
 				}
 			}
+			if (str != null && str.endsWith(",")) {
+				str = str.substring(0, str.length() - 1);
+			}
 			jyfwstr = jyfwstr + str + ")\n";
 			jydystr += str + jydy + "\n";
 			jyfwids.add(entity.getJyfwid());

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -114,7 +114,7 @@ import com.xtframe.util.StringUtils;
  * 许可证管理Controller
  * 
  * @author xuhx
- *
+ * 
  */
 @Controller
 @RequestMapping("/xkzzx")
@@ -459,6 +459,9 @@ public class XkzzxCtl extends BaseWebCtl {
 					str = str + bw.getBwmc();
 				}
 			}
+			if (str != null && str.endsWith(",")) {
+				str = str.substring(0, str.length() - 1);
+			}
 			jyfwstr = jyfwstr + str + ")\n";
 			jydystr += str + jydy + "\n";
 			jyfwids.add(entity.getJyfwid());
@@ -942,6 +945,9 @@ public class XkzzxCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")<br/>";
 				jydystr += str + jydy + "<br/>";
 				jyfwids.add(entity.getJyfwid());
@@ -1132,6 +1138,9 @@ public class XkzzxCtl extends BaseWebCtl {
 					str = str + bw.getBwmc();
 				}
 			}
+			if (str != null && str.endsWith(",")) {
+				str = str.substring(0, str.length() - 1);
+			}
 			jyfwstr = jyfwstr + str + ")\n";
 			jydystr += str + jydy + "\n";
 			jyfwids.add(entity.getJyfwid());
@@ -1326,6 +1335,9 @@ public class XkzzxCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")\n";
 				jydystr += str + jydy + "\n";
 				jyfwids.add(entity.getJyfwid());
@@ -1655,7 +1667,8 @@ public class XkzzxCtl extends BaseWebCtl {
 				}
 			}
 			// rtx提醒
-			//rtxSend(xkzzxEntity.getSzgq().getId(), Constants.ROLE_CLSC, "你有一条许可证注销待办事务，请及时处理！");
+			// rtxSend(xkzzxEntity.getSzgq().getId(), Constants.ROLE_CLSC,
+			// "你有一条许可证注销待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -1704,7 +1717,8 @@ public class XkzzxCtl extends BaseWebCtl {
 			}
 			xkzzxService.changeAudit(null, xkzzxEntity, true);
 			// rtx提醒
-			//rtxSend(xkzzxEntity.getSzgq().getId(), Constants.ROLE_CLSC, "你有一条许可证注销待办事务，请及时处理！");
+			// rtxSend(xkzzxEntity.getSzgq().getId(), Constants.ROLE_CLSC,
+			// "你有一条许可证注销待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -1778,6 +1792,9 @@ public class XkzzxCtl extends BaseWebCtl {
 						str = str + bw.getBwmc();
 					}
 				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
 				jyfwstr = jyfwstr + str + ")<br/>";
 				jydystr += str + jydy + "<br/>";
 				jyfwids.add(entity.getJyfwid());
@@ -1862,6 +1879,9 @@ public class XkzzxCtl extends BaseWebCtl {
 					str = str + bw.getBwmc();
 				}
 			}
+			if (str != null && str.endsWith(",")) {
+				str = str.substring(0, str.length() - 1);
+			}
 			jyfwstr = jyfwstr + str + ")\n";
 			jydystr += str + jydy + "\n";
 			jyfwids.add(entity.getJyfwid());
@@ -1968,7 +1988,8 @@ public class XkzzxCtl extends BaseWebCtl {
 			boolean jflag = xkzzxService.changeAudit(shyj, entity, flag);
 			if (!jflag) {
 				// rtx提醒
-				//rtxSend(entity.getSzgq().getId(), role, "你有一条许可证注销待办事务，请及时处理！");
+				// rtxSend(entity.getSzgq().getId(), role,
+				// "你有一条许可证注销待办事务，请及时处理！");
 			}
 			wr.setAttr("jflag", jflag);
 		} catch (Exception e) {