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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.jsp

@@ -162,7 +162,7 @@
 							  <c:if test="${lhbg.opflag == 1   && ssFlag ==0}">
 							 <a class="btn btn-default btn-xs" href="#"
 									onclick="lhbg.main.fz('${lhbg.id}')"  title="发证"> <i
-										class="glyphicon glyphicon-search"></i>
+										class="glyphicon glyphicon-th-list"></i>
 										</a>
 							 </c:if>
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.jsp

@@ -164,7 +164,7 @@
 							   <c:if test="${lhyx.opflag == 1   && ssFlag ==0}">
 							 <a class="btn btn-default btn-xs" href="#"
 									onclick="lhyx.main.fz('${lhyx.id}')"  title="发证"> <i
-										class="glyphicon glyphicon-search"></i>
+										class="glyphicon glyphicon-th-list"></i>
 										</a>
 							 </c:if>
 							</td>

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -480,7 +480,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				vo.setSfwhqy(null != entity.getSfwhqy() ? entity.getSfwhqy().getText() : "");
 				List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(entity.getId());
 				for (XkzxxEntity xkz : xkzs) {
-					if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+					if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 						vo.setXkzyxq(xkz.getYxqz());
 						vo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 						vo.setGkjyxkzh(xkz.getGkjyxkzh());
@@ -2292,7 +2292,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
-		
+
 		// 岸线
 		List<AxEntity> axEntities = axService.findByJyrid(gkjyr.getId());
 		if (axEntities == null) {
@@ -2405,7 +2405,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setXzqh(gkjyr.getXzqh() != null ? gkjyr.getXzqh().getText() : "");
-		
+
 		// 危货附证
 		if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
 			List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
@@ -2503,7 +2503,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				voList5.add(vo);
 			}
 		}
-		
+
 		model.addAttribute("gkjyrxx", gkjyrVo);
 		return "gkjygl/gkjyr/jyrjbxx/print";
 	}