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

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/dao/JdtxxxDao.java

@@ -1,9 +1,17 @@
 package com.xt.jygl.ggfwxxgl.jdtxxx.dao;
 
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
 import com.xt.jygl.ggfwxxgl.jdtxxx.entity.JdtxxxEntity;
 import com.xtframe.sec.common.SecRepository;
 
 public interface JdtxxxDao extends SecRepository<JdtxxxEntity, String> {
-
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JDTXXX m where m.gkjyr like ?1%  and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
+	public List<Object> findByJyrid(String jyrid );
+	
+	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JDTXXX m where  m.szgq in (?1) and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
+	public List<Object> findByGqids(List<String> gqids);
 	
 }

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/service/JdtxxxService.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.ggfwxxgl.jdtxxx.service;
 
+import java.util.List;
+
 import com.xt.jygl.ggfwxxgl.jdtxxx.entity.JdtxxxEntity;
 import com.xt.jygl.workflow.service.BaseWorkFlowService;
 
@@ -17,4 +19,10 @@ public interface JdtxxxService extends BaseWorkFlowService {
 
 	public boolean changeAudit(String shyj, JdtxxxEntity entity, boolean flag);
 
+	List<Object> findByJyrid(String jyrid);
+
+	List<Object> findByGqids(List<String> gqid);
+	
+	List<JdtxxxEntity> findAll();
+
 }

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/service/impl/JdtxxxServiceImpl.java

@@ -101,4 +101,14 @@ public class JdtxxxServiceImpl extends BaseWorkFlowServiceImpl<JdtxxxEntity, Str
 		return false;
 	}
 
