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

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

@@ -808,6 +808,12 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setCgsl(cgEntities.size() + "");
 		// 储罐总容量
 		gkjyrVo.setCgzrl(cgzrl + "");
+		
+		//危货附证
+		if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
+			String wxhwzyfz = xkzfzService.findByJyrid(gkjyr.getId()).get(0).getFzsqh();
+			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
+		}
 
 		model.addAttribute("gkjyr", gkjyrVo);
 		return "gkjygl/gkjyr/jyrjbxx/jyrview";
@@ -981,6 +987,11 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setQyxz(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getId() : "");
 
+		if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
+			String wxhwzyfz = xkzfzService.findByJyrid(gkjyr.getId()).get(0).getFzsqh();
+			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
+		}
+		
 		if (StringUtils.isEmpty(gkjyrVo.getZyid())) {
 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 			String zyid = dateTimeFormat.format(new Date());
@@ -1175,6 +1186,11 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setCgsl(cgEntities.size() + "");
 		// 储罐总容量
 		gkjyrVo.setCgzrl(cgzrl + "");
+		//危货附证
+		if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
+			String wxhwzyfz = xkzfzService.findByJyrid(gkjyr.getId()).get(0).getFzsqh();
+			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
+		}
 
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
@@ -1323,6 +1339,13 @@ public class GkjyrCtl extends BaseWebCtl {
 
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
+		
+		//危货附证
+		if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
+			String wxhwzyfz = xkzfzService.findByJyrid(gkjyr.getId()).get(0).getFzsqh();
+			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
+		}
+		
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
 		// 许可证信息