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

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

@@ -2280,6 +2280,112 @@ public class GkjyrCtl extends BaseWebCtl {
 		GkjyrEntity gkjyr = gkjyrService.findOne(id);
 		GkjyrVo gkjyrVo = new GkjyrVo();
 		BeanUtils.copyProperties(gkjyr, gkjyrVo);
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(id);
+		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(gkjyr.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(gkjyr.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(gkjyr.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(gkjyr.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(gkjyr.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 + "");
+
 		gkjyrVo.setSzdzw(null != gkjyr.getSzd() ? gkjyr.getSzd().getText() : "");
 		gkjyrVo.setSzgkzw(null != gkjyr.getSzgk() ? gkjyr.getSzgk().getGkmc() : "");
 		gkjyrVo.setSzgqzw(null != gkjyr.getSzgq() ? gkjyr.getSzgq().getGqmc() : "");
@@ -2290,14 +2396,115 @@ public class GkjyrCtl extends BaseWebCtl {
 			}
 		}
 
-		gkjyrVo.setSfwhqy(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		gkjyrVo.setQyxzzw(gkjyr.getQyxz() != null ? gkjyr.getQyxz().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
 		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
-		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		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());
+			String wxhwzyfz = "";
+			if (list != null && list.size() > 0) {
+				for (XkzfzEntity entity : list) {
+					wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
+				}
+				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
+			}
+			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
+		}
+
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
+		// 许可证信息
+		Specification<XkzxxEntity> spec4 = new Specification<XkzxxEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<XkzxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				list.add(cb.like(root.get("gkjyr").as(String.class), "%" + id + "%"));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<XkzxxEntity> list4 = query.findAll(spec4, XkzxxEntity.class);
+		List<XkzxxVo> voList4 = new ArrayList<XkzxxVo>();
+		for (XkzxxEntity entity : list4) {
+			XkzxxVo vo = new XkzxxVo();
+			if (entity != null && entity.getRecordStatus() != 9) {
+				BeanUtils.copyProperties(entity, vo);
+				// 为所属港区中文赋值
+				// 先获取所属港区id
+				if (vo.getSsgq() != null) {
+					GqEntity gq = gqService.findOne(vo.getSsgq());
+					if (null != gq) {
+						vo.setSsgqzw(gq.getGqmc());
+					}
+				}
+
+				if (vo.getGkjyr() != null) {
+
+					GkjyrEntity jyr = gkjyrService.findOne(vo.getGkjyr());
+					if (null != jyr) {
+						vo.setGkjyrzw(jyr.getGkjyr());
+					}
+				}
+				voList4.add(vo);
+			}
+		}
+		model.addAttribute("xkzxx", voList4);
+
+		// 危货作业附证
+		Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + id + "%"));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<XkzfzEntity> list5 = query.findAll(spec5, XkzfzEntity.class);
+		List<XkzfzVo> voList5 = new ArrayList<XkzfzVo>();
+		for (XkzfzEntity entity : list5) {
+			XkzfzVo vo = new XkzfzVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo);
+				if (null != entity.getFzsj()) {
+					vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
+				}
+				if (null != entity.getYxqkssj()) {
+					vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
+				}
+				if (null != entity.getYxqjssj()) {
+					vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
+				}
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+
+				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+
+				vo.setFzsqh(entity.getFzsqh() != null ? entity.getFzsqh() : "");
+				vo.setWxhwpm(entity.getWxhwpm() != null ? entity.getWxhwpm() : "");
+				voList5.add(vo);
+			}
+		}
+		
+		model.addAttribute("gkjyrxx", gkjyrVo);
 		return "gkjygl/gkjyr/jyrjbxx/print";
 	}
 

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -224,10 +224,10 @@ public class LhbgCtl extends BaseWebCtl {
 						} else if ("0".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("审核中");
 						} else if (entity.getFlowstatus() == null) {
-							vo.setCurrentname("未提交");
+							vo.setCurrentname("经办人受理");
 						}else if (StringUtils.isEmpty(entity.getFlowstatus()) && entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID) {
 							if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-								vo.setCurrentname("未提交");
+								vo.setCurrentname("经办人受理");
 							} else {
 								vo.setCurrentname("流程受理");
 							}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -215,10 +215,10 @@ public class LhsqCtl extends BaseWebCtl {
 						} else if ("0".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("审核中");
 						} else if (entity.getFlowstatus() == null) {
-							vo.setCurrentname("未提交");
+							vo.setCurrentname("经办人受理");
 						} else if (StringUtils.isEmpty(entity.getFlowstatus()) && entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID) {
 							if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-								vo.setCurrentname("未提交");
+								vo.setCurrentname("经办人受理");
 							} else {
 								vo.setCurrentname("流程受理");
 							}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -224,10 +224,10 @@ public class LhyxCtl extends BaseWebCtl {
 						} else if ("0".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("审核中");
 						} else if (entity.getFlowstatus() == null) {
-							vo.setCurrentname("未提交");
+							vo.setCurrentname("经办人受理");
 						}else if (StringUtils.isEmpty(entity.getFlowstatus()) && entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID) {
 							if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-								vo.setCurrentname("未提交");
+								vo.setCurrentname("经办人受理");
 							} else {
 								vo.setCurrentname("流程受理");
 							}