+	@Override
+	public List<Object> findByJyrid(String jyrid) {
+		return dao.findByJyrid(jyrid);
+	}
+
+	@Override
+	public List<Object> findByGqids(List<String> gqid) {
+		return dao.findByGqids(gqid);
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/dao/JgsqDao.java

@@ -13,4 +13,7 @@ public interface JgsqDao extends SecRepository<JgsqEntity, String> {
 
 	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JGSQ m where  m.szgq in (?1) and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
 	public List<Object> findByGqids(List<String> gqids);
+
+	@Query("SELECT m from JgsqEntity m where  m.jyrid.id = ?1 and m.flowstatus = ?2 and m.recordStatus = 4 and m.recordStatus = 3")
+	List<JgsqEntity> findByJyridAndFLowstatus(String jyrid, String flowstatus);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/JgsqdsService.java

@@ -22,4 +22,6 @@ public interface JgsqdsService extends BaseWorkFlowService {
 	List<Object> findByJyrids(String jyrid);
 
 	List<Object> findByGqids(List<String> gqids);
+
+	List<JgsqEntity> findByJyridAndFLowstatus(String jyrid, String flowstatus);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/impl/JgsqdsServiceImpl.java

@@ -114,8 +114,12 @@ public class JgsqdsServiceImpl extends BaseWorkFlowServiceImpl<JgsqEntity, Strin
 
 	@Override
 	public List<Object> findByGqids(List<String> gqids) {
-		// TODO Auto-generated method stub
 		return dao.findByGqids(gqids);
 	}
 
+	@Override
+	public List<JgsqEntity> findByJyridAndFLowstatus(String jyrid, String flowstatus) {
+		return dao.findByJyridAndFLowstatus(jyrid, flowstatus);
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/dao/JsjdbgDao.java

@@ -11,11 +11,13 @@ public interface JsjdbgDao extends SecRepository<JsjdbgEntity, String> {
 
 	@Query("SELECT m  FROM JsjdbgEntity m WHERE  m.xmid =?1  and m.recordStatus <> 9 ")
 	JsjdbgEntity findByXmid(String id);
-	
+
 	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JSJDBG m where m.jyrid like ?1%  and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
-	public List<Object> findByJyrids(String jyrid );
-	
+	public List<Object> findByJyrids(String jyrid);
+
 	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JSJDBG m where  m.szgq in (?1) and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
 	public List<Object> findByGqids(List<String> gqids);
-	
+
+	@Query("SELECT m from JsjdbgEntity m where  m.jyrid.id = ?1 and m.flowstatus = ?2 and m.recordStatus = 4 and m.recordStatus = 3")
+	List<JsjdbgEntity> findByJyridAndFLowstatus(String jyrid, String flowstatus);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/service/JsjdbgdsService.java

@@ -24,4 +24,6 @@ public interface JsjdbgdsService extends BaseWorkFlowService {
 	List<Object> findByJyrids(String jyrid);
 
 	List<Object> findByGqids(List<String> gqids);
+	
+	List<JsjdbgEntity> findByJyridAndFLowstatus(String jyrid, String flowstatus) ;
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/service/impl/JsjdbgdsServiceImpl.java

@@ -126,4 +126,10 @@ public class JsjdbgdsServiceImpl extends BaseWorkFlowServiceImpl<JsjdbgEntity, S
 		return dao.findByGqids(gqids);
 	}
 
+	@Override
+	public List<JsjdbgEntity> findByJyridAndFLowstatus(String jyrid, String flowstatus) {
+		// TODO Auto-generated method stub
+		return dao.findByJyridAndFLowstatus(jyrid, flowstatus);
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/dao/JsjdcbsjDao.java

@@ -10,10 +10,13 @@ import com.xtframe.sec.common.SecRepository;
 public interface JsjdcbsjDao extends SecRepository<JsjdcbsjEntity, String> {
 	@Query("SELECT m from JsjdcbsjEntity m where  m.tbzt = N and m.recordStatus<>9")
 	List<JsjdcbsjEntity> findByTbzt();
-	
+
 	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JSJDCBSJ m where m.jyrid like ?1%  and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
-	public List<Object> findByJyrids(String jyrid );
-	
+	public List<Object> findByJyrids(String jyrid);
+
 	@Query(value = "SELECT m.id from GK_OPERATION_JSJY_JSJDCBSJ m where  m.szgq in (?1) and m.record_Status<>9 and m.record_Status<>2 and m.record_Status<>1", nativeQuery = true)
 	public List<Object> findByGqids(List<String> gqids);
+
+	@Query("SELECT m from JsjdcbsjEntity m where  m.jyrid.id = ?1 and m.flowstatus = ?2 and m.recordStatus = 4 and m.recordStatus = 3")
+	List<JsjdcbsjEntity> findByJyridAndFLowstatus(String jyrid, String flowstatus);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/service/JsjdcbsjdsService.java

@@ -23,6 +23,8 @@ public interface JsjdcbsjdsService extends BaseWorkFlowService {
 	public JsjdcbsjWebService getWebService(String szdId);
 
 	public List<JsjdcbsjEntity> findByTbzt();
+	
+	public List<JsjdcbsjEntity> findByJyridAndFLowstatus(String jyrid,String flowstatus);
 
 	List<Object> findByJyrids(String jyrid);
 

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/service/impl/JsjdcbsjdsServiceImpl.java

@@ -136,14 +136,17 @@ public class JsjdcbsjdsServiceImpl extends BaseWorkFlowServiceImpl<JsjdcbsjEntit
 
 	@Override
 	public List<Object> findByJyrids(String jyrid) {
-		// TODO Auto-generated method stub
 		return dao.findByJyrids(jyrid);
 	}
 
 	@Override
 	public List<Object> findByGqids(List<String> gqids) {
-		// TODO Auto-generated method stub
 		return dao.findByGqids(gqids);
 	}
 
+	@Override
+	public List<JsjdcbsjEntity> findByJyridAndFLowstatus(String jyrid, String flowstatus) {
+		return dao.findByJyridAndFLowstatus(jyrid, flowstatus);
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -362,7 +362,7 @@ public class JsjdglCtl extends BaseWebCtl {
 			url = "GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
 		}
 
-		boolean flag = getTbStatus(url,null);
+		boolean flag = getTbStatus(url, null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);
@@ -556,7 +556,7 @@ public class JsjdglCtl extends BaseWebCtl {
 					// 把附件标识设置成标识位+附件标识
 					jsjdfj.setFjbz(s + jsjdfj.getFjbz());
 					jsjdfj.setFbdw(jsjdfj.getFbdw());
-					jsjdfj.setFjlx("ptfj");
+					jsjdfj.setFjlx("jsjd");
 					jsjdfjService.save(jsjdfj);
 				}
 			}
@@ -605,30 +605,21 @@ public class JsjdglCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				/*if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-					try {
-						Ftp f = getftp();
-						// 本地目录
-						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
-						File newfile = new File(localBaseDir);
-						// 如果文件夹不存在则创建
-						if (!newfile.exists() && !newfile.isDirectory()) {
-							newfile.mkdirs();
-						}
-						// 远程目录
-						String remoteBaseDir = acc.getFilepath();
-						// 下载ftp文件
-						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
-						if (downflag) {
-							System.out.println("ok");
-							acc.setFjbz("1");
-							accessoryService.save(acc);
-						}
-
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}*/
+				/*
+				 * if
+				 * (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				 * try { Ftp f = getftp(); // 本地目录 String localBaseDir =
+				 * GlobalData.UPLOAD_FILE_PATH + acc.getFilepath(); File newfile
+				 * = new File(localBaseDir); // 如果文件夹不存在则创建 if
+				 * (!newfile.exists() && !newfile.isDirectory()) {
+				 * newfile.mkdirs(); } // 远程目录 String remoteBaseDir =
+				 * acc.getFilepath(); // 下载ftp文件 boolean downflag =
+				 * FtpUtil.startDown(f, localBaseDir, remoteBaseDir,
+				 * acc.getFilename()); if (downflag) { System.out.println("ok");
+				 * acc.setFjbz("1"); accessoryService.save(acc); }
+				 * 
+				 * } catch (Exception e) { e.printStackTrace(); } }
+				 */
 				model.addAttribute("fjList" + s, fjnamevo);
 				model.addAttribute("xiazaibz", s);
 			}
@@ -807,30 +798,21 @@ public class JsjdglCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-			/*	if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-					try {
-						Ftp f = getftp();
-						// 本地目录
-						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
-						File newfile = new File(localBaseDir);
-						// 如果文件夹不存在则创建
-						if (!newfile.exists() && !newfile.isDirectory()) {
-							newfile.mkdirs();
-						}
-						// 远程目录
-						String remoteBaseDir = acc.getFilepath();
-						// 下载ftp文件
-						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
-						if (downflag) {
-							System.out.println("ok");
-							acc.setFjbz("1");
-							accessoryService.save(acc);
-						}
-
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}*/
+				/*
+				 * if
+				 * (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				 * try { Ftp f = getftp(); // 本地目录 String localBaseDir =
+				 * GlobalData.UPLOAD_FILE_PATH + acc.getFilepath(); File newfile
+				 * = new File(localBaseDir); // 如果文件夹不存在则创建 if
+				 * (!newfile.exists() && !newfile.isDirectory()) {
+				 * newfile.mkdirs(); } // 远程目录 String remoteBaseDir =
+				 * acc.getFilepath(); // 下载ftp文件 boolean downflag =
+				 * FtpUtil.startDown(f, localBaseDir, remoteBaseDir,
+				 * acc.getFilename()); if (downflag) { System.out.println("ok");
+				 * acc.setFjbz("1"); accessoryService.save(acc); }
+				 * 
+				 * } catch (Exception e) { e.printStackTrace(); } }
+				 */
 				model.addAttribute("fjList" + s, fjnamevo);
 				model.addAttribute("xiazaibz", s);
 			}
@@ -996,16 +978,18 @@ public class JsjdglCtl extends BaseWebCtl {
 		for (int i = 0; i < acclist.size(); i++) {
 			JsjdfjVo jsfjvo = new JsjdfjVo();
 			String fjid = acclist.get(i).getId();
-			JsjdfjEntity jsfj = jsjdfjService.findByFjid(fjid);
-			if (jsfj != null) {
-				jsfjvo.setFbdw(jsfj.getFbdw());
-				Date date = jsfj.getFbsj();
-				if (date != null) {
-					String date2 = dateFormater.format(date);
-					jsfjvo.setFbsj(date2);
+			if (fjid != null) {
+				JsjdfjEntity jsfj = jsjdfjService.findByFjid(fjid);
+				if (jsfj != null) {
+					jsfjvo.setFbdw(jsfj.getFbdw());
+					Date date = jsfj.getFbsj();
+					if (date != null) {
+						String date2 = dateFormater.format(date);
+						jsfjvo.setFbsj(date2);
+					}
+					jsfjvo.setWjh(jsfj.getWjh());
+					jsfjvo.setId(jsfj.getId());
 				}
-				jsfjvo.setWjh(jsfj.getWjh());
-				jsfjvo.setId(jsfj.getId());
 			}
 			jsfjvo.setFjmc(acclist.get(i).getName());
 			jsfjvo.setFjid(fjid);
@@ -1025,7 +1009,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveFile(String ssid, MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if (filename != null && filename.getSize()>0) {
+		if (filename != null && filename.getSize() > 0) {
 			AccessoryEntity acc = accessoryService.saveFile(filename, "jsjd");
 			wr.setAttr("acc", acc);
 		} else {
@@ -1438,11 +1422,10 @@ public class JsjdglCtl extends BaseWebCtl {
 					wr.setMessage("初步设计批复文件!");
 					return wr;
 				}
-				/*if (StringUtils.isEmpty(delid33)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传港口建设项目批准或者核准、备案文件!");
-					return wr;
-				}*/
+				/*
+				 * if (StringUtils.isEmpty(delid33)) { wr.setSuccess(false);
+				 * wr.setMessage("请上传港口建设项目批准或者核准、备案文件!"); return wr; }
+				 */
 			}
 			if ("4".equals(opflag)) {
 				if (StringUtils.isEmpty(delid41)) {
@@ -1515,28 +1498,17 @@ public class JsjdglCtl extends BaseWebCtl {
 				}
 			}
 		} else {
-			/*if (flag) {
-				if ("3".equals(spflag)) {
-					if (StringUtils.isEmpty(delid34)) {
-						wr.setSuccess(false);
-						wr.setMessage("请上传审查会议纪要!");
-						return wr;
-					} else if (StringUtils.isEmpty(delid35)) {
-						wr.setSuccess(false);
-						wr.setMessage("请上传专家审查意见!");
-						return wr;
-					} else if (StringUtils.isEmpty(delid36)) {
-						wr.setSuccess(false);
-						wr.setMessage("请上传对审查意见的答复!");
-						return wr;
-					} else if (StringUtils.isEmpty(delid38)) {
-						wr.setSuccess(false);
-						wr.setMessage("请上传初步设计文件报批稿!");
-						return wr;
-					}
-				}
-			}
-*/
+			/*
+			 * if (flag) { if ("3".equals(spflag)) { if
+			 * (StringUtils.isEmpty(delid34)) { wr.setSuccess(false);
+			 * wr.setMessage("请上传审查会议纪要!"); return wr; } else if
+			 * (StringUtils.isEmpty(delid35)) { wr.setSuccess(false);
+			 * wr.setMessage("请上传专家审查意见!"); return wr; } else if
+			 * (StringUtils.isEmpty(delid36)) { wr.setSuccess(false);
+			 * wr.setMessage("请上传对审查意见的答复!"); return wr; } else if
+			 * (StringUtils.isEmpty(delid38)) { wr.setSuccess(false);
+			 * wr.setMessage("请上传初步设计文件报批稿!"); return wr; } } }
+			 */
 		}
 		XmxxglEntity xmxxgl = null;
 		try {
@@ -1917,7 +1889,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		model.addAttribute("jyr", entity.getJyrid());
 
 		// 附件字段
-		List<JsjdfjEntity> fjlist = jsjdfjService.findByEntity(entity, "ptfj");
+		List<JsjdfjEntity> fjlist = jsjdfjService.findByEntity(entity, "jsjd");
 		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
 
 		for (int i = 0; i < fjlist.size(); i++) {
@@ -1946,7 +1918,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveQtfj(String opflag, MultipartFile qtfilename, Model model) {
 		WebJsonResult wr = success();
-		if (qtfilename != null && qtfilename.getSize()>0) {
+		if (qtfilename != null && qtfilename.getSize() > 0) {
 			AccessoryEntity acc = accessoryService.saveFile(qtfilename, "jsjdqtfj");
 			acc.setRemark(opflag);
 			accessoryService.save(acc);

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

@@ -161,6 +161,7 @@ public class GkjyrCtl extends BaseWebCtl {
 	private AxService axService;
 	@Autowired
 	private RyzsService ryzsService;
+
 	/**
 	 * 经营人基础信息
 	 */
@@ -472,6 +473,7 @@ public class GkjyrCtl extends BaseWebCtl {
 					if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 						vo.setXkzyxq(xkz.getYxqz());
 						vo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
+						vo.setGkjyxkzh(xkz.getGkjyxkzh());
 						Date date = new Date();
 						long day = (xkz.getYxqz().getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
 						if (day <= 30) {
@@ -789,6 +791,112 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setQyxzzw(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getText() : "");
 		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		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 + "");
+
 		model.addAttribute("gkjyr", gkjyrVo);
 		return "gkjygl/gkjyr/jyrjbxx/jyrview";
 	}
@@ -929,7 +1037,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		}
 		double cgzrl = 0;
 		for (CgEntity cgEntity : cgEntities) {
-			cgzrl += cgEntity.getCgrj() == null ? 0 : cgEntity.getCgrj();
+			cgzrl += cgEntity.getCgqmj() == null ? 0 : cgEntity.getCgqmj();
 		}
 		// 储罐数量
 		gkjyrVo.setCgsl(cgEntities.size() + "");
@@ -968,8 +1076,10 @@ public class GkjyrCtl extends BaseWebCtl {
 		}
 
 		model.addAttribute("gkjyr", gkjyrVo);
-		//List<CodeEntity> codelist = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_SF);
-		//model.addAttribute("codedata", JSONArray.fromObject(codelist).toString());
+		// List<CodeEntity> codelist =
+		// securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_SF);
+		// model.addAttribute("codedata",
+		// JSONArray.fromObject(codelist).toString());
 		return "gkjygl/gkjyr/jyrjbxx/jyredit";
 	}
 
@@ -1038,6 +1148,122 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
+
+		gkjyrVo.setSfwhqy(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		gkjyrVo.setXzqh(null != gkjyr.getXzqh() ? gkjyr.getXzqh().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.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
+		gkjyrVo.setQyxzzw(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getText() : "");
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		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 + "");
+
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
 		return "gkjygl/gkjyr/jyrjbxx/gkjyrview";
@@ -1061,7 +1287,18 @@ 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) {
@@ -1148,7 +1385,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		}
 		double cgzrl = 0;
 		for (CgEntity cgEntity : cgEntities) {
-			cgzrl += cgEntity.getCgrj() == null ? 0 : cgEntity.getCgrj();
+			cgzrl += cgEntity.getCgqmj() == null ? 0 : cgEntity.getCgqmj();
 		}
 		// 储罐数量
 		gkjyrVo.setCgsl(cgEntities.size() + "");
@@ -2590,7 +2827,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		List<MtEntity> list = mtService.findByJyrid(id);
 
 		List<MtVo> voList = new ArrayList<MtVo>();
-		
+
 		for (MtEntity entity : list) {
 			MtVo vo = new MtVo();
 			if (null != entity) {
@@ -2603,7 +2840,10 @@ public class GkjyrCtl extends BaseWebCtl {
 				vo.setSfwhpzw(entity.getSfwhp() != null ? entity.getSfwhp().getText() : "");
 				vo.setMtsfwarszw(entity.getMtsfwars() != null ? entity.getMtsfwars().getText() : "");
 				vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
-				/* vo.setMtytzw(entity.getMtyt()!=null?entity.getMtyt().getText():""); */
+				/*
+				 * vo.setMtytzw(entity.getMtyt()!=null?entity.getMtyt().getText()
+				 * :"");
+				 */
 				vo.setMtxsdmzw(entity.getMtxsdm() != null ? entity.getMtxsdm().getText() : "");
 				vo.setSzzyqzw(entity.getSzzyq() != null ? entity.getSzzyq().getZyqmc() : "");
 				vo.setSzaxzw(entity.getSzax() != null ? entity.getSzax().getAxmc() : "");
@@ -2616,7 +2856,10 @@ public class GkjyrCtl extends BaseWebCtl {
 				vo.setSfwhp(entity.getSfwhp() != null ? entity.getSfwhp().getId() : "");
 				vo.setMtsfwars(entity.getMtsfwars() != null ? entity.getMtsfwars().getId() : "");
 				vo.setFwlx(entity.getFwlx() != null ? entity.getFwlx().getId() : "");
-				/* vo.setMtyt(entity.getMtyt()!=null?entity.getMtyt().getId():""); */
+				/*
+				 * vo.setMtyt(entity.getMtyt()!=null?entity.getMtyt().getId():"")
+				 * ;
+				 */
 				vo.setMtxsdm(entity.getMtxsdm() != null ? entity.getMtxsdm().getId() : "");
 				vo.setSzzyq(entity.getSzzyq() != null ? entity.getSzzyq().getId() : "");
 				vo.setSzax(entity.getSzax() != null ? entity.getSzax().getId() : "");
@@ -2642,12 +2885,12 @@ public class GkjyrCtl extends BaseWebCtl {
 					}
 				}
 				vo.setMtytzw(mtytName);
-				
+
 				voList.add(vo);
 			}
 		}
 		return voList;
-	
+
 	}
 
 	/**
@@ -2726,7 +2969,7 @@ public class GkjyrCtl extends BaseWebCtl {
 			}
 		}
 		return voList;
-	
+
 	}
 
 	/**

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

@@ -413,7 +413,18 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -1108,7 +1119,18 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -1355,7 +1377,18 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");

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

@@ -413,6 +413,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		GkjyrEntity jyr = new GkjyrEntity();
 		if (user.getSsjyr() != null) {
 			jyr = gkjyrService.findOne(user.getSsjyr().getId());
+			
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("sqr", user.getName());
@@ -543,7 +544,18 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -766,7 +778,18 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -969,7 +992,18 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -2624,27 +2658,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				code = securityMgr.codeService().findOne(code.getPid());
 			}
 			szd = szd + "港经证";
-			/*Object xkzobj = xkzxxService.selectCount(szd);
-			String xkzbh = szd;
-			if (!StringUtils.isEmpty(xkzobj)) {
-				String num = xkzobj.toString();
-				num = num.substring(num.length() - 3);
-				int n = Integer.parseInt(num) + 1;
-				if (n < 9) {
-					xkzbh = xkzbh + "000" + n;
-				} else if (n < 99) {
-					xkzbh = xkzbh + "00" + n;
-				} else if (n < 999) {
-					xkzbh = xkzbh + "0" + n;
-				} else {
-					xkzbh = xkzbh + n;
-				}
-			} else {
-				xkzbh = xkzbh + "001";
-			}
-			if (szd.indexOf("内河") > 0) {
-				xkzbh = xkzbh + "(内河)";
-			}*/
+			
 			xkz.setGkjyxkzh("");
 			xkz.setFzrq(new Date());
 			xkz.setYxqq(new Date());

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

@@ -364,7 +364,18 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -820,7 +831,18 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -1075,7 +1097,18 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");

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

@@ -413,7 +413,18 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -1079,7 +1090,18 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -1271,7 +1293,18 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.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());
+			}
+		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/MainCtl.java

@@ -30,6 +30,8 @@ import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.Utils;
 import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;
+import com.xt.jygl.ggfwxxgl.jdtxxx.entity.JdtxxxEntity;
+import com.xt.jygl.ggfwxxgl.jdtxxx.service.JdtxxxService;
 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxtxEntity;
 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxtxService;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
@@ -137,6 +139,8 @@ public class MainCtl extends BaseWebCtl {
 	private JsjdbgService jsjdbgService;
 	@Autowired
 	private JgsqService jgsqService;
+	@Autowired
+	private JdtxxxService jdtxxxService;
 
 	@RequestMapping(value = "/main")
 	public String main(Model model) {
@@ -214,10 +218,13 @@ public class MainCtl extends BaseWebCtl {
 			volist = getJsjdbgList();
 		} else if ("jgsq".equals(type)) {
 			volist = getJgsqList();
-		} else if ("qt".equals(type)) {
+		} else if ("jdtx".equals(type)){
+			volist = getJdtxxxList();
+		}else if ("qt".equals(type)) {
 			volist = getJsjdcbsjdsList();
 			volist.addAll(getJsjdbgdsList());
 			volist.addAll(getJgsqdsList());
+			
 		}
 
 		// 判断省市区别
@@ -232,6 +239,7 @@ public class MainCtl extends BaseWebCtl {
 				volist.addAll(getJsjdcbsjdsList());
 				volist.addAll(getJsjdbgdsList());
 				volist.addAll(getJgsqdsList());
+				volist.addAll(getJdtxxxList());
 			}
 			model.addAttribute("ssflag", 1);
 		} else {
@@ -243,6 +251,7 @@ public class MainCtl extends BaseWebCtl {
 				volist.addAll(getJsjdcbsjList());
 				volist.addAll(getJsjdbgList());
 				volist.addAll(getJgsqList());
+				// volist.addAll(getJdtxxxList());
 			}
 			model.addAttribute("ssflag", 0);
 		}
@@ -278,6 +287,7 @@ public class MainCtl extends BaseWebCtl {
 			int jsjdcbsjds = getJsjdcbsjdsNum(jyrid, gqlist);
 			int jsjdbgds = getJsjdbgdsNum(jyrid, gqlist);
 			int jgsqds = getJgsqdsNum(jyrid, gqlist);
+			int jdtx = getJdtxNum(jyrid, gqlist);
 			ws.setAttr("dcsb", dcsb);
 			ws.setAttr("xkzsq", xkzsq);
 			ws.setAttr("xkzbg", xkzbg);
@@ -286,6 +296,7 @@ public class MainCtl extends BaseWebCtl {
 			ws.setAttr("jsjdcbsjds", jsjdcbsjds);
 			ws.setAttr("jsjdbgds", jsjdbgds);
 			ws.setAttr("jgsqds", jgsqds);
+			ws.setAttr("jdtx", jdtx);
 			ws.setAttr("ssflag", 1);
 		} else {
 			int lhsq = getLhsqNum();
@@ -312,16 +323,33 @@ public class MainCtl extends BaseWebCtl {
 		int messageNum = 0;
 		if (getSsjyr() != null) {
 			List<XkzxxEntity> list = xkzxxService.queryNeedWarn(ca.getTime(), getSsjyr().getId());
-			List<Object> jdtxjyr = txService.findByJyrid(getSsjyr().getId());
-			ws.setAttr("warn", "您有<span>" + list.size() + "</span>条许可证即将过期，请及时处理！");
-			ws.setAttr("jdtxwarn", "您有<span>" + jdtxjyr.size() + "</span>条监督提醒即将过期，请及时处理！");
+			ws.setAttr("warn", "您有<span>" + list.size() + "</span>条许可证即将过期，请处理！");
+			//List<Object> jdtxjyr = txService.findByJyrid(getSsjyr().getId());
+			//ws.setAttr("jdtxwarn", "您有<span>" + jdtxjyr.size() + "</span>条监督提醒即将过期，请及时处理！");
 			// 通知公告
 			List<GgxxtxEntity> ggtx = ggxxtxService.findByJyridAndFlag(getSsjyr().getId(), "1");
-			ws.setAttr("tzggwarn", "您有<span>" + ggtx.size() + "</span>条通知公告尚未阅读，请及时查看！");
-			messageNum = list.size() + jdtxjyr.size() + ggtx.size();
+			ws.setAttr("tzggwarn", "您有<span>" + ggtx.size() + "</span>条通知公告尚未阅读，请查看！");
+			
+			//初步设计 省通过 flowstatus 为2 ，不通过 flowstatus 为1
+			List<JsjdcbsjEntity> tlist = jsjdcbsjdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"2");
+			List<JsjdcbsjEntity> flist = jsjdcbsjdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"1");
+			ws.setAttr("jsjdcbsjwarn", "项目初步设计申请<span>" + tlist.size() + "</span>条已通过，<span>"+flist.size()+"</span>条未通过请查看！");
+			
+			//初步设计变更 省通过 flowstatus 为2 ，不通过 flowstatus 为1
+			List<JsjdbgEntity> ttlist = jsjdbgdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"2");
+			List<JsjdbgEntity> fflist = jsjdbgdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"1");
+			ws.setAttr("jsjdbgwarn", "项目初步设计变更<span>" + tlist.size() + "</span>条已通过，<span>"+flist.size()+"</span>条未通过请查看！");
+			
+			// 竣工 省通过 flowstatus 为2 ，不通过 flowstatus 为1
+			List<JgsqEntity> jgtlist = jgsqdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"2");
+			List<JgsqEntity> jgflist = jgsqdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"1");
+			ws.setAttr("jgsqwarn", "项目竣工验收申请<span>" + tlist.size() + "</span>条已通过，<span>"+flist.size()+"</span>条未通过请查看！");
+			
+			
+			messageNum = list.size()  + ggtx.size();
 		} else if (SecUtils.getCurrUser().getSsglry() != null) {
 			// 过滤掉自己所发布的监督提醒
-			List<Object> jdtxzj = txService.findByXzryidAndCu(SecUtils.getCurrUser().getSsglry().getId());
+			/*List<Object> jdtxzj = txService.findByXzryidAndCu(SecUtils.getCurrUser().getSsglry().getId());
 			if (jdtxzj.size() > 0) {
 				if (jdtxzj.get(0).equals(SecUtils.getCurrUser().getSsglry().getId())) {
 					ws.setAttr("jdtxwarn", "");
@@ -330,7 +358,7 @@ public class MainCtl extends BaseWebCtl {
 					ws.setAttr("jdtxwarn", "您有<span>" + jdtxxzry.size() + "</span>条监督提醒即将过期，请及时处理！");
 					messageNum += jdtxxzry.size();
 				}
-			}
+			}*/
 			// 通知公告,过滤自己所发布的监督提醒
 			List<Object> tzggzj = ggxxtxService.findByJyridAndCu(SecUtils.getCurrUser().getSsglry().getId());
 			if (tzggzj.size() > 0) {
@@ -338,16 +366,15 @@ public class MainCtl extends BaseWebCtl {
 					ws.setAttr("jdtxwarn", "");
 				} else {
 					List<GgxxtxEntity> ggtx = ggxxtxService.findByJyridAndFlag(SecUtils.getCurrUser().getSsglry().getId(), "0");
-					ws.setAttr("tzggwarn", "您有<span>" + ggtx.size() + "</span>条通知公告尚未阅读，请及时查看！");
+					ws.setAttr("tzggwarn", "您有<span>" + ggtx.size() + "</span>条通知公告尚未阅读，请查看！");
 					messageNum += ggtx.size();
 				}
 			} else {
 				List<GgxxtxEntity> ggtx = ggxxtxService.findByJyridAndFlag(SecUtils.getCurrUser().getSsglry().getId(), "0");
-				ws.setAttr("tzggwarn", "您有<span>" + ggtx.size() + "</span>条通知公告尚未阅读，请及时查看！");
+				ws.setAttr("tzggwarn", "您有<span>" + ggtx.size() + "</span>条通知公告尚未阅读，请查看！");
 				messageNum += ggtx.size();
 			}
 		}
-		/* ws.setAttr("jsjd", jsjd); */
 		ws.setAttr("messageNum", messageNum);
 		return ws;
 
@@ -823,6 +850,42 @@ public class MainCtl extends BaseWebCtl {
 		return volist;
 	}
 
+	// 建设进度竣工申请
+	public List<WorkItem> getJdtxxxList() throws JsonProcessingException {
+		List<WorkItem> volist = new ArrayList<WorkItem>();
+		List<JdtxxxEntity> list = jdtxxxService.findAll();
+
+		if (list != null && list.size() > 0) {
+			for (JdtxxxEntity entity : list) {
+				if (entity != null) {
+					WorkItem item = new WorkItem();
+					if ((jdtxxxService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || jdtxxxService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
+						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JdtxxxEntity.PROCESS_DEFINITION_KEY);
+						if (lists != null & lists.size() > 0) {
+							TaskInfoEntity taskinfo = lists.get(0);
+							if ("申请".equals(taskinfo.getCurrName())) {
+								item.setStatus("1");
+							} else {
+								item.setStatus("0");
+							}
+							item.setProcessName("监督提醒申请");
+							item.setProcessKey("jdtx");
+							item.setDescription(entity.getGkjyr().getGkjyr());
+							item.setCreateTime(entity.getCreateDateTime().toString());
+							if (!StringUtils.isEmpty(entity.getCreateUser())) {
+								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+								item.setSenderName(user.getName());
+							}
+							item.setBusinessKey(entity.getId());
+							volist.add(item);
+						}
+					}
+				}
+			}
+		}
+		return volist;
+	}
+
 	// 许可证申请
 	public List<WorkItem> getXkzsqList() throws JsonProcessingException {
 		List<WorkItem> volist = new ArrayList<WorkItem>();
@@ -1392,4 +1455,31 @@ public class MainCtl extends BaseWebCtl {
 		return sum;
 	}
 
+	// 监督提醒申请地市
+	public int getJdtxNum(String jyrid, List<String> gqids) throws JsonProcessingException {
+		List<Object> list = new ArrayList<Object>();
+		if (!StringUtils.isEmpty(jyrid)) {
+			list = jdtxxxService.findByJyrid(jyrid);
+		} else {
+			list = jdtxxxService.findByGqids(gqids);
+		}
+
+		int sum = 0;
+		if (list != null && list.size() > 0) {
+			for (Object id : list) {
+
+				if (id != null) {
+					if ((jdtxxxService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), id.toString()) != null) || jdtxxxService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), id.toString()) != null) {
+						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id.toString(), JdtxxxEntity.PROCESS_DEFINITION_KEY);
+						if (lists != null & lists.size() > 0) {
+							sum++;
+						}
+					}
+				}
+			}
+		}
+
+		return sum;
+	}
+
 }