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

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

@@ -2695,6 +2695,7 @@ public class GkjyrCtl extends BaseWebCtl {
 			GkjyrVo gkjyrVo = new GkjyrVo();
 			if (null != entity) {
 				BeanUtils.copyProperties(entity, gkjyrVo);
+				
 				gkjyrVo.setSzdzw(null != entity.getSzd() ? entity.getSzd().getText() : "");
 				gkjyrVo.setSzgkzw(null != entity.getSzgk() ? entity.getSzgk().getGkmc() : "");
 				gkjyrVo.setSzgqzw(null != entity.getSzgq() ? entity.getSzgq().getGqmc() : "");
@@ -2706,6 +2707,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				}
 
 				gkjyrVo.setSfwhqy(null != entity.getSfwhqy() ? entity.getSfwhqy().getText() : "");
+				gkjyrVo.setXzqh(null != entity.getXzqh() ? entity.getXzqh().getText() : "");
 				gkjyrVo.setSfzdsp(null != entity.getSfzdsp() ? entity.getSfzdsp().getText() : "");
 				gkjyrVo.setYwcqzmzw(null != entity.getYwcqzm() ? entity.getYwcqzm().getText() : "");
 				gkjyrVo.setYwjgyszw(null != entity.getYwjgys() ? entity.getYwjgys().getText() : "");
@@ -2713,6 +2715,124 @@ public class GkjyrCtl extends BaseWebCtl {
 				gkjyrVo.setMtjgxszw(null != entity.getMtjgxs() ? entity.getMtjgxs().getText() : "");
 				gkjyrVo.setQyxzzw(null != entity.getQyxz() ? entity.getQyxz().getText() : "");
 				gkjyrVo.setFzrqstr(transFormatDate(entity.getFzrq()));
+				List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(entity.getId());
+				for (XkzxxEntity xkz : xkzs) {
+					if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+						gkjyrVo.setXkzyxq(xkz.getYxqz());
+						gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
+						gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
+						gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
+						gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
+						gkjyrVo.setJyfw(xkz.getZyqyfw());
+						gkjyrVo.setJyqy(xkz.getCq());
+					}
+				}
+
+				// 岸线
+				List<AxEntity> axEntities = axService.findByJyrid(entity.getId());
+				if (axEntities == null) {
+					axEntities = new ArrayList<AxEntity>();
+				}
+				double axcd = 0;
+				for (AxEntity axEntity : axEntities) {
+					axcd += axEntity == null ? 0 : axEntity.getAxcd();
+				}
+				// 岸线长度
+				gkjyrVo.setAxcd(axcd + "");
+
+				// 码头泊位
+				List<BwEntity> bwList = bwService.findByJyrid(entity.getId());
+				if (bwList == null) {
+					bwList = new ArrayList<BwEntity>();
+				}
+				// 码头泊位总数
+				gkjyrVo.setMtbwzs(bwList.size() + "");
+				int scxbw = 0;
+				int fscxbw = 0;
+				double zdkbnl = 0;
+				int wdjysbw = 0;
+				double bwzcd = 0;
+				double sjntgnl = 0;
+				double sjtgnl = 0;
+				for (BwEntity bwEntity : bwList) {
+					if (bwEntity.getSclx() != null) {
+						if (bwEntity.getSclx().getId().equals("2601") && bwEntity.getSclx().getId().equals("2602")) {
+							scxbw++;
+						} else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
+							fscxbw++;
+						}
+					}
+
+					sjtgnl = bwEntity.getSjtgnl() == null ? 0 : bwEntity.getSjtgnl();
+					zdkbnl += sjtgnl;
+					if (sjtgnl >= 10000) {
+						wdjysbw++;
+					}
+					bwzcd += bwEntity.getBwcd() == null ? 0 : bwEntity.getBwcd();
+					sjntgnl += bwEntity.getNhwtgnl() == null ? 0 : Double.parseDouble(bwEntity.getNhwtgnl());
+				}
+				// 泊位生产类型
+				gkjyrVo.setScxbw(scxbw + "");
+				gkjyrVo.setFscxbw(fscxbw + "");
+				// 最大靠泊能力
+				gkjyrVo.setZdkbnl(zdkbnl + "");
+				// 万吨级以上泊位
+				gkjyrVo.setWdjysbwsl(wdjysbw + "");
+				// 泊位总长度
+				gkjyrVo.setBwzcd(bwzcd + "");
+				// 设计年通过能力
+				gkjyrVo.setSjntgnl(sjntgnl + "");
+
+				// 仓库
+				List<CkEntity> ckEntities = ckService.findByJyrid(entity.getId());
+				if (ckEntities == null) {
+					ckEntities = new ArrayList<CkEntity>();
+				}
+				double ckzmj = 0;
+				for (CkEntity ckEntity : ckEntities) {
+					ckzmj += ckEntity.getCkzmj() == null ? 0 : ckEntity.getCkzmj();
+				}
+				// 仓库总面积
+				gkjyrVo.setCkzmj(ckzmj + "");
+
+				// 堆场
+				List<DcEntity> dcEntities = dcService.findByJyrid(entity.getId());
+				if (dcEntities == null) {
+					dcEntities = new ArrayList<DcEntity>();
+				}
+				double dczmj = 0;
+				for (DcEntity dcEntity : dcEntities) {
+					dczmj += dcEntity.getDczmj() == null ? 0 : dcEntity.getDczmj();
+				}
+				// 堆场总面积
+				gkjyrVo.setTczmj(dczmj + "");
+
+				// 储罐
+				List<CgEntity> cgEntities = cgService.findByJyrid(entity.getId());
+				if (cgEntities == null) {
+					cgEntities = new ArrayList<CgEntity>();
+				}
+				double cgzrl = 0;
+				for (CgEntity cgEntity : cgEntities) {
+					cgzrl += cgEntity.getCgqmj() == null ? 0 : cgEntity.getCgqmj();
+				}
+				// 储罐数量
+				gkjyrVo.setCgsl(cgEntities.size() + "");
+				// 储罐总容量
+				gkjyrVo.setCgzrl(cgzrl + "");
+
+				// 危货附证
+				if (StringUtils.isNotEmpty(entity.getGkwxhwzyfzbh())) {
+					List<XkzfzEntity> xkzlist = xkzfzService.findByJyrid(entity.getId());
+					String wxhwzyfz = "";
+					if (xkzlist != null && xkzlist.size() > 0) {
+						for (XkzfzEntity xkzentity : xkzlist) {
+							wxhwzyfz = wxhwzyfz + xkzentity.getFzsqh() + ",";
+						}
+						wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
+					}
+					gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
+				}
 
 				voList.add(gkjyrVo);
 			}