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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -42,11 +42,16 @@ import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjsgl.jsjdgl.service.XmxxglfbService;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
 import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;
 import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxglService;
 import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xtframe.core.anon.auth.RequiresPermissions;
@@ -81,6 +86,10 @@ public class XmxxglCtl extends BaseWebCtl {
 	private TzjhglService tzjhglService;
 	@Autowired
 	private GkService gkService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private XmbwglbService xmbwglbService;
 
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("xmxxgl:main")
@@ -327,7 +336,7 @@ public class XmxxglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("xmxxgl:add")
 	@ResponseBody
-	public WebJsonResult save(Model model, XmxxglEntity code, String ssjyrid, String fjids, String xzqh, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid, String sylxid) {
+	public WebJsonResult save(Model model, XmxxglEntity code, String bwids, String ssjyrid, String fjids, String xzqh, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid, String sylxid) {
 		WebJsonResult wr = success();
 
 		if (StringUtils.isEmpty(code.getXmmc())) {
@@ -375,10 +384,11 @@ public class XmxxglCtl extends BaseWebCtl {
 			wr.setMessage("请输入通过能力");
 			return wr;
 		}
+		XmxxglEntity xmxxgl = new XmxxglEntity();
 		try {
 			if (!StringUtils.isEmpty(code.getId())) {
 				// 修改
-				XmxxglEntity xmxxgl = xmxxglService.findOne(code.getId());
+				xmxxgl = xmxxglService.findOne(code.getId());
 				xmxxgl.setXmbm(code.getXmbm());
 				xmxxgl.setXmmc(code.getXmmc());
 				xmxxgl.setXmfr(code.getXmfr());
@@ -454,7 +464,7 @@ public class XmxxglCtl extends BaseWebCtl {
 				} else {
 					xmxxgl.setSylx(null);
 				}
-				xmxxglService.save(xmxxgl);
+				xmxxgl = xmxxglService.save(xmxxgl);
 			} else {
 				if (StringUtils.isEmpty(xzqh)) {
 					wr.setSuccess(false);
@@ -518,10 +528,24 @@ public class XmxxglCtl extends BaseWebCtl {
 				String bh = xmxxglService.getxmbm();
 				String xmbm = nf + xzqh + "GK" + bh;
 				code.setXmbm(xmbm);
-				xmxxglService.save(code);
+				xmxxgl = xmxxglService.save(code);
 
 			}
-
+			if (!StringUtils.isEmpty(bwids)) {
+				List<XmbwglbEntity> list = xmbwglbService.findByXmid(xmxxgl.getId());
+				if (list != null && list.size() > 0) {
+					for (XmbwglbEntity entity : list) {
+						xmbwglbService.delete(entity.getId());
+					}
+				}
+				String[] bwlist = bwids.split(",");
+				for (String bwid : bwlist) {
+					XmbwglbEntity xmbw = new XmbwglbEntity();
+					xmbw.setBwid(bwid);
+					xmbw.setXmid(xmxxgl.getId());
+					xmbwglbService.save(xmbw);
+				}
+			}
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -563,6 +587,15 @@ public class XmxxglCtl extends BaseWebCtl {
 			CodeEntity code = securityMgr.codeService().findOne(codeid);
 			model.addAttribute("xzqhname", code.getText());
 		}
+		String bwids = "";
+		List<XmbwglbEntity> list = xmbwglbService.findByXmid(entity.getId());
+		if (list != null && list.size() > 0) {
+			for (XmbwglbEntity xmbw : list) {
+				bwids = bwids + xmbw.getBwid() + ",";
+			}
+			bwids = bwids.substring(0, bwids.length() - 1);
+		}
+		vo.setBwids(bwids);
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		return "gkjsgl/xmxxgl/xmxxgledit";
@@ -622,8 +655,93 @@ public class XmxxglCtl extends BaseWebCtl {
 			CodeEntity code = securityMgr.codeService().findOne(codeid);
 			model.addAttribute("xzqhname", code.getText());
 		}
+		String bwids = "";
+		String bwidszw = "";
+		List<XmbwglbEntity> list = xmbwglbService.findByXmid(entity.getId());
+		if (list != null && list.size() > 0) {
+			for (XmbwglbEntity xmbw : list) {
+				bwids = bwids + xmbw.getBwid() + ",";
+				BwEntity bw = bwService.findOne(xmbw.getBwid());
+				if (bw != null) {
+					bwidszw = bwidszw + bw.getBwmc() + ",";
+				}
+			}
+			if (bwidszw.length() > 1) {
+				bwids = bwids.substring(0, bwids.length() - 1);
+				bwidszw = bwidszw.substring(0, bwidszw.length() - 1);
+			}
+		}
+		vo.setBwids(bwids);
+		vo.setBwidszw(bwidszw);
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
+
+		if (!StringUtils.isEmpty(bwids)) {
+			List<BwVo> slist = new ArrayList<BwVo>();
+			String[] bwlists = bwids.split(",");
+			for (String bw : bwlists) {
+				BwEntity bwentity = bwService.findOne(bw);
+				BwVo bwvo = new BwVo();
+				if (bwentity != null) {
+					BeanUtils.copyProperties(bwentity, bwvo);
+					bwvo.setSzdzw(bwentity.getSzd() != null ? bwentity.getSzd().getText() : "");
+					bwvo.setSzgkzw(bwentity.getSzgk() != null ? bwentity.getSzgk().getGkmc() : "");
+					bwvo.setSzgqzw(bwentity.getSzgq() != null ? bwentity.getSzgq().getGqmc() : "");
+					bwvo.setSsjyrzw(bwentity.getSsjyr() != null ? bwentity.getSsjyr().getGkjyr() : "");
+					bwvo.setSsmtzw(bwentity.getSsmt() != null ? bwentity.getSsmt().getMtmc() : "");
+					bwvo.setBwsxzw(bwentity.getBwsx() != null ? bwentity.getBwsx().getText() : "");
+					bwvo.setFwlxzw(bwentity.getFwlx() != null ? bwentity.getFwlx().getText() : "");
+					bwvo.setWxpbwzw(bwentity.getWxpbw() != null ? bwentity.getWxpbw().getText() : "");
+					bwvo.setZyhbwflzw(bwentity.getZyhbwfl() != null ? bwentity.getZyhbwfl().getText() : "");
+					bwvo.setSffzzw(bwentity.getSffz() != null ? bwentity.getSffz().getText() : "");
+					bwvo.setSfdwkfzw(bwentity.getSfdwkf() != null ? bwentity.getSfdwkf().getText() : "");
+					bwvo.setBwszsxzw(bwentity.getBwszsx() != null ? bwentity.getBwszsx().getText() : "");
+					bwvo.setSclxzw(bwentity.getSclx() != null ? bwentity.getSclx().getText() : "");
+					bwvo.setJgxszw(bwentity.getJgxs() != null ? bwentity.getJgxs().getText() : "");
+					bwvo.setKbcblxzw(bwentity.getKbcblx() != null ? bwentity.getKbcblx().getText() : "");
+
+					bwvo.setSszyq(bwentity.getSszyq() != null ? bwentity.getSszyq().getId() : "");
+					bwvo.setSszyqzw(bwentity.getSszyq() != null ? bwentity.getSszyq().getZyqmc() : "");
+					bwvo.setZls(bwentity.getZls() != null ? bwentity.getZls().getId() : "");
+					bwvo.setZlszw(bwentity.getZls() != null ? bwentity.getZls().getText() : "");
+					bwvo.setXp(bwentity.getXp() != null ? bwentity.getXp().getId() : "");
+					bwvo.setXpzw(bwentity.getXp() != null ? bwentity.getXp().getText() : "");
+					bwvo.setBwszhd(bwentity.getBwszhd() != null ? bwentity.getBwszhd().getText() : "");
+
+					if (bwentity.getBwyt() != null) {
+						String bwytzw = "";
+						String[] s = bwentity.getBwyt().split(",");
+
+						for (int i = 0; i < s.length; i++) {
+							CodeEntity ce = securityMgr.codeService().findOne(s[i]);
+							if (ce != null) {
+								bwytzw += ce.getText();
+								if (i != s.length - 1) {
+									bwytzw += ",";
+								}
+							}
+						}
+						bwvo.setBwytzw(bwytzw);
+					}
+					bwvo.setSzd(bwentity.getSzd() != null ? bwentity.getSzd().getId() : "");
+					bwvo.setSzgk(bwentity.getSzgk() != null ? bwentity.getSzgk().getId() : "");
+					bwvo.setSzgq(bwentity.getSzgq() != null ? bwentity.getSzgq().getId() : "");
+					bwvo.setSsjyr(bwentity.getSsjyr() != null ? bwentity.getSsjyr().getId() : "");
+					bwvo.setSsmt(bwentity.getSsmt() != null ? bwentity.getSsmt().getId() : "");
+					bwvo.setBwsx(bwentity.getBwsx() != null ? bwentity.getBwsx().getId() : "");
+					bwvo.setFwlx(bwentity.getFwlx() != null ? bwentity.getFwlx().getId() : "");
+					bwvo.setWxpbw(bwentity.getWxpbw() != null ? bwentity.getWxpbw().getId() : "");
+					bwvo.setZyhbwfl(bwentity.getZyhbwfl() != null ? bwentity.getZyhbwfl().getId() : "");
+					bwvo.setSffz(bwentity.getSffz() != null ? bwentity.getSffz().getId() : "");
+					bwvo.setSfdwkf(bwentity.getSfdwkf() != null ? bwentity.getSfdwkf().getId() : "");
+					bwvo.setBwszsx(bwentity.getBwszsx() != null ? bwentity.getBwszsx().getId() : "");
+					bwvo.setSclx(bwentity.getSclx() != null ? bwentity.getSclx().getId() : "");
+					bwvo.setJgxs(bwentity.getJgxs() != null ? bwentity.getJgxs().getId() : "");
+					slist.add(bwvo);
+				}
+			}
+			model.addAttribute("bwlist", slist);
+		}
 		return "gkjsgl/xmxxgl/xmxxglview";
 	}
 
@@ -853,4 +971,68 @@ public class XmxxglCtl extends BaseWebCtl {
 		}
 		return wr;
 	}
+
+	@RequestMapping(value = "/viewBw")
+	@ResponseBody
+	public BwVo viewBw(Model model, String bwid) {
+		BwEntity bwentity = bwService.findOne(bwid);
+		BwVo bwvo = new BwVo();
+		if (bwentity != null) {
+			BeanUtils.copyProperties(bwentity, bwvo);
+			bwvo.setSzdzw(bwentity.getSzd() != null ? bwentity.getSzd().getText() : "");
+			bwvo.setSzgkzw(bwentity.getSzgk() != null ? bwentity.getSzgk().getGkmc() : "");
+			bwvo.setSzgqzw(bwentity.getSzgq() != null ? bwentity.getSzgq().getGqmc() : "");
+			bwvo.setSsjyrzw(bwentity.getSsjyr() != null ? bwentity.getSsjyr().getGkjyr() : "");
+			bwvo.setSsmtzw(bwentity.getSsmt() != null ? bwentity.getSsmt().getMtmc() : "");
+			bwvo.setBwsxzw(bwentity.getBwsx() != null ? bwentity.getBwsx().getText() : "");
+			bwvo.setFwlxzw(bwentity.getFwlx() != null ? bwentity.getFwlx().getText() : "");
+			bwvo.setWxpbwzw(bwentity.getWxpbw() != null ? bwentity.getWxpbw().getText() : "");
+			bwvo.setZyhbwflzw(bwentity.getZyhbwfl() != null ? bwentity.getZyhbwfl().getText() : "");
+			bwvo.setSffzzw(bwentity.getSffz() != null ? bwentity.getSffz().getText() : "");
+			bwvo.setSfdwkfzw(bwentity.getSfdwkf() != null ? bwentity.getSfdwkf().getText() : "");
+			bwvo.setBwszsxzw(bwentity.getBwszsx() != null ? bwentity.getBwszsx().getText() : "");
+			bwvo.setSclxzw(bwentity.getSclx() != null ? bwentity.getSclx().getText() : "");
+			bwvo.setJgxszw(bwentity.getJgxs() != null ? bwentity.getJgxs().getText() : "");
+			bwvo.setKbcblxzw(bwentity.getKbcblx() != null ? bwentity.getKbcblx().getText() : "");
+
+			bwvo.setSszyq(bwentity.getSszyq() != null ? bwentity.getSszyq().getId() : "");
+			bwvo.setSszyqzw(bwentity.getSszyq() != null ? bwentity.getSszyq().getZyqmc() : "");
+			bwvo.setZls(bwentity.getZls() != null ? bwentity.getZls().getId() : "");
+			bwvo.setZlszw(bwentity.getZls() != null ? bwentity.getZls().getText() : "");
+			bwvo.setXp(bwentity.getXp() != null ? bwentity.getXp().getId() : "");
+			bwvo.setXpzw(bwentity.getXp() != null ? bwentity.getXp().getText() : "");
+			bwvo.setBwszhd(bwentity.getBwszhd() != null ? bwentity.getBwszhd().getText() : "");
+
+			if (bwentity.getBwyt() != null) {
+				String bwytzw = "";
+				String[] s = bwentity.getBwyt().split(",");
+
+				for (int i = 0; i < s.length; i++) {
+					CodeEntity ce = securityMgr.codeService().findOne(s[i]);
+					if (ce != null) {
+						bwytzw += ce.getText();
+						if (i != s.length - 1) {
+							bwytzw += ",";
+						}
+					}
+				}
+				bwvo.setBwytzw(bwytzw);
+			}
+			bwvo.setSzd(bwentity.getSzd() != null ? bwentity.getSzd().getId() : "");
+			bwvo.setSzgk(bwentity.getSzgk() != null ? bwentity.getSzgk().getId() : "");
+			bwvo.setSzgq(bwentity.getSzgq() != null ? bwentity.getSzgq().getId() : "");
+			bwvo.setSsjyr(bwentity.getSsjyr() != null ? bwentity.getSsjyr().getId() : "");
+			bwvo.setSsmt(bwentity.getSsmt() != null ? bwentity.getSsmt().getId() : "");
+			bwvo.setBwsx(bwentity.getBwsx() != null ? bwentity.getBwsx().getId() : "");
+			bwvo.setFwlx(bwentity.getFwlx() != null ? bwentity.getFwlx().getId() : "");
+			bwvo.setWxpbw(bwentity.getWxpbw() != null ? bwentity.getWxpbw().getId() : "");
+			bwvo.setZyhbwfl(bwentity.getZyhbwfl() != null ? bwentity.getZyhbwfl().getId() : "");
+			bwvo.setSffz(bwentity.getSffz() != null ? bwentity.getSffz().getId() : "");
+			bwvo.setSfdwkf(bwentity.getSfdwkf() != null ? bwentity.getSfdwkf().getId() : "");
+			bwvo.setBwszsx(bwentity.getBwszsx() != null ? bwentity.getBwszsx().getId() : "");
+			bwvo.setSclx(bwentity.getSclx() != null ? bwentity.getSclx().getId() : "");
+			bwvo.setJgxs(bwentity.getJgxs() != null ? bwentity.getJgxs().getId() : "");
+		}
+		return bwvo;
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/dao/XmbwglbDao.java

@@ -0,0 +1,13 @@
+package com.xt.jygl.gkjsgl.xmxxgl.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
+import com.xtframe.sec.common.SecRepository;
+
+public interface XmbwglbDao extends SecRepository<XmbwglbEntity, String> {
+	@Query("SELECT m from XmbwglbEntity m  where m.xmid =?1 and m.recordStatus<>9")
+	List<XmbwglbEntity> findByXmid(String xmid);
+}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/entity/XmbwglbEntity.java

@@ -0,0 +1,53 @@
+package com.xt.jygl.gkjsgl.xmxxgl.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import com.xtframe.sec.common.BaseEntity;
+
+@Entity
+@Table(name = "GK_BASIC_JSJY_GKJS_XMBWGLB")
+public class XmbwglbEntity extends BaseEntity<String> implements Cloneable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -485787620077488727L;
+
+	private String id;/* 唯一标识 */
+
+	private String xmid;
+	private String bwid;
+
+	@Id
+	@GenericGenerator(name = "systemUUID", strategy = "uuid")
+	@GeneratedValue(generator = "systemUUID")
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getXmid() {
+		return xmid;
+	}
+
+	public void setXmid(String xmid) {
+		this.xmid = xmid;
+	}
+
+	public String getBwid() {
+		return bwid;
+	}
+
+	public void setBwid(String bwid) {
+		this.bwid = bwid;
+	}
+
+}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/XmbwglbService.java

@@ -0,0 +1,18 @@
+package com.xt.jygl.gkjsgl.xmxxgl.service;
+
+import java.util.List;
+
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
+
+public interface XmbwglbService {
+	/* 逻辑删除 */
+	void logicDelete(String id);
+
+	public <S extends XmbwglbEntity> S save(S entity);
+
+	XmbwglbEntity findOne(String id);
+
+	void delete(String id);
+
+	List<XmbwglbEntity> findByXmid(String xmid);
+}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/impl/XmbwglbServiceImpl.java

@@ -0,0 +1,35 @@
+package com.xt.jygl.gkjsgl.xmxxgl.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.jygl.common.service.JyglBaseService;
+import com.xt.jygl.gkjsgl.xmxxgl.dao.XmbwglbDao;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;
+import com.xtframe.sec.common.SecRepository;
+
+@Service
+public class XmbwglbServiceImpl extends JyglBaseService<XmbwglbEntity, String> implements
+		XmbwglbService {
+
+	@Autowired
+	private XmbwglbDao dao;
+
+	@Override
+	protected SecRepository<XmbwglbEntity, String> getDao() {
+
+		return this.dao;
+	}
+
+	@Override
+	public List<XmbwglbEntity> findByXmid(String xmid) {
+		return dao.findByXmid(xmid);
+	}
+
+	
+	
+	
+}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/vo/XmxxglVo.java

@@ -38,14 +38,14 @@ public class XmxxglVo extends BaseVo {
 	private String dqzt;/* 当前状态 */
 	private String flag;/* 用于判断列表页面是否显示项目进度 */
 	private String sfyzjbz;/* 是否有资金补助 */
-	
+
 	private String xmbm;/* 项目编码 */
 	private String zftze;/* 政府投资额 */
 	private String sylx;/* 水域类型 */
 	private String sylxzw;/* 水域类型中文 */
 	private Date jcsj; /* 建成时间 */
-	private String jcsjstr; /* 建成时间 format*/
-	
+	private String jcsjstr; /* 建成时间 format */
+
 	private String flowstatus;
 	// 流程历史字段
 	private String currentname;/* 流程节点名 */
@@ -59,18 +59,35 @@ public class XmxxglVo extends BaseVo {
 	private String sddx;/* 上端点X */
 	private String sddy;/* 上端点Y */
 	private String xddx;/* 下端点X */
-	private String xddy;/* 下端点Y*/
-	private String bwyt;/* 泊位用途*/
-	private String bwytzw;/* 泊位用途*/
-	private String zyhbwfl;/* 专业化泊位分类*/
-	private String zyhbwflzw;/* 专业化泊位分类*/
-	private String taskkey;/* 专业化泊位分类*/
-	private String lcjd;/* 流程节点*/
-	private String sfqswj;/* 是否缺失文件*/
-	private String showjsjd;/* 是否显示建设进度*/
+	private String xddy;/* 下端点Y */
+	private String bwyt;/* 泊位用途 */
+	private String bwytzw;/* 泊位用途 */
+	private String zyhbwfl;/* 专业化泊位分类 */
+	private String zyhbwflzw;/* 专业化泊位分类 */
+	private String taskkey;/* 专业化泊位分类 */
+	private String lcjd;/* 流程节点 */
+	private String sfqswj;/* 是否缺失文件 */
+	private String showjsjd;/* 是否显示建设进度 */
 	private String sftb;
 	private String tbzt;
+	private String bwids;
+	private String bwidszw;
 	
+	public String getBwidszw() {
+		return bwidszw;
+	}
+
+	public void setBwidszw(String bwidszw) {
+		this.bwidszw = bwidszw;
+	}
+
+	public String getBwids() {
+		return bwids;
+	}
+
+	public void setBwids(String bwids) {
+		this.bwids = bwids;
+	}
 
 	public String getSftb() {
 		return sftb;
@@ -530,7 +547,5 @@ public class XmxxglVo extends BaseVo {
 	public void setJcsjstr(String jcsjstr) {
 		this.jcsjstr = jcsjstr;
 	}
-	
-	
 
 }