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

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/BwCtl.java

@@ -0,0 +1,54 @@
+package com.xt.js.gkaq.web.ctl;
+
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
+import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.web.model.BwInfoModel;
+import com.xt.js.gkaq.web.model.BwModel;
+import com.xt.js.gkaq.web.service.BwService;
+import com.xt.js.gkaq.web.vo.BwVo;
+import com.xt.js.gkaq.web.vo.JyrjcxxVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
+
+@Controller
+@RequestMapping(value = "/bw", produces = "application/json; charset=utf-8")
+public class BwCtl extends BaseCtl {
+	@Autowired
+	private BwService bwService;
+    @Autowired
+    private CodeService codeService;
+    
+    /**
+     * 数据表格
+     * @param vo
+     * @return
+     */
+    @RequestMapping("list")
+    @ResponseBody
+    public PageInfo<BwInfoModel> list(BwVo vo) {
+		if (null == vo.getPage() || vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (null == vo.getRows() || vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		BwModel model = new BwModel();
+		BeanUtils.copyProperties(vo, model);
+		
+		List<BwInfoModel> list = bwService.selectInfo(model);
+		PageInfo<BwInfoModel> pageResult = new PageInfo<>(list);
+		return pageResult;
+    }
+  
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/CkCtl.java

@@ -0,0 +1,50 @@
+package com.xt.js.gkaq.web.ctl;
+
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.web.vo.CkVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
+
+@Controller
+@RequestMapping(value = "/ck", produces = "application/json; charset=utf-8")
+public class CkCtl extends BaseCtl {
+	@Autowired
+	private CkService ckService;
+    @Autowired
+    private CodeService codeService;
+    
+    /**
+     * 数据表格
+     * @param vo
+     * @return
+     */
+    @RequestMapping("list")
+    @ResponseBody
+    public PageInfo<CkModel> list(CkVo vo) {
+		if (null == vo.getPage() || vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (null == vo.getRows() || vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		CkModel model = new CkModel();
+		BeanUtils.copyProperties(vo, model);
+		
+		List<CkModel> list = ckService.selectInfo(model);
+		PageInfo<CkModel> pageResult = new PageInfo<>(list);
+		return pageResult;
+    }
+  
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/DcCtl.java

@@ -0,0 +1,53 @@
+package com.xt.js.gkaq.web.ctl;
+
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.DcModel;
+import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.web.service.DcService;
+import com.xt.js.gkaq.web.vo.CkVo;
+import com.xt.js.gkaq.web.vo.DcVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
+
+@Controller
+@RequestMapping(value = "/dc", produces = "application/json; charset=utf-8")
+public class DcCtl extends BaseCtl {
+	@Autowired
+	private DcService dcService;
+    @Autowired
+    private CodeService codeService;
+    
+    /**
+     * 数据表格
+     * @param vo
+     * @return
+     */
+    @RequestMapping("list")
+    @ResponseBody
+    public PageInfo<DcModel> list(DcVo vo) {
+		if (null == vo.getPage() || vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (null == vo.getRows() || vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		DcModel model = new DcModel();
+		BeanUtils.copyProperties(vo, model);
+		
+		List<DcModel> list = dcService.selectInfo(model);
+		PageInfo<DcModel> pageResult = new PageInfo<>(list);
+		return pageResult;
+    }
+  
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrTjcxCtl.java

@@ -0,0 +1,51 @@
+package com.xt.js.gkaq.web.ctl;
+
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.TjcxModel;
+import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.web.service.JyrTjcxService;
+import com.xt.js.gkaq.web.vo.CkVo;
+import com.xt.js.gkaq.web.vo.TjcxVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
+
+@Controller
+@RequestMapping(value = "/tjcx", produces = "application/json; charset=utf-8")
+public class JyrTjcxCtl extends BaseCtl {
+	@Autowired
+	private JyrTjcxService service;
+    
+    /**
+     * 数据表格
+     * @param vo
+     * @return
+     */
+    @RequestMapping("list")
+    @ResponseBody
+    public PageInfo<TjcxModel> list(TjcxVo vo) {
+		if (null == vo.getPage() || vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (null == vo.getRows() || vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		TjcxModel model = new TjcxModel();
+		BeanUtils.copyProperties(vo, model);
+		
+		List<TjcxModel> list = service.selectInfo(model);
+		PageInfo<TjcxModel> pageResult = new PageInfo<>(list);
+		return pageResult;
+    }
+  
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrWxhwtjcxCtl.java

@@ -0,0 +1,54 @@
+package com.xt.js.gkaq.web.ctl;
+
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.TjcxModel;
+import com.xt.js.gkaq.web.model.WxhwtjcxModel;
+import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.web.service.JyrTjcxService;
+import com.xt.js.gkaq.web.service.JyrWxhwtjcxService;
+import com.xt.js.gkaq.web.vo.CkVo;
+import com.xt.js.gkaq.web.vo.TjcxVo;
+import com.xt.js.gkaq.web.vo.WxhwtjcxVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
+
+@Controller
+@RequestMapping(value = "/jyrwxhw", produces = "application/json; charset=utf-8")
+public class JyrWxhwtjcxCtl extends BaseCtl {
+	@Autowired
+	private JyrWxhwtjcxService service;
+    
+    /**
+     * 数据表格
+     * @param vo
+     * @return
+     */
+    @RequestMapping("list")
+    @ResponseBody
+    public PageInfo<WxhwtjcxModel> list(WxhwtjcxVo vo) {
+		if (null == vo.getPage() || vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (null == vo.getRows() || vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		WxhwtjcxModel model = new WxhwtjcxModel();
+		BeanUtils.copyProperties(vo, model);
+		
+		List<WxhwtjcxModel> list = service.selectByInfo(model);
+		PageInfo<WxhwtjcxModel> pageResult = new PageInfo<>(list);
+		return pageResult;
+    }
+  
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrjcxxCtl.java

@@ -91,18 +91,6 @@ public class JyrjcxxCtl extends BaseCtl {
 		PageHelper.startPage(vo.getPage(), vo.getRows());
 		JyrjcxxModel model = new JyrjcxxModel();
 		BeanUtils.copyProperties(vo, model);
-//		model.setSzd(vo.getSzd());
-//		model.setSzgq(vo.getSzgq());
-//		model.setQylx(vo.getQylx());
-//		model.setGkjyr(vo.getGkjyr());
-//		model.setFddbr(vo.getFddbr());
-//		model.setSfwhqy(vo.getSfwhqy());
-//		model.setByzd1(vo.getByzd1());
-//		model.setByzd2(vo.getByzd2());
-//		model.setByzd3(vo.getByzd3());
-//		model.setByzd4(vo.getByzd4());
-//		model.setByzd5(vo.getByzd5());
-		
 		List<JyrjcxxInfol> list = jyrjcxxService.selectList(model);
 		PageInfo<JyrjcxxInfol> pageResult = new PageInfo<>(list);
 		return pageResult;
@@ -180,5 +168,25 @@ public class JyrjcxxCtl extends BaseCtl {
     		jyrjcxxService.update(model);
     	}
     	return success();
-    } 
+    }
+    
+    /**
+     * 删除信息，可多条删除
+     * @param ids
+     * @return
+     */
+    @RequestMapping("delJyrInfo")
+    @ResponseBody
+    public WebJsonResult delJyrInfo (String ids) {
+    	String[] idArray = ids.split(",");
+    	if (idArray != null && idArray.length > 0 ) {
+    		for (String id : idArray) {
+        		//修改
+        		JyrjcxxModel model = jyrjcxxService.findById(id);
+        		model.setState(BaseUUIDModel.STATE_DELETE);
+        		jyrjcxxService.update(model);
+    		}
+    	}
+    	return success();
+    }
 }

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/BwModelMapper.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.web.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.BwInfoModel;
+import com.xt.js.gkaq.web.model.BwModel;
+
+public interface BwModelMapper extends BaseMapper<BwModel> {
+	public List<BwInfoModel> selectByInfo(BwModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/CkModelMapper.java

@@ -0,0 +1,10 @@
+package com.xt.js.gkaq.web.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.CkModel;
+
+public interface CkModelMapper extends BaseMapper<CkModel> {
+	public List<CkModel> selectByInfo(CkModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/DcModelMapper.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.web.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.DcModel;
+
+public interface DcModelMapper extends BaseMapper<DcModel> {
+	public List<DcModel> selectByInfo(DcModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/JyrTjcxMapper.java

@@ -0,0 +1,10 @@
+package com.xt.js.gkaq.web.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.TjcxModel;
+
+public interface JyrTjcxMapper extends BaseMapper<TjcxModel> {
+	public List<TjcxModel> selectByInfo(TjcxModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/JyrWxhwtjcxMapper.java

@@ -0,0 +1,10 @@
+package com.xt.js.gkaq.web.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.WxhwtjcxModel;
+
+public interface JyrWxhwtjcxMapper extends BaseMapper<WxhwtjcxModel> {
+	public List<WxhwtjcxModel> selectByInfo(WxhwtjcxModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/BwInfoModel.java

@@ -0,0 +1,326 @@
+package com.xt.js.gkaq.web.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 泊位Model
+ * @author 李小虎
+ *
+ */
+public class BwInfoModel extends BaseUUIDModel {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1856022900011957047L;
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//经营人名称（id）
+	private Long mtmc;//码头名称(id)
+	private String mtName;//码头名称
+	private String bwmc;//泊位名称
+	private Long bwsx;//泊位属性
+	private Long bwszsx;//泊位所在水系
+	private Long fwlx;//服务类型
+	private Long tcnf;//投产年份
+	private Long jgxs;//结构型式
+	private Long sclx;//生产类型
+	private Long jgysnf;//竣工验收年份
+	private String qysjsh;//前沿设计水深
+	private String qysjss;//前沿实际水深
+	private String bwcd;//泊位长度
+	private String wxpbw;//危险品泊位
+	private String sjtgnl;//设计通过能力
+	private String sjkpnl;//设计靠泊能力(吨级)
+	private String nhwtgml;//年货物通过能力
+	private String nwxhwttl;//年危险货物吞吐量
+	private Long zyhbwfl;//专业化泊位分类
+	private String jd;//经度
+	private String wd;//纬度
+	private String sffz;//是否发证
+	private String bwyt;//泊位用途
+	private String zyrkfw;//作业认可范围
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordCode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String jtjgisdyidh;
+	private String hckpnl;//检查靠泊能力
+	private String zwbwyt;//泊位用途显示
+	private String smid;//地图id
+	private String bwdm;//
+	private Long jgxs2;
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public Long getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(Long szgq) {
+		this.szgq = szgq;
+	}
+	public Long getQymc() {
+		return qymc;
+	}
+	public void setQymc(Long qymc) {
+		this.qymc = qymc;
+	}
+	public Long getMtmc() {
+		return mtmc;
+	}
+	public void setMtmc(Long mtmc) {
+		this.mtmc = mtmc;
+	}
+	public String getBwmc() {
+		return bwmc;
+	}
+	
+	public String getMtName() {
+		return mtName;
+	}
+	public void setMtName(String mtName) {
+		this.mtName = mtName;
+	}
+	public void setBwmc(String bwmc) {
+		this.bwmc = bwmc;
+	}
+	public Long getBwsx() {
+		return bwsx;
+	}
+	public void setBwsx(Long bwsx) {
+		this.bwsx = bwsx;
+	}
+	public Long getBwszsx() {
+		return bwszsx;
+	}
+	public void setBwszsx(Long bwszsx) {
+		this.bwszsx = bwszsx;
+	}
+	public Long getFwlx() {
+		return fwlx;
+	}
+	public void setFwlx(Long fwlx) {
+		this.fwlx = fwlx;
+	}
+	public Long getTcnf() {
+		return tcnf;
+	}
+	public void setTcnf(Long tcnf) {
+		this.tcnf = tcnf;
+	}
+	public Long getJgxs() {
+		return jgxs;
+	}
+	public void setJgxs(Long jgxs) {
+		this.jgxs = jgxs;
+	}
+	public Long getSclx() {
+		return sclx;
+	}
+	public void setSclx(Long sclx) {
+		this.sclx = sclx;
+	}
+	public Long getJgysnf() {
+		return jgysnf;
+	}
+	public void setJgysnf(Long jgysnf) {
+		this.jgysnf = jgysnf;
+	}
+	public String getQysjsh() {
+		return qysjsh;
+	}
+	public void setQysjsh(String qysjsh) {
+		this.qysjsh = qysjsh;
+	}
+	public String getQysjss() {
+		return qysjss;
+	}
+	public void setQysjss(String qysjss) {
+		this.qysjss = qysjss;
+	}
+	public String getBwcd() {
+		return bwcd;
+	}
+	public void setBwcd(String bwcd) {
+		this.bwcd = bwcd;
+	}
+	public String getWxpbw() {
+		return wxpbw;
+	}
+	public void setWxpbw(String wxpbw) {
+		this.wxpbw = wxpbw;
+	}
+	public String getSjtgnl() {
+		return sjtgnl;
+	}
+	public void setSjtgnl(String sjtgnl) {
+		this.sjtgnl = sjtgnl;
+	}
+	public String getSjkpnl() {
+		return sjkpnl;
+	}
+	public void setSjkpnl(String sjkpnl) {
+		this.sjkpnl = sjkpnl;
+	}
+	public String getNhwtgml() {
+		return nhwtgml;
+	}
+	public void setNhwtgml(String nhwtgml) {
+		this.nhwtgml = nhwtgml;
+	}
+	public String getNwxhwttl() {
+		return nwxhwttl;
+	}
+	public void setNwxhwttl(String nwxhwttl) {
+		this.nwxhwttl = nwxhwttl;
+	}
+	public Long getZyhbwfl() {
+		return zyhbwfl;
+	}
+	public void setZyhbwfl(Long zyhbwfl) {
+		this.zyhbwfl = zyhbwfl;
+	}
+	public String getJd() {
+		return jd;
+	}
+	public void setJd(String jd) {
+		this.jd = jd;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getSffz() {
+		return sffz;
+	}
+	public void setSffz(String sffz) {
+		this.sffz = sffz;
+	}
+	public String getBwyt() {
+		return bwyt;
+	}
+	public void setBwyt(String bwyt) {
+		this.bwyt = bwyt;
+	}
+	public String getZyrkfw() {
+		return zyrkfw;
+	}
+	public void setZyrkfw(String zyrkfw) {
+		this.zyrkfw = zyrkfw;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordCode() {
+		return recordCode;
+	}
+	public void setRecordCode(String recordCode) {
+		this.recordCode = recordCode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getJtjgisdyidh() {
+		return jtjgisdyidh;
+	}
+	public void setJtjgisdyidh(String jtjgisdyidh) {
+		this.jtjgisdyidh = jtjgisdyidh;
+	}
+	public String getHckpnl() {
+		return hckpnl;
+	}
+	public void setHckpnl(String hckpnl) {
+		this.hckpnl = hckpnl;
+	}
+	public String getZwbwyt() {
+		return zwbwyt;
+	}
+	public void setZwbwyt(String zwbwyt) {
+		this.zwbwyt = zwbwyt;
+	}
+	public String getSmid() {
+		return smid;
+	}
+	public void setSmid(String smid) {
+		this.smid = smid;
+	}
+	public String getBwdm() {
+		return bwdm;
+	}
+	public void setBwdm(String bwdm) {
+		this.bwdm = bwdm;
+	}
+	public Long getJgxs2() {
+		return jgxs2;
+	}
+	public void setJgxs2(Long jgxs2) {
+		this.jgxs2 = jgxs2;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/BwModel.java

@@ -0,0 +1,318 @@
+package com.xt.js.gkaq.web.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 泊位Model
+ * @author 李小虎
+ *
+ */
+public class BwModel extends BaseUUIDModel {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1856022900011957047L;
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//经营人名称（id）
+	private Long mtmc;//码头名称(id)
+	private String bwmc;//泊位名称
+	private Long bwsx;//泊位属性
+	private Long bwszsx;//泊位所在水系
+	private Long fwlx;//服务类型
+	private Long tcnf;//投产年份
+	private Long jgxs;//结构型式
+	private Long sclx;//生产类型
+	private Long jgysnf;//竣工验收年份
+	private String qysjsh;//前沿设计水深
+	private String qysjss;//前沿实际水深
+	private String bwcd;//泊位长度
+	private String wxpbw;//危险品泊位
+	private String sjtgnl;//设计通过能力
+	private String sjkpnl;//设计靠泊能力(吨级)
+	private String nhwtgml;//年货物通过能力
+	private String nwxhwttl;//年危险货物吞吐量
+	private Long zyhbwfl;//专业化泊位分类
+	private String jd;//经度
+	private String wd;//纬度
+	private String sffz;//是否发证
+	private String bwyt;//泊位用途
+	private String zyrkfw;//作业认可范围
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordCode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String jtjgisdyidh;
+	private String hckpnl;//检查靠泊能力
+	private String zwbwyt;//泊位用途显示
+	private String smid;//地图id
+	private String bwdm;//
+	private Long jgxs2;
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public Long getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(Long szgq) {
+		this.szgq = szgq;
+	}
+	public Long getQymc() {
+		return qymc;
+	}
+	public void setQymc(Long qymc) {
+		this.qymc = qymc;
+	}
+	public Long getMtmc() {
+		return mtmc;
+	}
+	public void setMtmc(Long mtmc) {
+		this.mtmc = mtmc;
+	}
+	public String getBwmc() {
+		return bwmc;
+	}
+	public void setBwmc(String bwmc) {
+		this.bwmc = bwmc;
+	}
+	public Long getBwsx() {
+		return bwsx;
+	}
+	public void setBwsx(Long bwsx) {
+		this.bwsx = bwsx;
+	}
+	public Long getBwszsx() {
+		return bwszsx;
+	}
+	public void setBwszsx(Long bwszsx) {
+		this.bwszsx = bwszsx;
+	}
+	public Long getFwlx() {
+		return fwlx;
+	}
+	public void setFwlx(Long fwlx) {
+		this.fwlx = fwlx;
+	}
+	public Long getTcnf() {
+		return tcnf;
+	}
+	public void setTcnf(Long tcnf) {
+		this.tcnf = tcnf;
+	}
+	public Long getJgxs() {
+		return jgxs;
+	}
+	public void setJgxs(Long jgxs) {
+		this.jgxs = jgxs;
+	}
+	public Long getSclx() {
+		return sclx;
+	}
+	public void setSclx(Long sclx) {
+		this.sclx = sclx;
+	}
+	public Long getJgysnf() {
+		return jgysnf;
+	}
+	public void setJgysnf(Long jgysnf) {
+		this.jgysnf = jgysnf;
+	}
+	public String getQysjsh() {
+		return qysjsh;
+	}
+	public void setQysjsh(String qysjsh) {
+		this.qysjsh = qysjsh;
+	}
+	public String getQysjss() {
+		return qysjss;
+	}
+	public void setQysjss(String qysjss) {
+		this.qysjss = qysjss;
+	}
+	public String getBwcd() {
+		return bwcd;
+	}
+	public void setBwcd(String bwcd) {
+		this.bwcd = bwcd;
+	}
+	public String getWxpbw() {
+		return wxpbw;
+	}
+	public void setWxpbw(String wxpbw) {
+		this.wxpbw = wxpbw;
+	}
+	public String getSjtgnl() {
+		return sjtgnl;
+	}
+	public void setSjtgnl(String sjtgnl) {
+		this.sjtgnl = sjtgnl;
+	}
+	public String getSjkpnl() {
+		return sjkpnl;
+	}
+	public void setSjkpnl(String sjkpnl) {
+		this.sjkpnl = sjkpnl;
+	}
+	public String getNhwtgml() {
+		return nhwtgml;
+	}
+	public void setNhwtgml(String nhwtgml) {
+		this.nhwtgml = nhwtgml;
+	}
+	public String getNwxhwttl() {
+		return nwxhwttl;
+	}
+	public void setNwxhwttl(String nwxhwttl) {
+		this.nwxhwttl = nwxhwttl;
+	}
+	public Long getZyhbwfl() {
+		return zyhbwfl;
+	}
+	public void setZyhbwfl(Long zyhbwfl) {
+		this.zyhbwfl = zyhbwfl;
+	}
+	public String getJd() {
+		return jd;
+	}
+	public void setJd(String jd) {
+		this.jd = jd;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getSffz() {
+		return sffz;
+	}
+	public void setSffz(String sffz) {
+		this.sffz = sffz;
+	}
+	public String getBwyt() {
+		return bwyt;
+	}
+	public void setBwyt(String bwyt) {
+		this.bwyt = bwyt;
+	}
+	public String getZyrkfw() {
+		return zyrkfw;
+	}
+	public void setZyrkfw(String zyrkfw) {
+		this.zyrkfw = zyrkfw;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordCode() {
+		return recordCode;
+	}
+	public void setRecordCode(String recordCode) {
+		this.recordCode = recordCode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getJtjgisdyidh() {
+		return jtjgisdyidh;
+	}
+	public void setJtjgisdyidh(String jtjgisdyidh) {
+		this.jtjgisdyidh = jtjgisdyidh;
+	}
+	public String getHckpnl() {
+		return hckpnl;
+	}
+	public void setHckpnl(String hckpnl) {
+		this.hckpnl = hckpnl;
+	}
+	public String getZwbwyt() {
+		return zwbwyt;
+	}
+	public void setZwbwyt(String zwbwyt) {
+		this.zwbwyt = zwbwyt;
+	}
+	public String getSmid() {
+		return smid;
+	}
+	public void setSmid(String smid) {
+		this.smid = smid;
+	}
+	public String getBwdm() {
+		return bwdm;
+	}
+	public void setBwdm(String bwdm) {
+		this.bwdm = bwdm;
+	}
+	public Long getJgxs2() {
+		return jgxs2;
+	}
+	public void setJgxs2(Long jgxs2) {
+		this.jgxs2 = jgxs2;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/CkModel.java

@@ -0,0 +1,227 @@
+package com.xt.js.gkaq.web.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 仓库Model
+ * @author 李小虎
+ *
+ */
+public class CkModel extends BaseUUIDModel {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2605248010407095407L;
+	private Long ssjyr;//所属经营人
+	private String szd;//所在地
+	private Long gq;//港区
+	private Long mt;//码头
+	private String qymc;//企业名称
+	private String ckmc;//仓库名称
+	private String wxpck;//危险品仓库
+	private String ckyt;//仓库用途
+	private Long ckgs;//仓库个数
+	private Long ythgcgrj;//液体化工储罐容积
+	private Long scyckmj;//生产用仓库面积
+	private Long wxpckmj;//危险品仓库面积
+	private Long scyckrj;//生产用仓库容积
+	private Long ykrj;//油库容积
+	private Long cpyrj;//成品油容积
+	private Long gisid;//交通局GIS对应id号
+	private String jd;//经度
+	private String wd;//纬度
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String zwckyt;//仓库用途显示
+	public Long getSsjyr() {
+		return ssjyr;
+	}
+	public void setSsjyr(Long ssjyr) {
+		this.ssjyr = ssjyr;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public Long getGq() {
+		return gq;
+	}
+	public void setGq(Long gq) {
+		this.gq = gq;
+	}
+	public Long getMt() {
+		return mt;
+	}
+	public void setMt(Long mt) {
+		this.mt = mt;
+	}
+	public String getQymc() {
+		return qymc;
+	}
+	public void setQymc(String qymc) {
+		this.qymc = qymc;
+	}
+	public String getCkmc() {
+		return ckmc;
+	}
+	public void setCkmc(String ckmc) {
+		this.ckmc = ckmc;
+	}
+	public String getWxpck() {
+		return wxpck;
+	}
+	public void setWxpck(String wxpck) {
+		this.wxpck = wxpck;
+	}
+	public String getCkyt() {
+		return ckyt;
+	}
+	public void setCkyt(String ckyt) {
+		this.ckyt = ckyt;
+	}
+	public Long getCkgs() {
+		return ckgs;
+	}
+	public void setCkgs(Long ckgs) {
+		this.ckgs = ckgs;
+	}
+	public Long getYthgcgrj() {
+		return ythgcgrj;
+	}
+	public void setYthgcgrj(Long ythgcgrj) {
+		this.ythgcgrj = ythgcgrj;
+	}
+	public Long getScyckmj() {
+		return scyckmj;
+	}
+	public void setScyckmj(Long scyckmj) {
+		this.scyckmj = scyckmj;
+	}
+	public Long getWxpckmj() {
+		return wxpckmj;
+	}
+	public void setWxpckmj(Long wxpckmj) {
+		this.wxpckmj = wxpckmj;
+	}
+	public Long getScyckrj() {
+		return scyckrj;
+	}
+	public void setScyckrj(Long scyckrj) {
+		this.scyckrj = scyckrj;
+	}
+	public Long getYkrj() {
+		return ykrj;
+	}
+	public void setYkrj(Long ykrj) {
+		this.ykrj = ykrj;
+	}
+	public Long getCpyrj() {
+		return cpyrj;
+	}
+	public void setCpyrj(Long cpyrj) {
+		this.cpyrj = cpyrj;
+	}
+	public Long getGisid() {
+		return gisid;
+	}
+	public void setGisid(Long gisid) {
+		this.gisid = gisid;
+	}
+	public String getJd() {
+		return jd;
+	}
+	public void setJd(String jd) {
+		this.jd = jd;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getZwckyt() {
+		return zwckyt;
+	}
+	public void setZwckyt(String zwckyt) {
+		this.zwckyt = zwckyt;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/DcModel.java

@@ -0,0 +1,214 @@
+package com.xt.js.gkaq.web.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 仓库Model
+ * @author 李小虎
+ *
+ */
+public class DcModel extends BaseUUIDModel {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5402972991830338558L;
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//企业名称
+	private Long mtmc;//码头名称
+	private String dcmc;//堆场名称
+	private String scydcyt;//堆场用途
+	private Long dczmj;//堆场总面积
+	private Long dczrl;//堆场总容量
+	private Long jzxmj;//集装箱堆场面积
+	private Long jzxdcdcnl;//集装箱堆场堆存面积
+	private Long wxpxdcmj;//危险品堆场面积
+	private Long wxpxdcdcnl;//危险品堆场堆存能力
+	private String wxpdc;//是否是危险品堆场
+	
+	private String jd;//经度
+	private String wd;//纬度
+	private String jtjgisdyidh;//交通局GIS对应id号
+	
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String zwdcyt;//堆场用途显示
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public Long getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(Long szgq) {
+		this.szgq = szgq;
+	}
+	public Long getQymc() {
+		return qymc;
+	}
+	public void setQymc(Long qymc) {
+		this.qymc = qymc;
+	}
+	public Long getMtmc() {
+		return mtmc;
+	}
+	public void setMtmc(Long mtmc) {
+		this.mtmc = mtmc;
+	}
+	public String getDcmc() {
+		return dcmc;
+	}
+	public void setDcmc(String dcmc) {
+		this.dcmc = dcmc;
+	}
+	public String getScydcyt() {
+		return scydcyt;
+	}
+	public void setScydcyt(String scydcyt) {
+		this.scydcyt = scydcyt;
+	}
+	public Long getDczmj() {
+		return dczmj;
+	}
+	public void setDczmj(Long dczmj) {
+		this.dczmj = dczmj;
+	}
+	public Long getDczrl() {
+		return dczrl;
+	}
+	public void setDczrl(Long dczrl) {
+		this.dczrl = dczrl;
+	}
+	public Long getJzxmj() {
+		return jzxmj;
+	}
+	public void setJzxmj(Long jzxmj) {
+		this.jzxmj = jzxmj;
+	}
+	public Long getJzxdcdcnl() {
+		return jzxdcdcnl;
+	}
+	public void setJzxdcdcnl(Long jzxdcdcnl) {
+		this.jzxdcdcnl = jzxdcdcnl;
+	}
+	public Long getWxpxdcmj() {
+		return wxpxdcmj;
+	}
+	public void setWxpxdcmj(Long wxpxdcmj) {
+		this.wxpxdcmj = wxpxdcmj;
+	}
+	public Long getWxpxdcdcnl() {
+		return wxpxdcdcnl;
+	}
+	public void setWxpxdcdcnl(Long wxpxdcdcnl) {
+		this.wxpxdcdcnl = wxpxdcdcnl;
+	}
+	public String getWxpdc() {
+		return wxpdc;
+	}
+	public void setWxpdc(String wxpdc) {
+		this.wxpdc = wxpdc;
+	}
+	public String getJd() {
+		return jd;
+	}
+	public void setJd(String jd) {
+		this.jd = jd;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getJtjgisdyidh() {
+		return jtjgisdyidh;
+	}
+	public void setJtjgisdyidh(String jtjgisdyidh) {
+		this.jtjgisdyidh = jtjgisdyidh;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getZwdcyt() {
+		return zwdcyt;
+	}
+	public void setZwdcyt(String zwdcyt) {
+		this.zwdcyt = zwdcyt;
+	}
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/TjcxModel.java

@@ -0,0 +1,132 @@
+package com.xt.js.gkaq.web.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 统计查询的Model
+ * @author 李小虎
+ *
+ */
+public class TjcxModel extends BaseUUIDModel {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 861338246604486083L;
+	private String gkjyr;
+	private String syhgmt;
+	private String wxhw;
+	private String ph;
+	private String jzx;
+	private String wd;
+	private String wdyx;
+	private String qd;
+	private String qdyx;
+	private String sl;
+	private String wxsl;
+	private String rj;
+	
+	private String szd;
+	private String qylx;
+	private String qstime;
+	private String jstime;
+	
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getQylx() {
+		return qylx;
+	}
+	public void setQylx(String qylx) {
+		this.qylx = qylx;
+	}
+	public String getQstime() {
+		return qstime;
+	}
+	public void setQstime(String qstime) {
+		this.qstime = qstime;
+	}
+	public String getJstime() {
+		return jstime;
+	}
+	public void setJstime(String jstime) {
+		this.jstime = jstime;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getSyhgmt() {
+		return syhgmt;
+	}
+	public void setSyhgmt(String syhgmt) {
+		this.syhgmt = syhgmt;
+	}
+	public String getWxhw() {
+		return wxhw;
+	}
+	public void setWxhw(String wxhw) {
+		this.wxhw = wxhw;
+	}
+	public String getPh() {
+		return ph;
+	}
+	public void setPh(String ph) {
+		this.ph = ph;
+	}
+	public String getJzx() {
+		return jzx;
+	}
+	public void setJzx(String jzx) {
+		this.jzx = jzx;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getWdyx() {
+		return wdyx;
+	}
+	public void setWdyx(String wdyx) {
+		this.wdyx = wdyx;
+	}
+	public String getQd() {
+		return qd;
+	}
+	public void setQd(String qd) {
+		this.qd = qd;
+	}
+	public String getQdyx() {
+		return qdyx;
+	}
+	public void setQdyx(String qdyx) {
+		this.qdyx = qdyx;
+	}
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public String getWxsl() {
+		return wxsl;
+	}
+	public void setWxsl(String wxsl) {
+		this.wxsl = wxsl;
+	}
+	public String getRj() {
+		return rj;
+	}
+	public void setRj(String rj) {
+		this.rj = rj;
+	}
+	
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/WxhwtjcxModel.java

@@ -0,0 +1,147 @@
+package com.xt.js.gkaq.web.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 危险货物统计查询的Model
+ * @author 李小虎
+ *
+ */
+public class WxhwtjcxModel extends BaseUUIDModel {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7349035378161675941L;
+	private String bz;
+	private String gkjyr;
+	private String byzd1;
+	private String bwmc;
+	private String wd;
+	private String qd;
+	private String jzxttl;
+	private String ttl;
+	private String gqmc;
+	private String gm;
+	private String sffz;
+	private String hz;
+	private String qylx;
+	
+	
+	private String szd;
+	private String kssj;
+	private String jssj;
+	private String byzd2;
+	private String byzd3;
+	
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getBwmc() {
+		return bwmc;
+	}
+	public void setBwmc(String bwmc) {
+		this.bwmc = bwmc;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getQd() {
+		return qd;
+	}
+	public void setQd(String qd) {
+		this.qd = qd;
+	}
+	public String getJzxttl() {
+		return jzxttl;
+	}
+	public void setJzxttl(String jzxttl) {
+		this.jzxttl = jzxttl;
+	}
+	public String getTtl() {
+		return ttl;
+	}
+	public void setTtl(String ttl) {
+		this.ttl = ttl;
+	}
+	public String getGqmc() {
+		return gqmc;
+	}
+	public void setGqmc(String gqmc) {
+		this.gqmc = gqmc;
+	}
+	public String getGm() {
+		return gm;
+	}
+	public void setGm(String gm) {
+		this.gm = gm;
+	}
+	public String getSffz() {
+		return sffz;
+	}
+	public void setSffz(String sffz) {
+		this.sffz = sffz;
+	}
+	public String getHz() {
+		return hz;
+	}
+	public void setHz(String hz) {
+		this.hz = hz;
+	}
+	public String getQylx() {
+		return qylx;
+	}
+	public void setQylx(String qylx) {
+		this.qylx = qylx;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getKssj() {
+		return kssj;
+	}
+	public void setKssj(String kssj) {
+		this.kssj = kssj;
+	}
+	public String getJssj() {
+		return jssj;
+	}
+	public void setJssj(String jssj) {
+		this.jssj = jssj;
+	}
+	
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/BwService.java

@@ -0,0 +1,15 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.web.model.BwInfoModel;
+import com.xt.js.gkaq.web.model.BwModel;
+import com.xt.js.gkaq.web.model.GqModel;
+import com.xt.js.gkaq.web.model.WxhwModel;
+
+public interface BwService extends BaseUUIDModelService<BwModel> {
+	public List<BwInfoModel> selectInfo (BwModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/CkService.java

@@ -0,0 +1,16 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.web.model.BwInfoModel;
+import com.xt.js.gkaq.web.model.BwModel;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.GqModel;
+import com.xt.js.gkaq.web.model.WxhwModel;
+
+public interface CkService extends BaseUUIDModelService<CkModel> {
+	public List<CkModel> selectInfo (CkModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/DcService.java

@@ -0,0 +1,17 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.web.model.BwInfoModel;
+import com.xt.js.gkaq.web.model.BwModel;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.DcModel;
+import com.xt.js.gkaq.web.model.GqModel;
+import com.xt.js.gkaq.web.model.WxhwModel;
+
+public interface DcService extends BaseUUIDModelService<DcModel> {
+	public List<DcModel> selectInfo (DcModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/JyrTjcxService.java

@@ -0,0 +1,17 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.web.model.BwInfoModel;
+import com.xt.js.gkaq.web.model.BwModel;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.GqModel;
+import com.xt.js.gkaq.web.model.TjcxModel;
+import com.xt.js.gkaq.web.model.WxhwModel;
+
+public interface JyrTjcxService extends BaseUUIDModelService<TjcxModel> {
+	public List<TjcxModel> selectInfo (TjcxModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/JyrWxhwtjcxService.java

@@ -0,0 +1,10 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.web.model.WxhwtjcxModel;
+
+public interface JyrWxhwtjcxService extends BaseUUIDModelService<WxhwtjcxModel> {
+	public List<WxhwtjcxModel> selectByInfo (WxhwtjcxModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/BwServiceImpl.java

@@ -0,0 +1,37 @@
+package com.xt.js.gkaq.web.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseServiceImpl;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.web.mappers.BwModelMapper;
+import com.xt.js.gkaq.web.mappers.GqModelMapper;
+import com.xt.js.gkaq.web.model.BwInfoModel;
+import com.xt.js.gkaq.web.model.BwModel;
+import com.xt.js.gkaq.web.model.GqModel;
+import com.xt.js.gkaq.web.service.BwService;
+import com.xt.js.gkaq.web.service.GqService;
+
+@Service
+public class BwServiceImpl extends BaseUUIDModelServiceImpl<BwModel> implements BwService {
+	@Autowired
+	BwModelMapper mapper;
+	
+	@Override
+	protected BaseMapper<BwModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<BwInfoModel> selectInfo(BwModel model) {
+		return mapper.selectByInfo(model);
+	}
+
+	
+   
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/CkServiceImpl.java

@@ -0,0 +1,31 @@
+package com.xt.js.gkaq.web.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.web.mappers.CkModelMapper;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.service.CkService;
+
+@Service
+public class CkServiceImpl extends BaseUUIDModelServiceImpl<CkModel> implements CkService {
+	@Autowired
+	CkModelMapper mapper;
+	
+	@Override
+	protected BaseMapper<CkModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<CkModel> selectInfo(CkModel model) {
+		return mapper.selectByInfo(model);
+	}
+
+	
+   
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/DcServiceImpl.java

@@ -0,0 +1,31 @@
+package com.xt.js.gkaq.web.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.web.mappers.DcModelMapper;
+import com.xt.js.gkaq.web.model.DcModel;
+import com.xt.js.gkaq.web.service.DcService;
+
+@Service
+public class DcServiceImpl extends BaseUUIDModelServiceImpl<DcModel> implements DcService {
+	@Autowired
+	DcModelMapper mapper;
+	
+	@Override
+	protected BaseMapper<DcModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<DcModel> selectInfo(DcModel model) {
+		return mapper.selectByInfo(model);
+	}
+
+	
+   
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/JyrTjcxServiceImpl.java

@@ -0,0 +1,37 @@
+package com.xt.js.gkaq.web.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.web.mappers.CkModelMapper;
+import com.xt.js.gkaq.web.mappers.JyrTjcxMapper;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.TjcxModel;
+import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.web.service.JyrTjcxService;
+
+@Service
+public class JyrTjcxServiceImpl extends BaseUUIDModelServiceImpl<TjcxModel> implements JyrTjcxService {
+	@Autowired
+	JyrTjcxMapper mapper;
+	
+	@Override
+	protected BaseMapper<TjcxModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<TjcxModel> selectInfo(TjcxModel model) {
+		// TODO Auto-generated method stub
+		return mapper.selectByInfo(model);
+	}
+
+	
+	
+
+   
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/JyrWxhwyjcxServiceImpl.java

@@ -0,0 +1,35 @@
+package com.xt.js.gkaq.web.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.web.mappers.CkModelMapper;
+import com.xt.js.gkaq.web.mappers.JyrTjcxMapper;
+import com.xt.js.gkaq.web.mappers.JyrWxhwtjcxMapper;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.TjcxModel;
+import com.xt.js.gkaq.web.model.WxhwtjcxModel;
+import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.web.service.JyrTjcxService;
+import com.xt.js.gkaq.web.service.JyrWxhwtjcxService;
+
+@Service
+public class JyrWxhwyjcxServiceImpl extends BaseUUIDModelServiceImpl<WxhwtjcxModel> implements JyrWxhwtjcxService {
+	@Autowired
+	JyrWxhwtjcxMapper mapper;
+	
+	@Override
+	protected BaseMapper<WxhwtjcxModel> getMapper() {
+		return mapper;
+	}
+	@Override
+	public List<WxhwtjcxModel> selectByInfo(WxhwtjcxModel model) {
+		return mapper.selectByInfo(model);
+	}
+
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/BwVo.java

@@ -0,0 +1,322 @@
+package com.xt.js.gkaq.web.vo;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 泊位Model
+ * @author 李小虎
+ *
+ */
+public class BwVo extends BaseVo {
+	private String id;
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//经营人名称（id）
+	private Long mtmc;//码头名称(id)
+	private String bwmc;//泊位名称
+	private Long bwsx;//泊位属性
+	private Long bwszsx;//泊位所在水系
+	private Long fwlx;//服务类型
+	private Long tcnf;//投产年份
+	private Long jgxs;//结构型式
+	private Long sclx;//生产类型
+	private Long jgysnf;//竣工验收年份
+	private String qysjsh;//前沿设计水深
+	private String qysjss;//前沿实际水深
+	private String bwcd;//泊位长度
+	private String wxpbw;//危险品泊位
+	private String sjtgnl;//设计通过能力
+	private String sjkpnl;//设计靠泊能力(吨级)
+	private String nhwtgml;//年货物通过能力
+	private String nwxhwttl;//年危险货物吞吐量
+	private Long zyhbwfl;//专业化泊位分类
+	private String jd;//经度
+	private String wd;//纬度
+	private String sffz;//是否发证
+	private String bwyt;//泊位用途
+	private String zyrkfw;//作业认可范围
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordCode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String jtjgisdyidh;
+	private String hckpnl;//检查靠泊能力
+	private String zwbwyt;//泊位用途显示
+	private String smid;//地图id
+	private String bwdm;//
+	private Long jgxs2;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public Long getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(Long szgq) {
+		this.szgq = szgq;
+	}
+	public Long getQymc() {
+		return qymc;
+	}
+	public void setQymc(Long qymc) {
+		this.qymc = qymc;
+	}
+	public Long getMtmc() {
+		return mtmc;
+	}
+	public void setMtmc(Long mtmc) {
+		this.mtmc = mtmc;
+	}
+	public String getBwmc() {
+		return bwmc;
+	}
+	public void setBwmc(String bwmc) {
+		this.bwmc = bwmc;
+	}
+	public Long getBwsx() {
+		return bwsx;
+	}
+	public void setBwsx(Long bwsx) {
+		this.bwsx = bwsx;
+	}
+	public Long getBwszsx() {
+		return bwszsx;
+	}
+	public void setBwszsx(Long bwszsx) {
+		this.bwszsx = bwszsx;
+	}
+	public Long getFwlx() {
+		return fwlx;
+	}
+	public void setFwlx(Long fwlx) {
+		this.fwlx = fwlx;
+	}
+	public Long getTcnf() {
+		return tcnf;
+	}
+	public void setTcnf(Long tcnf) {
+		this.tcnf = tcnf;
+	}
+	public Long getJgxs() {
+		return jgxs;
+	}
+	public void setJgxs(Long jgxs) {
+		this.jgxs = jgxs;
+	}
+	public Long getSclx() {
+		return sclx;
+	}
+	public void setSclx(Long sclx) {
+		this.sclx = sclx;
+	}
+	public Long getJgysnf() {
+		return jgysnf;
+	}
+	public void setJgysnf(Long jgysnf) {
+		this.jgysnf = jgysnf;
+	}
+	public String getQysjsh() {
+		return qysjsh;
+	}
+	public void setQysjsh(String qysjsh) {
+		this.qysjsh = qysjsh;
+	}
+	public String getQysjss() {
+		return qysjss;
+	}
+	public void setQysjss(String qysjss) {
+		this.qysjss = qysjss;
+	}
+	public String getBwcd() {
+		return bwcd;
+	}
+	public void setBwcd(String bwcd) {
+		this.bwcd = bwcd;
+	}
+	public String getWxpbw() {
+		return wxpbw;
+	}
+	public void setWxpbw(String wxpbw) {
+		this.wxpbw = wxpbw;
+	}
+	public String getSjtgnl() {
+		return sjtgnl;
+	}
+	public void setSjtgnl(String sjtgnl) {
+		this.sjtgnl = sjtgnl;
+	}
+	public String getSjkpnl() {
+		return sjkpnl;
+	}
+	public void setSjkpnl(String sjkpnl) {
+		this.sjkpnl = sjkpnl;
+	}
+	public String getNhwtgml() {
+		return nhwtgml;
+	}
+	public void setNhwtgml(String nhwtgml) {
+		this.nhwtgml = nhwtgml;
+	}
+	public String getNwxhwttl() {
+		return nwxhwttl;
+	}
+	public void setNwxhwttl(String nwxhwttl) {
+		this.nwxhwttl = nwxhwttl;
+	}
+	public Long getZyhbwfl() {
+		return zyhbwfl;
+	}
+	public void setZyhbwfl(Long zyhbwfl) {
+		this.zyhbwfl = zyhbwfl;
+	}
+	public String getJd() {
+		return jd;
+	}
+	public void setJd(String jd) {
+		this.jd = jd;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getSffz() {
+		return sffz;
+	}
+	public void setSffz(String sffz) {
+		this.sffz = sffz;
+	}
+	public String getBwyt() {
+		return bwyt;
+	}
+	public void setBwyt(String bwyt) {
+		this.bwyt = bwyt;
+	}
+	public String getZyrkfw() {
+		return zyrkfw;
+	}
+	public void setZyrkfw(String zyrkfw) {
+		this.zyrkfw = zyrkfw;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordCode() {
+		return recordCode;
+	}
+	public void setRecordCode(String recordCode) {
+		this.recordCode = recordCode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getJtjgisdyidh() {
+		return jtjgisdyidh;
+	}
+	public void setJtjgisdyidh(String jtjgisdyidh) {
+		this.jtjgisdyidh = jtjgisdyidh;
+	}
+	public String getHckpnl() {
+		return hckpnl;
+	}
+	public void setHckpnl(String hckpnl) {
+		this.hckpnl = hckpnl;
+	}
+	public String getZwbwyt() {
+		return zwbwyt;
+	}
+	public void setZwbwyt(String zwbwyt) {
+		this.zwbwyt = zwbwyt;
+	}
+	public String getSmid() {
+		return smid;
+	}
+	public void setSmid(String smid) {
+		this.smid = smid;
+	}
+	public String getBwdm() {
+		return bwdm;
+	}
+	public void setBwdm(String bwdm) {
+		this.bwdm = bwdm;
+	}
+	public Long getJgxs2() {
+		return jgxs2;
+	}
+	public void setJgxs2(Long jgxs2) {
+		this.jgxs2 = jgxs2;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/CkVo.java

@@ -0,0 +1,231 @@
+package com.xt.js.gkaq.web.vo;
+
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 仓库Model
+ * @author 李小虎
+ *
+ */
+public class CkVo extends BaseVo {
+
+	private String id;
+	private Long ssjyr;//所属经营人
+	private String szd;//所在地
+	private Long gq;//港区
+	private Long mt;//码头
+	private String qymc;//企业名称
+	private Long ckmc;//仓库名称
+	private Long wxpck;//危险品仓库
+	private Long ckyt;//仓库用途
+	private Long ckgs;//仓库个数
+	private Long ythgcgrj;//液体化工储罐容积
+	private Long scyckmj;//生产用仓库面积
+	private Long wxpckmj;//危险品仓库面积
+	private String scyckrj;//生产用仓库容积
+	private String ykrj;//油库容积
+	private String cpyrj;//成品油容积
+	private String gisid;//交通局GIS对应id号
+	private String jd;//经度
+	private String wd;//纬度
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String zwckyt;//仓库用途显示
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	
+	public Long getSsjyr() {
+		return ssjyr;
+	}
+	public void setSsjyr(Long ssjyr) {
+		this.ssjyr = ssjyr;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public Long getGq() {
+		return gq;
+	}
+	public void setGq(Long gq) {
+		this.gq = gq;
+	}
+	public Long getMt() {
+		return mt;
+	}
+	public void setMt(Long mt) {
+		this.mt = mt;
+	}
+	public String getQymc() {
+		return qymc;
+	}
+	public void setQymc(String qymc) {
+		this.qymc = qymc;
+	}
+	public Long getCkmc() {
+		return ckmc;
+	}
+	public void setCkmc(Long ckmc) {
+		this.ckmc = ckmc;
+	}
+	public Long getWxpck() {
+		return wxpck;
+	}
+	public void setWxpck(Long wxpck) {
+		this.wxpck = wxpck;
+	}
+	public Long getCkyt() {
+		return ckyt;
+	}
+	public void setCkyt(Long ckyt) {
+		this.ckyt = ckyt;
+	}
+	public Long getCkgs() {
+		return ckgs;
+	}
+	public void setCkgs(Long ckgs) {
+		this.ckgs = ckgs;
+	}
+	public Long getYthgcgrj() {
+		return ythgcgrj;
+	}
+	public void setYthgcgrj(Long ythgcgrj) {
+		this.ythgcgrj = ythgcgrj;
+	}
+	public Long getScyckmj() {
+		return scyckmj;
+	}
+	public void setScyckmj(Long scyckmj) {
+		this.scyckmj = scyckmj;
+	}
+	public Long getWxpckmj() {
+		return wxpckmj;
+	}
+	public void setWxpckmj(Long wxpckmj) {
+		this.wxpckmj = wxpckmj;
+	}
+	public String getScyckrj() {
+		return scyckrj;
+	}
+	public void setScyckrj(String scyckrj) {
+		this.scyckrj = scyckrj;
+	}
+	public String getYkrj() {
+		return ykrj;
+	}
+	public void setYkrj(String ykrj) {
+		this.ykrj = ykrj;
+	}
+	public String getCpyrj() {
+		return cpyrj;
+	}
+	public void setCpyrj(String cpyrj) {
+		this.cpyrj = cpyrj;
+	}
+	public String getGisid() {
+		return gisid;
+	}
+	public void setGisid(String gisid) {
+		this.gisid = gisid;
+	}
+	public String getJd() {
+		return jd;
+	}
+	public void setJd(String jd) {
+		this.jd = jd;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getZwckyt() {
+		return zwckyt;
+	}
+	public void setZwckyt(String zwckyt) {
+		this.zwckyt = zwckyt;
+	}
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/DcVo.java

@@ -0,0 +1,216 @@
+package com.xt.js.gkaq.web.vo;
+
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 仓库Model
+ * @author 李小虎
+ *
+ */
+public class DcVo extends BaseVo {
+	private String id;
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//企业名称
+	private String mtmc;//码头名称
+	private String dcmc;//堆场名称
+	private String scydcyt;//堆场用途
+	private String dczmj;//堆场总面积
+	private Long dczrl;//堆场总容量
+	private Long jzxmj;//集装箱堆场面积
+	private Long jzxdcdcnl;//集装箱堆场堆存面积
+	private Long wxpxdcmj;//危险品堆场面积
+	private Long wxpxdcdcnl;//危险品堆场堆存能力
+	private String wxpdc;//是否是危险品堆场
+	
+	private String jd;//经度
+	private String wd;//纬度
+	private String jtjgisdyidh;//交通局GIS对应id号
+	
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String zwdcyt;//堆场用途显示
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public Long getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(Long szgq) {
+		this.szgq = szgq;
+	}
+	public Long getQymc() {
+		return qymc;
+	}
+	public void setQymc(Long qymc) {
+		this.qymc = qymc;
+	}
+	public String getMtmc() {
+		return mtmc;
+	}
+	public void setMtmc(String mtmc) {
+		this.mtmc = mtmc;
+	}
+	public String getDcmc() {
+		return dcmc;
+	}
+	public void setDcmc(String dcmc) {
+		this.dcmc = dcmc;
+	}
+	public String getScydcyt() {
+		return scydcyt;
+	}
+	public void setScydcyt(String scydcyt) {
+		this.scydcyt = scydcyt;
+	}
+	public String getDczmj() {
+		return dczmj;
+	}
+	public void setDczmj(String dczmj) {
+		this.dczmj = dczmj;
+	}
+	public Long getDczrl() {
+		return dczrl;
+	}
+	public void setDczrl(Long dczrl) {
+		this.dczrl = dczrl;
+	}
+	public Long getJzxmj() {
+		return jzxmj;
+	}
+	public void setJzxmj(Long jzxmj) {
+		this.jzxmj = jzxmj;
+	}
+	public Long getJzxdcdcnl() {
+		return jzxdcdcnl;
+	}
+	public void setJzxdcdcnl(Long jzxdcdcnl) {
+		this.jzxdcdcnl = jzxdcdcnl;
+	}
+	public Long getWxpxdcmj() {
+		return wxpxdcmj;
+	}
+	public void setWxpxdcmj(Long wxpxdcmj) {
+		this.wxpxdcmj = wxpxdcmj;
+	}
+	public Long getWxpxdcdcnl() {
+		return wxpxdcdcnl;
+	}
+	public void setWxpxdcdcnl(Long wxpxdcdcnl) {
+		this.wxpxdcdcnl = wxpxdcdcnl;
+	}
+	public String getWxpdc() {
+		return wxpdc;
+	}
+	public void setWxpdc(String wxpdc) {
+		this.wxpdc = wxpdc;
+	}
+	public String getJd() {
+		return jd;
+	}
+	public void setJd(String jd) {
+		this.jd = jd;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getJtjgisdyidh() {
+		return jtjgisdyidh;
+	}
+	public void setJtjgisdyidh(String jtjgisdyidh) {
+		this.jtjgisdyidh = jtjgisdyidh;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getZwdcyt() {
+		return zwdcyt;
+	}
+	public void setZwdcyt(String zwdcyt) {
+		this.zwdcyt = zwdcyt;
+	}
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/TjcxVo.java

@@ -0,0 +1,128 @@
+package com.xt.js.gkaq.web.vo;
+
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 统计查询的Model
+ * @author 李小虎
+ *
+ */
+public class TjcxVo extends BaseVo {
+
+	private String gkjyr;
+	private String syhgmt;
+	private String wxhw;
+	private String ph;
+	private String jzx;
+	private String wd;
+	private String wdyx;
+	private String qd;
+	private String qdyx;
+	private String sl;
+	private String wxsl;
+	private String rj;
+	
+	private String szd;
+	private String qylx;
+	private String qstime;
+	private String jstime;
+	
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getQylx() {
+		return qylx;
+	}
+	public void setQylx(String qylx) {
+		this.qylx = qylx;
+	}
+	public String getQstime() {
+		return qstime;
+	}
+	public void setQstime(String qstime) {
+		this.qstime = qstime;
+	}
+	public String getJstime() {
+		return jstime;
+	}
+	public void setJstime(String jstime) {
+		this.jstime = jstime;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getSyhgmt() {
+		return syhgmt;
+	}
+	public void setSyhgmt(String syhgmt) {
+		this.syhgmt = syhgmt;
+	}
+	public String getWxhw() {
+		return wxhw;
+	}
+	public void setWxhw(String wxhw) {
+		this.wxhw = wxhw;
+	}
+	public String getPh() {
+		return ph;
+	}
+	public void setPh(String ph) {
+		this.ph = ph;
+	}
+	public String getJzx() {
+		return jzx;
+	}
+	public void setJzx(String jzx) {
+		this.jzx = jzx;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getWdyx() {
+		return wdyx;
+	}
+	public void setWdyx(String wdyx) {
+		this.wdyx = wdyx;
+	}
+	public String getQd() {
+		return qd;
+	}
+	public void setQd(String qd) {
+		this.qd = qd;
+	}
+	public String getQdyx() {
+		return qdyx;
+	}
+	public void setQdyx(String qdyx) {
+		this.qdyx = qdyx;
+	}
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public String getWxsl() {
+		return wxsl;
+	}
+	public void setWxsl(String wxsl) {
+		this.wxsl = wxsl;
+	}
+	public String getRj() {
+		return rj;
+	}
+	public void setRj(String rj) {
+		this.rj = rj;
+	}
+	
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/WxhwtjcxVo.java

@@ -0,0 +1,143 @@
+package com.xt.js.gkaq.web.vo;
+
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 危险货物统计查询的Model
+ * @author 李小虎
+ *
+ */
+public class WxhwtjcxVo extends BaseVo {
+
+	private String bz;
+	private String gkjyr;
+	private String byzd1;
+	private String bwmc;
+	private String wd;
+	private String qd;
+	private String jzxttl;
+	private String ttl;
+	private String gqmc;
+	private String gm;
+	private String sffz;
+	private String hz;
+	private String qylx;
+	
+	
+	private String szd;
+	private String kssj;
+	private String jssj;
+	private String byzd2;
+	private String byzd3;
+	
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getBwmc() {
+		return bwmc;
+	}
+	public void setBwmc(String bwmc) {
+		this.bwmc = bwmc;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getQd() {
+		return qd;
+	}
+	public void setQd(String qd) {
+		this.qd = qd;
+	}
+	public String getJzxttl() {
+		return jzxttl;
+	}
+	public void setJzxttl(String jzxttl) {
+		this.jzxttl = jzxttl;
+	}
+	public String getTtl() {
+		return ttl;
+	}
+	public void setTtl(String ttl) {
+		this.ttl = ttl;
+	}
+	public String getGqmc() {
+		return gqmc;
+	}
+	public void setGqmc(String gqmc) {
+		this.gqmc = gqmc;
+	}
+	public String getGm() {
+		return gm;
+	}
+	public void setGm(String gm) {
+		this.gm = gm;
+	}
+	public String getSffz() {
+		return sffz;
+	}
+	public void setSffz(String sffz) {
+		this.sffz = sffz;
+	}
+	public String getHz() {
+		return hz;
+	}
+	public void setHz(String hz) {
+		this.hz = hz;
+	}
+	public String getQylx() {
+		return qylx;
+	}
+	public void setQylx(String qylx) {
+		this.qylx = qylx;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getKssj() {
+		return kssj;
+	}
+	public void setKssj(String kssj) {
+		this.kssj = kssj;
+	}
+	public String getJssj() {
+		return jssj;
+	}
+	public void setJssj(String jssj) {
+		this.jssj = jssj;
+	}
+	
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/resources/com/xt/js/gkaq/web/mappers/BwModelMapper.xml

@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.web.mappers.BwModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.BwModel" >
+    <id column="ID" property="id" jdbcType="DECIMAL" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="SZGQ" property="szgq" jdbcType="DECIMAL" />
+    <result column="QYMC" property="qymc" jdbcType="DECIMAL" />
+    <result column="MTMC" property="mtmc" jdbcType="DECIMAL" />
+    <result column="BWMC" property="bwmc" jdbcType="VARCHAR" />
+    <result column="BWSX" property="bwsx" jdbcType="DECIMAL" />
+    <result column="BWSZSX" property="bwszsx" jdbcType="DECIMAL" />
+    <result column="FWLX" property="fwlx" jdbcType="DECIMAL" />
+    <result column="TCNF" property="tcnf" jdbcType="DECIMAL" />
+    <result column="JGXS" property="jgxs" jdbcType="DECIMAL" />
+    <result column="SCLX" property="sclx" jdbcType="DECIMAL" />
+    <result column="JGYSNF" property="jgysnf" jdbcType="DECIMAL" />
+    <result column="QYSJSH" property="qysjsh" jdbcType="VARCHAR" />
+    <result column="QYSJSS" property="qysjss" jdbcType="VARCHAR" />
+    <result column="BWCD" property="bwcd" jdbcType="VARCHAR" />
+    <result column="WXPBW" property="wxpbw" jdbcType="VARCHAR" />
+    <result column="SJTGNL" property="sjtgnl" jdbcType="VARCHAR" />
+    <result column="SJKPNL" property="sjkpnl" jdbcType="VARCHAR" />
+    <result column="NHWTGML" property="nhwtgml" jdbcType="VARCHAR" />
+    <result column="NWXHWTTL" property="nwxhwttl" jdbcType="VARCHAR" />
+    <result column="ZYHBWFL" property="zyhbwfl" jdbcType="DECIMAL" />
+    <result column="JD" property="jd" jdbcType="VARCHAR" />
+    <result column="WD" property="wd" jdbcType="VARCHAR" />
+    <result column="SFFZ" property="sffz" jdbcType="VARCHAR" />
+    <result column="BWYT" property="bwyt" jdbcType="VARCHAR" />
+    <result column="ZYRKFW" property="zyrkfw" jdbcType="VARCHAR" />
+    <result column="JTJGISDYIDH" property="jtjgisdyidh" jdbcType="VARCHAR" />
+    <result column="HCKPNL" property="hckpnl" jdbcType="VARCHAR" />
+    <result column="ZWBWYT" property="zwbwyt" jdbcType="VARCHAR" />
+    <result column="SMID" property="smid" jdbcType="VARCHAR" />
+    <result column="BWDM" property="bwdm" jdbcType="VARCHAR" />
+    <result column="JGXS2" property="jgxs2" jdbcType="DECIMAL" />
+    <result column="SFTB" property="sftb" jdbcType="CHAR" />
+    <result column="TBZT" property="TBZT" jdbcType="CHAR" />
+    <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
+    <result column="QYLB" property="qylb" jdbcType="CHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
+    <result column="RECORD_CODE" property="recordCode" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
+    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
+    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
+    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
+  	<result column="RECORD_STATUS" property="state" jdbcType="DECIMAL" />
+    <result column="ADD_DATE" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_DATE" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="ADD_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <resultMap id="BaseResultInfoMap" type="com.xt.js.gkaq.web.model.BwInfoModel" >
+    <id column="ID" property="id" jdbcType="DECIMAL" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="SZGQ" property="szgq" jdbcType="DECIMAL" />
+    <result column="QYMC" property="qymc" jdbcType="DECIMAL" />
+    <result column="MTMC" property="mtmc" jdbcType="DECIMAL" />
+    <result column="MTNAME" property="mtName" jdbcType="VARCHAR" />
+    <result column="BWMC" property="bwmc" jdbcType="VARCHAR" />
+    <result column="BWSX" property="bwsx" jdbcType="DECIMAL" />
+    <result column="BWSZSX" property="bwszsx" jdbcType="DECIMAL" />
+    <result column="FWLX" property="fwlx" jdbcType="DECIMAL" />
+    <result column="TCNF" property="tcnf" jdbcType="DECIMAL" />
+    <result column="JGXS" property="jgxs" jdbcType="DECIMAL" />
+    <result column="SCLX" property="sclx" jdbcType="DECIMAL" />
+    <result column="JGYSNF" property="jgysnf" jdbcType="DECIMAL" />
+    <result column="QYSJSH" property="qysjsh" jdbcType="VARCHAR" />
+    <result column="QYSJSS" property="qysjss" jdbcType="VARCHAR" />
+    <result column="BWCD" property="bwcd" jdbcType="VARCHAR" />
+    <result column="WXPBW" property="wxpbw" jdbcType="VARCHAR" />
+    <result column="SJTGNL" property="sjtgnl" jdbcType="VARCHAR" />
+    <result column="SJKPNL" property="sjkpnl" jdbcType="VARCHAR" />
+    <result column="NHWTGML" property="nhwtgml" jdbcType="VARCHAR" />
+    <result column="NWXHWTTL" property="nwxhwttl" jdbcType="VARCHAR" />
+    <result column="ZYHBWFL" property="zyhbwfl" jdbcType="DECIMAL" />
+    <result column="JD" property="jd" jdbcType="VARCHAR" />
+    <result column="WD" property="wd" jdbcType="VARCHAR" />
+    <result column="SFFZ" property="sffz" jdbcType="VARCHAR" />
+    <result column="BWYT" property="bwyt" jdbcType="VARCHAR" />
+    <result column="ZYRKFW" property="zyrkfw" jdbcType="VARCHAR" />
+    <result column="JTJGISDYIDH" property="jtjgisdyidh" jdbcType="VARCHAR" />
+    <result column="HCKPNL" property="hckpnl" jdbcType="VARCHAR" />
+    <result column="ZWBWYT" property="zwbwyt" jdbcType="VARCHAR" />
+    <result column="SMID" property="smid" jdbcType="VARCHAR" />
+    <result column="BWDM" property="bwdm" jdbcType="VARCHAR" />
+    <result column="JGXS2" property="jgxs2" jdbcType="DECIMAL" />
+    <result column="SFTB" property="sftb" jdbcType="CHAR" />
+    <result column="TBZT" property="TBZT" jdbcType="CHAR" />
+    <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
+    <result column="QYLB" property="qylb" jdbcType="CHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
+    <result column="RECORD_CODE" property="recordCode" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
+    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
+    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
+    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
+  	<result column="RECORD_STATUS" property="state" jdbcType="DECIMAL" />
+    <result column="ADD_DATE" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_DATE" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="ADD_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  
+  
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.dwxx.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="DECIMAL" />
+    <result column="GQMC" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    delete from AQ_BASIC_DWXX_BW
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.GqModel" >
+    insert into AQ_BASIC_DWXX_BW (ID,SZD,SZGQ,QYMC,MTMC,BWMC,BWSX,BWSZSX,FWLX,TCNF,JGXS,SCLX,JGYSNF,
+    							  QYSJSH,QYSJSS,BWCD,WXPBW,SJTGNL,SJKPNL,NHWTGML,NWXHWTTL,ZYHBWFL,
+    							  JD,WD,SFFZ,BWYT,ZYRKFW,
+    							  ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+    							  SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,
+    							  BYZD3,BYZD4,BYZD5,JTJGISDYIDH,HCKPNL,ZWBWYT,SMID,BWDM,JGXS2)
+    values (#{id,jdbcType=DECIMAL},
+    		#{szd,jdbcType=VARCHAR}, 
+     		#{szgq,jdbcType=DECIMAL},
+     		#{qymc,jdbcType=DECIMAL}, 
+     		#{mtmc,jdbcType=DECIMAL}, 
+     		#{bwmc,jdbcType=VARCHAR}, 
+     		#{bwsx,jdbcType=DECIMAL}, 
+     		#{bwszsx,jdbcType=DECIMAL}, 
+     		#{fwlx,jdbcType=DECIMAL}, 
+     		#{tcnf,jdbcType=DECIMAL}, 
+     		#{jgxs,jdbcType=DECIMAL}, 
+     		#{sclx,jdbcType=DECIMAL}, 
+     		#{jgysnf,jdbcType=DECIMAL}, 
+     		#{qysjsh,jdbcType=VARCHAR}, 
+     		#{qysjss,jdbcType=VARCHAR}, 
+     		#{bwcd,jdbcType=VARCHAR}, 
+     		#{wxpbw,jdbcType=VARCHAR}, 
+     		#{sjtgnl,jdbcType=VARCHAR}, 
+     		#{sjkpnl,jdbcType=VARCHAR}, 
+     		#{nhwtgml,jdbcType=VARCHAR}, 
+     		#{nwxhwttl,jdbcType=VARCHAR}, 
+     		#{zyhbwfl,jdbcType=DECIMAL}, 
+     		#{jd,jdbcType=VARCHAR}, 
+     		#{wd,jdbcType=VARCHAR},
+     		#{sffz,jdbcType=VARCHAR}, 
+     		#{bwyt,jdbcType=VARCHAR}, 
+     		#{zyrkfw,jdbcType=VARCHAR}, 
+     		#{createUser,jdbcType=VARCHAR}, 
+     		#{createTime,jdbcType=TIMESTAMP}, 
+     		#{updateUser,jdbcType=VARCHAR}, 
+     		#{updateTime,jdbcType=TIMESTAMP}, 
+     		#{state,jdbcType=DECIMAL},
+     		#{sftb,jdbcType=VARCHAR}, 
+     		#{tbzt,jdbcType=VARCHAR}, 
+     		#{tbdyid,jdbcType=DECIMAL}, 
+     		#{qylb,jdbcType=VARCHAR}, 
+     		#{ssqy,jdbcType=DECIMAL}, 
+     		#{recordCode,jdbcType=VARCHAR}, 
+     		#{byzd1,jdbcType=VARCHAR},
+     		#{byzd2,jdbcType=VARCHAR},
+     		#{byzd3,jdbcType=VARCHAR}, 
+     		#{byzd4,jdbcType=VARCHAR}, 
+     		#{byzd5,jdbcType=VARCHAR},
+     		#{jtjgisdyidh,jdbcType=VARCHAR}, 
+     		#{hckpnl,jdbcType=VARCHAR}, 
+     		#{zwbwyt,jdbcType=VARCHAR}, 
+     		#{smid,jdbcType=VARCHAR}, 
+     		#{bwdm,jdbcType=VARCHAR}, 
+     		#{jgxs2,jdbcType=DECIMAL}
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.GqModel" >
+    update AQ_BASIC_DWXX_BW
+    set SZD = #{szd,jdbcType=VARCHAR},
+      	SZGQ = #{szgq,jdbcType=DECIMAL},
+		QYMC = #{qymc,jdbcType=DECIMAL}, 
+		MTMC = #{mtmc,jdbcType=DECIMAL}, 
+		BWMC = #{bwmc,jdbcType=VARCHAR}, 
+		BWSX = #{bwsx,jdbcType=DECIMAL}, 
+		BWSZSX = #{bwszsx,jdbcType=DECIMAL}, 
+		FWLX = #{fwlx,jdbcType=DECIMAL}, 
+		TCNF = #{tcnf,jdbcType=DECIMAL}, 
+		JGXS = #{jgxs,jdbcType=DECIMAL}, 
+		SCLX = #{sclx,jdbcType=DECIMAL}, 
+		JGYSNF = #{jgysnf,jdbcType=DECIMAL}, 
+		QYSJSH = #{qysjsh,jdbcType=VARCHAR}, 
+		QYSJSS = #{qysjss,jdbcType=VARCHAR}, 
+		BWCD = #{bwcd,jdbcType=VARCHAR}, 
+		WXPBW = #{wxpbw,jdbcType=VARCHAR}, 
+		SJTGNL = #{sjtgnl,jdbcType=VARCHAR}, 
+		SJKPNL = #{sjkpnl,jdbcType=VARCHAR}, 
+		NHWTGML = #{nhwtgml,jdbcType=VARCHAR}, 
+		NWXHWTTL = #{nwxhwttl,jdbcType=VARCHAR}, 
+		ZYHBWFL = #{zyhbwfl,jdbcType=DECIMAL}, 
+		JD = #{jd,jdbcType=VARCHAR}, 
+		WD = #{wd,jdbcType=VARCHAR},
+		SFFZ = #{sffz,jdbcType=VARCHAR}, 
+		BWYT = #{bwyt,jdbcType=VARCHAR}, 
+		ZYRKFW = #{zyrkfw,jdbcType=VARCHAR}, 
+		ADD_USER = #{createUser,jdbcType=VARCHAR}, 
+		ADD_DATE = #{createTime,jdbcType=TIMESTAMP}, 
+		UPDATE_USER = #{updateUser,jdbcType=VARCHAR}, 
+		UPDATE_DATE = #{updateTime,jdbcType=TIMESTAMP}, 
+		RECORD_STATUS = #{state,jdbcType=DECIMAL},
+		SFTB = #{sftb,jdbcType=VARCHAR}, 
+		TBZT = #{tbzt,jdbcType=VARCHAR}, 
+		TBDYID = #{tbdyid,jdbcType=DECIMAL}, 
+		QYLB = #{qylb,jdbcType=VARCHAR}, 
+		SSQY = #{ssqy,jdbcType=DECIMAL}, 
+		RECORD_CODE = #{recordCode,jdbcType=VARCHAR}, 
+		BYZD1 = #{byzd1,jdbcType=VARCHAR},
+		BYZD2 = #{byzd2,jdbcType=VARCHAR},
+		BYZD3 = #{byzd3,jdbcType=VARCHAR}, 
+		BYZD4 = #{byzd4,jdbcType=VARCHAR}, 
+		BYZD5 = #{byzd5,jdbcType=VARCHAR},
+		JTJGISDYIDH = #{jtjgisdyidh,jdbcType=VARCHAR}, 
+		HCKPNL = #{hckpnl,jdbcType=VARCHAR}, 
+		ZWBWYT = #{zwbwyt,jdbcType=VARCHAR}, 
+		SMID = #{smid,jdbcType=VARCHAR}, 
+		BWDM = #{bwdm,jdbcType=VARCHAR}, 
+		JGXS2 = #{jgxs2,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+   SELECT ID,SZD,SZGQ,QYMC,MTMC,BWMC,BWSX,BWSZSX,FWLX,TCNF,JGXS,SCLX,JGYSNF,QYSJSH,QYSJSS,BWCD,
+   		  WXPBW,SJTGNL,SJKPNL,NHWTGML,NWXHWTTL,ZYHBWFL,JD,WD,SFFZ,BWYT,ZYRKFW,
+		  ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+		  SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+		  BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,JTJGISDYIDH,HCKPNL,ZWBWYT,SMID,BWDM,JGXS2
+	FROM
+		GKAQV2.AQ_BASIC_DWXX_BW
+	WHERE ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+     SELECT ID,SZD,SZGQ,QYMC,MTMC,BWMC,BWSX,BWSZSX,FWLX,TCNF,JGXS,SCLX,JGYSNF,QYSJSH,QYSJSS,BWCD,
+   		  WXPBW,SJTGNL,SJKPNL,NHWTGML,NWXHWTTL,ZYHBWFL,JD,WD,SFFZ,BWYT,ZYRKFW,
+		  ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+		  SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+		  BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,JTJGISDYIDH,HCKPNL,ZWBWYT,SMID,BWDM,JGXS2
+	FROM
+		GKAQV2.AQ_BASIC_DWXX_BW
+  </select>
+  <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.GqModel">
+	  SELECT B.ID, B.SZD, B.SZGQ, B.QYMC, B.MTMC, M.MTMC AS MTNAME, B.BWMC, B.BWSX, B.BWSZSX, B.FWLX, B.TCNF, B.JGXS, B.SCLX, B.JGYSNF,
+			 B.QYSJSH, B.QYSJSS, B.BWCD, B.WXPBW, B.SJTGNL, B.SJKPNL, B.NHWTGML, B.NWXHWTTL, B.ZYHBWFL, B.JD, B.WD, B.SFFZ, B.BWYT,
+			 B.ZYRKFW, B.ADD_USER, B.ADD_DATE, B.UPDATE_USER, B.UPDATE_DATE, B.RECORD_STATUS, B.SFTB, B.TBZT, B.TBDYID, B.QYLB, B.SSQY,
+			 B.RECORD_CODE, B.BYZD1, B.BYZD2, B.BYZD3, B.BYZD4, B.BYZD5, B.JTJGISDYIDH, B.HCKPNL, B.ZWBWYT, B.SMID, B.BWDM, B.JGXS2
+	  FROM GKAQV2.AQ_BASIC_DWXX_BW B
+	  LEFT JOIN T_YJPT_GQ_MT M ON B.MTMC = M."ID"
+	<where>
+			B.RECORD_STATUS != '9'
+			<if test="id != null and id != '' ">
+				AND B.ID = #{id,jdbcType=DECIMAL}
+			</if>
+			<if test="qymc != null and qymc != '' ">
+				AND B.QYMC = #{qymc,jdbcType=DECIMAL}
+			</if>
+			
+	</where>
+  </select>
+ <!-- <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.GqModel">
+  	SELECT ID, SZD, SSGK, GQMC, GQSZSYLX, GQMJ, LYMJ, SYFW, SYMJ, GQGHMJ, GHLYMJ, FGYSCYDGHMJ, GHSYMJ, 
+   	 GQZRAXCD, GYMTAXCD, GQGKAXCD,GKSSYSYAXCD, GQDMBDZDZ, BZ, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE, 
+   	 RECORD_STATUS, SFTB, TBZT,TBDYID, QYLB, SSQY, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5, GISID
+	FROM
+		GKAQV2.T_YJPT_GQ
+	<where>
+			<if test="szd != null and szd != '' ">
+				SZD = #{szd,jdbcType=VARCHAR}
+			</if>
+			<if test="ssgk !=null and ssgk != '' ">
+				AND SSGK = #{ssgk,jdbcType=DECIMAL} 
+			</if>
+			<if test="gqmc != null and gqmc != '' ">
+				AND GQMC = #{gqmc,jdbcType=VARCHAR}
+			</if>
+		</where>
+  </select> -->
+  
+</mapper>

gkaqv2/trunk/modules/web/src/main/resources/com/xt/js/gkaq/web/mappers/CkModelMapper.xml

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.web.mappers.CkModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.CkModel" >
+    <id column="ID" property="id" jdbcType="DECIMAL" />
+    <result column="SSJYR" property="ssjyr" jdbcType="DECIMAL" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="GQ" property="gq" jdbcType="DECIMAL" />
+    <result column="MT" property="mt" jdbcType="DECIMAL" />
+    
+    <result column="QYMC" property="qymc" jdbcType="VARCHAR" />
+    <result column="CKMC" property="ckmc" jdbcType="VARCHAR" />
+    <result column="WXPCK" property="wxpck" jdbcType="VARCHAR" />
+    <result column="CKYT" property="ckyt" jdbcType="VARCHAR" />
+    
+    <result column="CKGS" property="ckgs" jdbcType="DECIMAL" />
+    <result column="YTHGCGRJ" property="ythgcgrj" jdbcType="DECIMAL" />
+    <result column="SCYCKMJ" property="scyckmj" jdbcType="DECIMAL" />
+    <result column="WXPCKMJ" property="wxpckmj" jdbcType="DECIMAL" />
+    <result column="SCYCKRJ" property="scyckrj" jdbcType="DECIMAL" />
+    <result column="YKRJ" property="ykrj" jdbcType="DECIMAL" />
+    <result column="CPYRJ" property="cpyrj" jdbcType="DECIMAL" />
+    <result column="GISID" property="gisid" jdbcType="DECIMAL" />
+    
+    <result column="JD" property="jd" jdbcType="VARCHAR" />
+    <result column="WD" property="wd" jdbcType="VARCHAR" />
+    <result column="ZWCKYT" property="zwckyt" jdbcType="VARCHAR" />
+    
+    <result column="SFTB" property="sftb" jdbcType="CHAR" />
+    <result column="TBZT" property="TBZT" jdbcType="CHAR" />
+    <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
+    <result column="QYLB" property="qylb" jdbcType="CHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
+    <result column="RECORD_CODE" property="recordcode" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
+    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
+    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
+    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
+  	<result column="RECORD_STATUS" property="state" jdbcType="DECIMAL" />
+    <result column="ADD_DATE" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_DATE" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="ADD_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.dwxx.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="DECIMAL" />
+    <result column="GQMC" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    delete from AQ_BASIC_DWXX_CK
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.CkModel" >
+    insert into AQ_BASIC_DWXX_CK (ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+									SCYCKMJ,WXPCKMJ,SCYCKRJ,YKRJ,CPYRJ,GISID,JD,WD,
+									ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+									SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+									BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT)
+    values (#{id,jdbcType=DECIMAL},
+    		#{ssjyr,jdbcType=DECIMAL},
+    		#{szd,jdbcType=VARCHAR}, 
+     		#{gq,jdbcType=DECIMAL}, 
+     		#{mt,jdbcType=DECIMAL}, 
+     		#{qymc,jdbcType=VARCHAR}, 
+     		#{ckmc,jdbcType=DECIMAL}, 
+     		#{wxpck,jdbcType=DECIMAL}, 
+     		#{ckyt,jdbcType=DECIMAL}, 
+     		#{ckgs,jdbcType=DECIMAL}, 
+     		#{ythgcgrj,jdbcType=DECIMAL}, 
+     		#{scyckmj,jdbcType=DECIMAL}, 
+     		#{wxpckmj,jdbcType=DECIMAL}, 
+     		#{scyckrj,jdbcType=VARCHAR}, 
+     		#{ykrj,jdbcType=VARCHAR}, 
+     		#{cpyrj,jdbcType=VARCHAR}, 
+     		#{gisid,jdbcType=VARCHAR}, 
+     		#{jd,jdbcType=VARCHAR}, 
+     		#{wd,jdbcType=VARCHAR}, 
+     		
+     		#{createUser,jdbcType=VARCHAR}, 
+     		#{createTime,jdbcType=TIMESTAMP}, 
+     		#{updateUser,jdbcType=VARCHAR}, 
+     		#{updateTime,jdbcType=TIMESTAMP}, 
+     		#{state,jdbcType=DECIMAL},
+     		#{sftb,jdbcType=VARCHAR}, 
+     		#{tbzt,jdbcType=VARCHAR}, 
+     		#{tbdyid,jdbcType=DECIMAL}, 
+     		#{qylb,jdbcType=VARCHAR}, 
+     		#{ssqy,jdbcType=DECIMAL}, 
+     		#{recordcode,jdbcType=VARCHAR}, 
+     		#{byzd1,jdbcType=VARCHAR},
+     		#{byzd2,jdbcType=VARCHAR},
+     		#{byzd3,jdbcType=VARCHAR}, 
+     		#{byzd4,jdbcType=VARCHAR}, 
+     		#{byzd5,jdbcType=VARCHAR},
+     		#{zwckyt,jdbcType=VARCHAR}, 
+     	
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.CkModel" >
+    update AQ_BASIC_DWXX_CK
+    set SSJYR = #{ssjyr,jdbcType=DECIMAL},
+    	SZD = #{szd,jdbcType=VARCHAR}, 
+      	GQ = #{gq,jdbcType=DECIMAL}, 
+		MT = #{mt,jdbcType=DECIMAL}, 
+		QYMC = #{qymc,jdbcType=VARCHAR}, 
+		CKMC = #{ckmc,jdbcType=DECIMAL}, 
+		WXPCK = #{wxpck,jdbcType=DECIMAL}, 
+		CKYT = #{ckyt,jdbcType=DECIMAL}, 
+		CKGS = #{ckgs,jdbcType=DECIMAL}, 
+		YTHGCGRJ = #{ythgcgrj,jdbcType=DECIMAL}, 
+		SCYCKMJ = #{scyckmj,jdbcType=DECIMAL}, 
+		WXPCKMJ = #{wxpckmj,jdbcType=DECIMAL}, 
+		SCYCKRJ = #{scyckrj,jdbcType=VARCHAR}, 
+		YKRJ = #{ykrj,jdbcType=VARCHAR}, 
+		CPYRJ = #{cpyrj,jdbcType=VARCHAR}, 
+		GISID = #{gisid,jdbcType=VARCHAR}, 
+		JD = #{jd,jdbcType=VARCHAR}, 
+		WD = #{wd,jdbcType=VARCHAR}, 
+		
+		ADD_USER = #{createUser,jdbcType=VARCHAR}, 
+		ADD_DATE = #{createTime,jdbcType=TIMESTAMP}, 
+		UPDATE_USER = #{updateUser,jdbcType=VARCHAR}, 
+		UPDATE_DATE = #{updateTime,jdbcType=TIMESTAMP}, 
+		RECORD_STATUS = #{state,jdbcType=DECIMAL},
+		SFTB = #{sftb,jdbcType=VARCHAR}, 
+		TBZT = #{tbzt,jdbcType=VARCHAR}, 
+		TBDYID = #{tbdyid,jdbcType=DECIMAL}, 
+		QYLB = #{qylb,jdbcType=VARCHAR}, 
+		SSQY = #{ssqy,jdbcType=DECIMAL}, 
+		RECORD_CODE = #{recordcode,jdbcType=VARCHAR}, 
+		BYZD1 = #{byzd1,jdbcType=VARCHAR},
+		BYZD2 = #{byzd2,jdbcType=VARCHAR},
+		BYZD3 = #{byzd3,jdbcType=VARCHAR}, 
+		BYZD4 = #{byzd4,jdbcType=VARCHAR}, 
+		BYZD5 = #{byzd5,jdbcType=VARCHAR},
+		ZWCKYT = #{zwckyt,jdbcType=VARCHAR}, 
+	
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+   SELECT 
+		ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+		SCYCKMJ,WXPCKMJ,SCYCKRJ,YKRJ,CPYRJ,GISID,JD,WD,
+		ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+		SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT
+	FROM
+		AQ_BASIC_DWXX_CK
+	WHERE ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+     SELECT 
+		ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+		SCYCKMJ,WXPCKMJ,SCYCKRJ,YKRJ,CPYRJ,GISID,JD,WD,
+		ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+		SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT
+	FROM
+		AQ_BASIC_DWXX_CK
+  </select>
+  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.CkModel">
+	 SELECT 
+		ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+		SCYCKMJ,WXPCKMJ,SCYCKRJ,YKRJ,CPYRJ,GISID,JD,WD,
+		ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+		SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT
+	FROM
+		AQ_BASIC_DWXX_CK
+	<where>
+			RECORD_STATUS != '9'
+			<if test="id != null and id != '' ">
+				AND ID = #{id,jdbcType=DECIMAL}
+			</if>
+			<if test="ssjyr != null and ssjyr != '' ">
+				AND SSJYR = #{ssjyr,jdbcType=DECIMAL}
+			</if>
+			
+	</where>
+  </select>
+ <!-- <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.GqModel">
+  	SELECT ID, SZD, SSGK, GQMC, GQSZSYLX, GQMJ, LYMJ, SYFW, SYMJ, GQGHMJ, GHLYMJ, FGYSCYDGHMJ, GHSYMJ, 
+   	 GQZRAXCD, GYMTAXCD, GQGKAXCD,GKSSYSYAXCD, GQDMBDZDZ, BZ, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE, 
+   	 RECORD_STATUS, SFTB, TBZT,TBDYID, QYLB, SSQY, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5, GISID
+	FROM
+		GKAQV2.T_YJPT_GQ
+	<where>
+			<if test="szd != null and szd != '' ">
+				SZD = #{szd,jdbcType=VARCHAR}
+			</if>
+			<if test="ssgk !=null and ssgk != '' ">
+				AND SSGK = #{ssgk,jdbcType=DECIMAL} 
+			</if>
+			<if test="gqmc != null and gqmc != '' ">
+				AND GQMC = #{gqmc,jdbcType=VARCHAR}
+			</if>
+		</where>
+  </select> -->
+  
+</mapper>

gkaqv2/trunk/modules/web/src/main/resources/com/xt/js/gkaq/web/mappers/DcModelMapper.xml

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.web.mappers.DcModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.DcModel" >
+    <id column="ID" property="id" jdbcType="DECIMAL" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="SZGQ" property="szgq" jdbcType="DECIMAL" />
+    <result column="QYMC" property="qymc" jdbcType="DECIMAL" />
+    <result column="MTMC" property="mtmc" jdbcType="DECIMAL" />
+    <result column="DCMC" property="dcmc" jdbcType="VARCHAR" />
+    <result column="SCYDCYT" property="scydcyt" jdbcType="VARCHAR" />
+    <result column="DCZMJ" property="dczmj" jdbcType="DECIMAL" />
+    <result column="DCZRL" property="dczrl" jdbcType="DECIMAL" />
+    <result column="JZXMJ" property="jzxmj" jdbcType="DECIMAL" />
+    <result column="JZXDCDCNL" property="jzxdcdcnl" jdbcType="DECIMAL" />
+    <result column="WXPXDCMJ" property="wxpxdcmj" jdbcType="DECIMAL" />
+    <result column="WXPXDCDCNL" property="wxpxdcdcnl" jdbcType="DECIMAL" />
+    <result column="JD" property="jd" jdbcType="VARCHAR" />
+    <result column="WD" property="wd" jdbcType="VARCHAR" />
+    <result column="JTJGISDYIDH" property="jtjgisdyidh" jdbcType="VARCHAR" />
+    <result column="ZWDCYT" property="zwdcyt" jdbcType="VARCHAR" />
+    <result column="WXPDC" property="wxpdc" jdbcType="VARCHAR" />
+    
+    <result column="SFTB" property="sftb" jdbcType="CHAR" />
+    <result column="TBZT" property="tbzt" jdbcType="CHAR" />
+    <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
+    <result column="QYLB" property="qylb" jdbcType="CHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
+    <result column="RECORD_CODE" property="recordcode" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
+    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
+    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
+    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
+  	<result column="RECORD_STATUS" property="state" jdbcType="DECIMAL" />
+    <result column="ADD_DATE" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_DATE" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="ADD_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.dwxx.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="DECIMAL" />
+    <result column="GQMC" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    delete from AQ_BASIC_DWXX_DC
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.DcModel" >
+    insert into AQ_BASIC_DWXX_DC (ID,SZD,SZGQ,QYMC,MTMC,DCMC,SCYDCYT,DCZMJ,DCZRL,JZXMJ,JZXDCDCNL,WXPXDCMJ,WXPXDCDCNL,JD,WD,JTJGISDYIDH,
+								  ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+								  BYZD1,BYZD2,BYZD3,BYZD4,WXPDC,BYZD5,ZWDCYT)
+    values (#{id,jdbcType=DECIMAL},
+    		#{szd,jdbcType=VARCHAR}, 
+     		#{szgq,jdbcType=VARCHAR}, 
+     		#{qymc,jdbcType=DECIMAL}, 
+     		#{mtmc,jdbcType=DECIMAL}, 
+     		#{dcmc,jdbcType=DECIMAL}, 
+     		#{scydcyt,jdbcType=DECIMAL}, 
+     		#{dczmj,jdbcType=DECIMAL}, 
+     		#{dczrl,jdbcType=DECIMAL}, 
+     		#{jzxmj,jdbcType=DECIMAL}, 
+     		#{jzxdcdcnl,jdbcType=VARCHAR}, 
+     		#{wxpxdcmj,jdbcType=VARCHAR}, 
+     		#{wxpxdcdcnl,jdbcType=VARCHAR}, 
+     		
+     		#{jd,jdbcType=VARCHAR}, 
+     		#{wd,jdbcType=VARCHAR}, 
+     		#{jtjgisdyidh,jdbcType=VARCHAR}, 
+     		
+     		#{createUser,jdbcType=VARCHAR}, 
+     		#{createTime,jdbcType=TIMESTAMP}, 
+     		#{updateUser,jdbcType=VARCHAR}, 
+     		#{updateTime,jdbcType=TIMESTAMP}, 
+     		#{state,jdbcType=DECIMAL},
+     		#{sftb,jdbcType=VARCHAR}, 
+     		#{tbzt,jdbcType=VARCHAR}, 
+     		#{tbdyid,jdbcType=DECIMAL}, 
+     		#{qylb,jdbcType=VARCHAR}, 
+     		#{ssqy,jdbcType=DECIMAL}, 
+     		#{recordcode,jdbcType=VARCHAR}, 
+     		#{byzd1,jdbcType=VARCHAR},
+     		#{byzd2,jdbcType=VARCHAR},
+     		#{byzd3,jdbcType=VARCHAR}, 
+     		#{byzd4,jdbcType=VARCHAR}, 
+     		#{wxpdc,jdbcType=VARCHAR},
+     		#{byzd5,jdbcType=VARCHAR},
+     		#{zwdcyt,jdbcType=VARCHAR}
+     	
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.DcModel" >
+    update AQ_BASIC_DWXX_DC
+    set SZD = #{szd,jdbcType=VARCHAR}, 
+		 SZGQ = #{szgq,jdbcType=VARCHAR}, 
+		 QYMC = #{qymc,jdbcType=DECIMAL}, 
+		 MTMC = #{mtmc,jdbcType=DECIMAL}, 
+		 DCMC = #{dcmc,jdbcType=DECIMAL}, 
+		 SCYDCYT = #{scydcyt,jdbcType=DECIMAL}, 
+		 DCZMJ = #{dczmj,jdbcType=DECIMAL}, 
+		 DCZRL = #{dczrl,jdbcType=DECIMAL}, 
+		 JZXMJ = #{jzxmj,jdbcType=DECIMAL}, 
+		 JZXDCDCNL = #{jzxdcdcnl,jdbcType=VARCHAR}, 
+		 WXPXDCMJ = #{wxpxdcmj,jdbcType=VARCHAR}, 
+		 WXPXDCDCNL = #{wxpxdcdcnl,jdbcType=VARCHAR}, 
+		WXPDC = #{wxpdc,jdbcType=VARCHAR},
+		JD = #{jd,jdbcType=VARCHAR}, 
+		WD = #{wd,jdbcType=VARCHAR}, 
+		JTJGISDYIDH = #{jtjgisdyidh,jdbcType=VARCHAR}, 
+		
+		ADD_USER = #{createUser,jdbcType=VARCHAR}, 
+		ADD_DATE = #{createTime,jdbcType=TIMESTAMP}, 
+		UPDATE_USER = #{updateUser,jdbcType=VARCHAR}, 
+		UPDATE_DATE = #{updateTime,jdbcType=TIMESTAMP}, 
+		RECORD_STATUS = #{state,jdbcType=DECIMAL},
+		SFTB = #{sftb,jdbcType=VARCHAR}, 
+		TBZT = #{tbzt,jdbcType=VARCHAR}, 
+		TBDYID = #{tbdyid,jdbcType=DECIMAL}, 
+		QYLB = #{qylb,jdbcType=VARCHAR}, 
+		SSQY = #{ssqy,jdbcType=DECIMAL}, 
+		RECORD_CODE = #{recordcode,jdbcType=VARCHAR}, 
+		BYZD1 = #{byzd1,jdbcType=VARCHAR},
+		BYZD2 = #{byzd2,jdbcType=VARCHAR},
+		BYZD3 = #{byzd3,jdbcType=VARCHAR}, 
+		BYZD4 = #{byzd4,jdbcType=VARCHAR}, 
+		BYZD5 = #{byzd5,jdbcType=VARCHAR},
+		ZWDCYT = #{zwdcyt,jdbcType=VARCHAR}
+	
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+  	SELECT
+		ID,SZD,SZGQ,QYMC,MTMC,DCMC,SCYDCYT,DCZMJ,DCZRL,JZXMJ,JZXDCDCNL,WXPXDCMJ,WXPXDCDCNL,JD,WD,JTJGISDYIDH,
+		ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+		BYZD1,BYZD2,BYZD3,BYZD4,WXPDC,BYZD5,ZWDCYT
+	FROM
+		AQ_BASIC_DWXX_DC
+	WHERE ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+     SELECT
+		ID,SZD,SZGQ,QYMC,MTMC,DCMC,SCYDCYT,DCZMJ,DCZRL,JZXMJ,JZXDCDCNL,WXPXDCMJ,WXPXDCDCNL,JD,WD,JTJGISDYIDH,
+		ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+		BYZD1,BYZD2,BYZD3,BYZD4,WXPDC,BYZD5,ZWDCYT
+	FROM
+		AQ_BASIC_DWXX_DC
+  </select>
+  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.DcModel">
+	 SELECT
+		ID,SZD,SZGQ,QYMC,MTMC,DCMC,SCYDCYT,DCZMJ,DCZRL,JZXMJ,JZXDCDCNL,WXPXDCMJ,WXPXDCDCNL,JD,WD,JTJGISDYIDH,
+		ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
+		BYZD1,BYZD2,BYZD3,BYZD4,WXPDC,BYZD5,ZWDCYT
+	FROM
+		AQ_BASIC_DWXX_DC
+	<where>
+			RECORD_STATUS != '9'
+			<if test="id != null and id != '' ">
+				AND ID = #{id,jdbcType=DECIMAL}
+			</if>
+			<if test="qymc != null and qymc != '' ">
+				AND QYMC = #{qymc,jdbcType=DECIMAL}
+			</if>
+			
+	</where>
+  </select>
+ <!-- <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.GqModel">
+  	SELECT ID, SZD, SSGK, GQMC, GQSZSYLX, GQMJ, LYMJ, SYFW, SYMJ, GQGHMJ, GHLYMJ, FGYSCYDGHMJ, GHSYMJ, 
+   	 GQZRAXCD, GYMTAXCD, GQGKAXCD,GKSSYSYAXCD, GQDMBDZDZ, BZ, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE, 
+   	 RECORD_STATUS, SFTB, TBZT,TBDYID, QYLB, SSQY, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5, GISID
+	FROM
+		GKAQV2.T_YJPT_GQ
+	<where>
+			<if test="szd != null and szd != '' ">
+				SZD = #{szd,jdbcType=VARCHAR}
+			</if>
+			<if test="ssgk !=null and ssgk != '' ">
+				AND SSGK = #{ssgk,jdbcType=DECIMAL} 
+			</if>
+			<if test="gqmc != null and gqmc != '' ">
+				AND GQMC = #{gqmc,jdbcType=VARCHAR}
+			</if>
+		</where>
+  </select> -->
+  
+</mapper>

gkaqv2/trunk/modules/web/src/main/resources/com/xt/js/gkaq/web/mappers/JyrTjcxMapper.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.web.mappers.JyrTjcxMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.TjcxModel" >
+    <id column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
+    <result column="SYHGMT" property="syhgmt" jdbcType="DECIMAL" />
+    <result column="WXHW" property="wxhw" jdbcType="DECIMAL" />
+    <result column="PH" property="ph" jdbcType="DECIMAL" />
+    <result column="JZX" property="jzx" jdbcType="DECIMAL" />
+    <result column="WD" property="wd" jdbcType="DECIMAL" />
+    <result column="WDYX" property="wdyx" jdbcType="DECIMAL" />
+    <result column="QD" property="qd" jdbcType="DECIMAL" />
+    <result column="QDYX" property="qdyx" jdbcType="DECIMAL" />
+    <result column="SL" property="sl" jdbcType="DECIMAL" />
+    <result column="WXSJ" property="wxsj" jdbcType="DECIMAL" />
+    <result column="RL" property="rl" jdbcType="DECIMAL" />
+  </resultMap>
+
+  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.TjcxModel">
+		SELECT J.GKJYR,
+			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+							 WHERE B.ZYHBWFL ='10000026' AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1')
+			AS SYHGMT,
+			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+							 WHERE B.WXPBW='Y' AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
+			AS WXHW, 
+			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+							 WHERE B.WXPBW='N' AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
+			AS PH,
+			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+							 WHERE B.ZYHBWFL='10000023' AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
+			AS JZX,
+			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+							 WHERE <![CDATA[ "TO_NUMBER"(B.SJKPNL) >=1]]> AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
+			AS WD,
+			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+							 WHERE <![CDATA["TO_NUMBER"(B.SJKPNL) >= 0.1 AND "TO_NUMBER"(B.SJKPNL) < 1]]> 
+							 AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
+			AS WDYX,
+			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+					WHERE <![CDATA["TO_NUMBER"(B.SJKPNL) >=0.01 AND "TO_NUMBER"(B.SJKPNL) < 0.1]]>
+					 AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
+					AS QD,
+			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+					WHERE <![CDATA["TO_NUMBER"(B.SJKPNL) <0.01]]> AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
+			AS QDYX,
+			(SELECT "SUM"(C.CGGS) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+			AS SL,
+			(SELECT "SUM"(C.ZDWXYCGGS) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+			AS WXSJ,
+			(SELECT "SUM"(C.CGRJ) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+			AS RL
+		FROM AQ_BASIC_DWXX_JYRJCXX J
+	<where>
+			J.STATE != '9'
+			<if test="szd != null and szd != '' ">
+				AND J.SZD = #{szd,jdbcType=VARCHAR}
+			</if>
+			<if test="qylx != null and qylx != '' ">
+				AND J.QYLX = #{qylx,jdbcType=VARCHAR}
+			</if>
+			<if test="qstime != null and qstime != '' ">
+				AND <![CDATA[J.CREATE_TIME >= #{qstime,jdbcType=TIMESTAMP}]]>
+			</if>
+			<if test="jstime != null and jstime != '' ">
+				AND <![CDATA[J.CREATE_TIME < #{jstime,jdbcType=TIMESTAMP}]]>
+			</if>
+	</where>
+  </select>
+
+  
+</mapper>

gkaqv2/trunk/modules/web/src/main/resources/com/xt/js/gkaq/web/mappers/JyrWxhwtjcxMapper.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.web.mappers.JyrWxhwtjcxMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.WxhwtjcxModel" >
+    <id column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
+    <result column="BZ" property="bz" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="BWMC" property="bwmc" jdbcType="VARCHAR" />
+    <result column="WD" property="wd" jdbcType="DECIMAL" />
+    <result column="QD" property="qd" jdbcType="DECIMAL" />
+    <result column="TTL" property="ttl" jdbcType="DECIMAL" />
+    <result column="JZXTTL" property="jzxttl" jdbcType="DECIMAL" />
+    <result column="GQMC" property="gqmc" jdbcType="VARCHAR" />
+    <result column="GM" property="gm" jdbcType="VARCHAR" />
+    <result column="SFFZ" property="sffz" jdbcType="VARCHAR" />
+    <result column="HZ" property="hz" jdbcType="VARCHAR" />
+    <result column="QYLX" property="qylx" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.WxhwtjcxModel">
+	SELECT 
+		J.GKJYR,
+		G.BZ, 
+		J.BYZD1,
+		(SELECT WM_CONCAT(BWMC) AS MC FROM T_YJPT_JYRXX_BW 
+				WHERE RECORD_STATUS = '1' AND QYMC = J."ID") AS BWMC, 
+		(SELECT "SUM"(1) FROM T_YJPT_JYRXX_BW  B 
+				WHERE <![CDATA["TO_NUMBER"(B.SJKPNL) >=1]]> AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') AS WD,
+		(SELECT "SUM"(1) FROM T_YJPT_JYRXX_BW  B 
+				WHERE "TO_NUMBER"(B.SJKPNL) >= 0.1 AND
+				 <![CDATA["TO_NUMBER"(B.SJKPNL) <1]]> AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') AS QD,
+		(SELECT NVL(SUM(T.ZYSL),0) FROM T_YJPT_WXHWGKZYSBD T 
+				WHERE (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND T.QXZYSJ IS NULL AND T.INOROUT IS NOT NULL AND T.ZYDW=J."ID"
+				<if test="zydd != null and zydd != ''">
+					AND T.ZYDD=#{zydd,jdbcType=VARCHAR}
+				</if>
+				<if test="kssj != null and kssj != ''">
+					<![CDATA[AND BGSJ>=#{kssj,jdbcType=VARCHAR}]]>
+				</if>			
+				<if test="jssj != null jssj != ''">
+					<![CDATA[AND BGSJ<=#{jssj,jdbcType=VARCHAR}]]>
+				</if>
+				) AS TTL,
+		(SELECT NVL(SUM(T.TEU),0) FROM T_YJPT_WXHWGKZYSBD T 
+				WHERE (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND T.QXZYSJ IS NULL AND T.INOROUT IS NOT NULL  AND T.ZYDW=J."ID"
+				<if test="zydd != null and zydd != ''">
+					AND T.ZYDD=#{zydd,jdbcType=VARCHAR}
+				</if>
+				<if test="kssj != null and kssj != ''">
+					<![CDATA[AND BGSJ>=#{kssj,jdbcType=VARCHAR}]]>
+				</if>			
+				<if test="jssj != null jssj != ''">
+					<![CDATA[AND BGSJ<=#{jssj,jdbcType=VARCHAR}]]>
+				</if>
+				) AS JZXTTL,
+		GQ.GQMC,
+		(SELECT WM_CONCAT(B.HCKPNL||'*'||COUNT(ROWNUM)) AS S FROM T_YJPT_JYRXX_BW B 
+				WHERE  B.RECORD_STATUS!='9' AND B.WXPBW ='Y' AND B.QYMC=J."ID" GROUP BY B.HCKPNL)AS GM,
+		(SELECT GKWXHWZYFZBH FROM T_YJPT_JYRJCXX WHERE RECORD_STATUS != '9' AND ID = J."ID") AS SFFZ,
+		(SELECT WM_CONCAT(T.WXHWMCBH||':'||NVL(SUM(T.ZYSL),0)||'吨') FROM T_YJPT_WXHWGKZYSBD T 
+				WHERE (T.RECORD_STATUS = 2 OR T.RECORD_STATUS = 10) AND T.QXZYSJ IS NULL AND T.ZYDW=J."ID" 
+				<if test="zydd != null and zydd != ''">
+					AND T.ZYDD=#{zydd,jdbcType=VARCHAR}
+				</if>
+				<if test="kssj != null and kssj != ''">
+					<![CDATA[AND BGSJ>=#{kssj,jdbcType=VARCHAR}]]>
+				</if>			
+				<if test="jssj != null jssj != ''">
+					<![CDATA[AND BGSJ<=#{jssj,jdbcType=VARCHAR}]]>
+				</if>
+				GROUP BY T.WXHWMCBH) AS HZ,  
+		J.QYLX
+	FROM T_YJPT_JYRJCXX J
+	LEFT JOIN T_YJPT_GQ GQ ON GQ."ID" = J.SZGQ
+	LEFT JOIN T_YJPT_GGDM G ON G."ID" = J.SZD
+		
+	<where>
+			J.RECORD_STATUS != '9'
+			<if test="szd != null and szd != '' ">
+				AND J.SZD =#{szd,jdbcType=VARCHAR}
+			</if>
+			<if test="qylx != null and qylx != '' ">
+				AND J.QYLX = #{qylx,jdbcType=VARCHAR}
+			</if>
+			<if test="kssj != null and kssj != '' ">
+				AND <![CDATA[J.ADD_DATE >= #{kssj,jdbcType=TIMESTAMP}]]>
+			</if>
+			<if test="jssj != null and jssj != '' ">
+				AND <![CDATA[J.ADD_DATE < #{jssj,jdbcType=TIMESTAMP}]]>
+			</if>
+			<if test="byzd1 != null and byzd1 != ''">
+				AND J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd1, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="byzd2 != null and byzd2 != ''">
+				 OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd2, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="byzd3 != null and byzd3 != ''">
+				OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd3, jdbcType=VARCHAR}),'%')
+			</if>
+	</where>
+  </select>
+
+  
+</mapper>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/AddOrEditInfo.jsp

@@ -0,0 +1,6 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<div style="margin-left: auto;margin-right: auto;">
+		<%@ include file="../jyr/JyrInfo.jsp"%>
+	</div>
+<script src="<%=base%>/static/js/jyr/AddOrEditInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/BwInfo.jsp

@@ -0,0 +1,8 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<div class="page-content">
+			<!--ÁÐ±í²¿·Ö-->
+			<table id="bw-grid-table" style="width: 100%;"></table>
+			<div id="bw-grid-pager" style="width: 100%;"></div>
+	</div>
+<script src="<%=base%>/static/js/jyr/BwInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/CkInfo.jsp

@@ -0,0 +1,8 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<div class="page-content">
+			<!--ÁÐ±í²¿·Ö-->
+			<table id="ck-grid-table" style="width: 100%;"></table>
+			<div id="ck-grid-pager" style="width: 100%;"></div>
+	</div>
+<script src="<%=base%>/static/js/jyr/CkInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/DcInfo.jsp

@@ -0,0 +1,8 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<div class="page-content">
+			<!--ÁÐ±í²¿·Ö-->
+			<table id="dc-grid-table" style="width: 100%;"></table>
+			<div id="dc-grid-pager" style="width: 100%;"></div>
+	</div>
+<script src="<%=base%>/static/js/jyr/DcInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/JyrInfo.jsp

@@ -0,0 +1,316 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	
+	   	 <form class="form-horizontal" id="jyrInfoform" method="post" >
+		    <input type="hidden" id="id" name="id">
+			<input type="hidden" id="recordCode" name="recordCode">
+	    	<div class="form-group">
+		        <label class="col-sm-1 control-label" for="szd2">所在地</label>
+				<div class="col-sm-3">
+					<select class="form-control" id ="szd2">
+						
+					</select>
+					<input id="jyrszd" name="szd" type="hidden"/>
+				</div>
+				<label class="col-sm-1 control-label" for="szgq2">所在港区</label>
+				<div class="col-sm-3">
+					<select class="form-control" style = "width:100%;" id ="szgq2" name = "szgq">
+						
+					</select>
+				</div>
+				<label class="col-sm-1 control-label" for="qylx">企业类型</label>
+				<div class="col-sm-3">
+					<select class="form-control" id ="qylx2" name = "qylx">
+						<option value = "">--请选择--</option>
+						<option value = "1">沿江企业</option>
+						<option value = "2">沿海企业</option>
+						<option value = "3">内河企业</option>
+					</select>
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="gkjyr2">港口经营人名称</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="gkjyr2" name="gkjyr"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="yzbm">邮政编码</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="yzbm" name="yzbm"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="parentJyrId">上级经营人</label>
+				<div class="col-sm-3">
+					<select class="form-control" id ="parentJyrId" name = "parentJyrId">
+						
+					</select>
+				</div>
+			</div> 
+			<div class="form-group" id = "qy">
+				<input id = "qylb" name = "qyxz" hidden="true">
+				<input id = "byzd" name = "byzd1" hidden="true">
+				 <label class="col-sm-1 control-label">类别</label>
+				<div class="col-sm-3" id="lb">
+					<input name="qylb1" type="checkbox" placeholder="" onchange="checkInfo()" value = "码头企业"/> 码头企业
+					<input name="qylb1" type="checkbox" placeholder="" onchange="checkInfo()" value = "仓储企业"/>仓储企业
+				</div>
+				<div class="form-group" id="mt" style="display: none">
+					<label class="col-sm-1 control-label"></label>
+					<div class="col-sm-10" id="matou">
+						<input name="qylb1" type="checkbox" placeholder="" onchange="getqylbInfo()" value = "危险货物集装箱码头"/> 危险货物集装箱码头
+						<input name="qylb1" type="checkbox" placeholder="" onchange="getqylbInfo()" value = "石油化工码头"/>石油化工码头
+						<input name="qylb1" type="checkbox" placeholder="" onchange="getqylbInfo()" value = "危险货物非石油化工码头"/>危险货物非石油化工码头
+					</div>
+				</div>
+				<div class="form-group" id="ck" style="display: none" >
+					<label class="col-sm-1 control-label"></label>
+					<div class="col-sm-10" id = "cangku">
+						<input name="qylb1" type="checkbox" placeholder="" onchange="getqylbInfo()" value = "石油库"/> 石油库
+						<input name="qylb1" type="checkbox" placeholder="" onchange="getqylbInfo()" value = "港口危险货物库区"/>港口危险货物库区
+					</div>
+				</div>
+			</div>
+			
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="bgdz">办公地点</label>
+				<div class="col-sm-11">
+					<input class="form-control" id="bgdz" name="bgdz" 
+						type="text" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="gkjyxkzh">港口经营许可证</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="gkjyxkzh" name="gkjyxkzh" 
+						type="file" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="fzrq">发证日期</label>
+				<div class="col-sm-3">
+					<input id="fzrq" class="easyui-datetimebox" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+							 style="width:100%;height: 34px;"
+						type="text"/>
+					<input id = "rq" name = "fzrq" type="hidden">
+				</div>
+				<label class="col-sm-1 control-label" for="bafzrq">有效期</label>
+				<div class="col-sm-3">
+					<input id="bafzrq" class="easyui-datetimebox" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+							 style="width:100%;height: 34px;"
+						type="text"/>
+						<input id = "rq2" name = "bafzrq" type="hidden">
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="fzjg">发证机关</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="fzjg" name="fzjg"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="xzqh">行政区划</label>
+				<div class="col-sm-3">
+					<select class="selectpicker form-control" id ="xzqh" name = "xzqh">
+						
+					</select>
+				</div>
+				<label class="col-sm-1 control-label" for="zyhz">主营货种(前10种)</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="zyhz" name="zyhz"
+						type="text" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="jyfw">经营范围</label>
+				<div class="col-sm-11">
+					<input class="form-control" id="jyfw" name="jyfw" style = "width:100%;"
+						type="text" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="jyqy">经营区域</label>
+				<div class="col-sm-11">
+					<input class="form-control" id="jyqy" name="jyqy" style = "width:100%;"
+						type="text" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="fddbr2">法定代表人</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="fddbr2" name="fddbr"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="lxdh">联系电话</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="lxdh" name="lxdh"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="cz">传真</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="cz" name="cz"
+						type="text" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="frzjhm2">法人证件号码</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="frzjhm2" name="byzd3"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="aqbmfzr">安全部门负责人</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="aqbmfzr" name="aqbmfzr"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="aqfzrlxdh">联系电话</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="aqfzrlxdh" name="aqfzrlxdh" type="text" placeholder="" />
+					<input class="form-control" id="aqfzrsj" name="aqfzrsj" type="hidden" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="aqfzrzbdh">安全负责人值班电话</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="aqfzrzbdh" name="aqfzrzbdh"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="aqzgbm">安全主管部门</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="aqzgbm" name="aqzgbm"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="aqgljg">安全管理机构</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="aqgljg" name="aqgljg"
+						type="text" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="zzagrysl">专职安管人员数量</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="zzagrysl" name="zzagrysl"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="zcze">资产总额(万元)</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="zcze" name="zcze"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="xsje">销售金额(万元)</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="xsje" name="xsje"
+						type="text" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="gsyyzzbh">工商营业执照编号</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="gsyyzzbh" name="gsyyzzbh"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="tzze">投资总额(万元)</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="tzze" name="tzze"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="zczb">注册资本(万元)</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="zczb" name="zczb"
+						type="text" placeholder="" />
+				</div>
+			</div>  
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="qyzzjgdm">企业组织机构代码</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="qyzzjgdm" name="qyzzjgdm"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="sshydl">所属行业大类</label>
+				<div class="col-sm-3">
+					<select class="form-control" id ="sshydl" name = "sshydl">
+						
+					</select>
+				</div>
+				<label class="col-sm-1 control-label" for="sshyz">所属行业中类</label>
+				<div class="col-sm-3">
+					<select class="form-control" id ="sshyz" name = "sshyz">
+						
+					</select>
+				</div>
+			</div>  
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="qyaqdj">企业安全等级</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="qyaqdj" name="qyaqdj"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="rs">人数</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="rs" name="rs"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="gjjgdm">国际机构代码</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="gjjgdm" name="gjjgdm"
+						type="text" placeholder="" />
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="sfwhqy2">是否危货企业</label>
+				<div class="col-sm-3">
+					<select class="form-control" id ="sfwhqy2" name = "sfwhqy">
+						<option value = "Y">是(有重大危险源)</option>
+						<option value = "W">是(无重大危险源)</option>
+						<option value = "N">否</option>
+					</select>
+				</div>
+				<label class="col-sm-1 control-label" for="gkwxhwzyfzbh">港口危险货物作业附证编号</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="gkwxhwzyfzbh" name="gkwxhwzyfzbh"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="fzyxq">有效期</label>
+				<div class="col-sm-3">
+					<input id="fzyxq" name="fzyxq" class="easyui-datetimebox" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+							 style="width:100%;height: 34px;"
+						type="text"/>
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="gkssbafhzsbh">港口设施保安符合证书编号</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="gkssbafhzsbh" name="gkssbafhzsbh"
+						type="text" placeholder="" />
+				</div>
+				<label class="col-sm-1 control-label" for="bayxq">有效期至</label>
+				<div class="col-sm-3">
+					<input id="bayxq" name="bayxq" class="easyui-datetimebox" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+							 style="width:100%;height: 34px;"
+						type="text"/>
+				</div>
+				<label class="col-sm-1 control-label" for="bafzjg">发证机构</label>
+				<div class="col-sm-3">
+					<input class="form-control" id="bafzjg" name="bafzjg"
+						type="text" placeholder="" />
+						
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-1 control-label" for="zywxhwpm">作业危险货物品名</label>
+				<div class="col-sm-9">
+					<textarea class="form-control" id = "zywxhwpm" name = "zywxhwpm" readonly="readonly"></textarea>
+					
+				</div>
+				<input type="button" id="choosePerson" onclick="selectWxhw();"  value="选择"/>
+			</div>
+			<div class="form-group">
+				<input id = "sfzdsp" name = "sfzdsp" hidden="true"/>
+				 <label class="col-sm-1 control-label">是否自动审批</label>
+				<div class="col-sm-3" id = "shengpi">
+					<input name="shenpi" type="checkbox" placeholder="" onchange="getshenpi()"/> 
+				</div>
+			</div>
+	  	 </form>
+	  	 
+<script src="<%=base%>/static/js/jyr/JyrInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/JyrTjcxInfo.jsp

@@ -0,0 +1,5 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<table id="tj-grid-table" style = "width:100%;"></table>
+		<div id="tj-grid-pager" style = "width:100%;"></div>
+<script src="<%=base%>/static/js/jyr/JyrTjcxInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/JyrWxhwtjcxInfo.jsp

@@ -0,0 +1,5 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<table id="whtj-grid-table" style = "width:100%;"></table>
+		<div id="whtj-grid-pager" style = "width:100%;"></div>
+<script src="<%=base%>/static/js/jyr/JyrWxhwtjcxInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/main.jsp

@@ -12,6 +12,7 @@
 <script src="<%=base%>/static/js/jyr/index.js"></script>
 	<style type="text/css">
 		.tdname{font-weight: bolder;}
+		
 	</style>
 </head>
 
@@ -29,7 +30,7 @@
 		<div class="p_buttondiv">
 			<div class="p_buttonbg">
 				<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" 
-					onclick="addInfo()" title="新增"/>
+					onclick="addJyrInfo()" title="新增"/>
 			</div>
 			<div class="p_buttonbg">
 				<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" 
@@ -47,6 +48,18 @@
 				<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png" 
 					onclick="printInfo()" title="打印"/>
 			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
+					onclick="tjxx()" title="统计信息"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+					onclick="whqy()" title="危货企业信息"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
+					onclick="ccss()" title="存储设施信息"/>
+			</div>
 		</div>
 		<div class="p_searchdiv">
 			<table class="tabsearch">
@@ -125,12 +138,45 @@
 		</div>
 	</div>
 	</div>
-		<div id="win" class="easyui-window" title="编辑" style="width:75%;height: 90%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false"> 
-					<%@ include file="../jyr/EditOrAdd.jsp"%>
+		<div id="jyrwin" class="easyui-window" title="编辑" style="width:100%;height: 100%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		  
+				<div id="tt" class="easyui-tabs"  style="width:100%;height:100%;">   
 					
-				</div>
-			</div>
+				    <div title="经营人基本信息" data-options="iconCls:'icon-reload'"  style="padding:20px;display:none;">   
+				    	<div id="tab-tools" style="margin-bottom:10px;">
+					    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
+							      	<button id="btnEditOrSave" class="btn btn-success btn-round btn-sm"
+										onclick="editJyr()">
+										<i class="glyphicon glyphicon-ok"></i> 保存
+									</button>
+									<button type="button" class="btn btn-grey btn-round btn-sm"
+										onclick="closeWin()">
+										<i class="glyphicon glyphicon-remove"></i> 关闭
+									</button>
+							   </div>
+						</div> 
+				        <%@ include file="../jyr/AddOrEditInfo.jsp"%>    
+				    </div>   
+				    <div title="泊位信息" data-options="iconCls:'icon-reload',closable:true" style="overflow:auto;padding:20px;display:none;">   
+				        <%@ include file="../jyr/BwInfo.jsp"%>   
+				    </div>   
+				    <div title="堆场信息" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">   
+				        <%@ include file="../jyr/DcInfo.jsp"%> 
+				    </div> 
+				    <div title="仓库信息" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">   
+				        <%@ include file="../jyr/CkInfo.jsp"%>
+				    </div>   
+				</div>  
+					
+					
+		</div>
+		
+		<div id="jyrinfo" class="easyui-window" title="编辑" style="width:100%;height: 100%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		  <%@ include file="../jyr/JyrTjcxInfo.jsp"%>
+       	</div>
+</div>
 <!-- 头部 -->
 <div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
 	<%@ include file="../../layouts/navbar.jsp"%>

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/AddOrEditInfo.js

@@ -0,0 +1,12 @@
+/**
+ * js
+ */
+var zywxhwpm ='';
+/**
+ * 初始化
+ */
+jQuery(function($) {
+	// 初始化Grid
+
+});
+

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/BwInfo.js

@@ -0,0 +1,126 @@
+/**
+ * js
+ */
+var bw_grid_selector = "#bw-grid-table";
+var bw_pager_selector = "#bw-grid-pager";
+jQuery(function($) {
+	// 初始化Grid
+});
+
+
+/**
+ * 初始化Grid
+ */
+function bw_initGrid(qymc) {
+	jQuery(bw_grid_selector).jqGrid({
+		url : basePath + '/bw/list',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : [ 'id','泊位名称','码头名称','设计靠泊能力(万吨)','泊位长度(米)','泊位用途'],
+		colModel : [ {
+			name : 'id',
+			index : 'id',
+			key : true,
+			hidden:true,
+			editable : false,
+			sortable : false
+		},{
+			name : 'bwmc',
+			index : 'bwmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'mtName',
+			index : 'mtName',
+			editable : false,
+			sortable : false
+		},{
+			name : 'sjkpnl',
+			index : 'sjkpnl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'bwcd',
+			index : 'bwcd',
+			editable : false,
+			sortable : false
+		},{
+			name : 'zwbwyt',
+			index : 'zwbwyt',
+			editable : false,
+			sortable : false
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : bw_pager_selector, //定义翻页用的导航栏
+		page : 1, //设置初始的页码,初始为1
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
+		altRows : true, //设置为交替行表格,默认为false
+		multiselect : false, //可以多选://控制是否有chechbox选择框
+		multiboxonly : false, //只有选择checkbox才会起作用 
+		multiselect :false, //是否可以多选
+		loadComplete : function() {
+			var table = this;
+			setTimeout(function() {
+				updatePagerIcons(table);
+				enableTooltips(table);
+				
+			}, 0);
+		},
+		prmNames : {
+             oper : "oper",
+             page : "page",
+             rows : "rows",
+             sort : "sidx",
+             order : "sord"
+        },
+		postData :{
+			"qymc" : qymc
+		},
+		jsonReader : {
+			root : "list", // json中代表实际模型数据的入口
+			page : "page", // json中代表当前页码的数据
+			total : "pages", // json中代表页码总数的数据
+			records : "total", // json中代表数据行总数的数据
+			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
+		},
+        gridComplete: function () {
+        	$("#gbox_bw-grid-table").attr("style","width:100%;");
+            $("#gbox_bw-grid-table").find("div").attr("style","width:100%;");
+            $("#gview_bw-grid-table").children("div:first").attr("hidden","true");
+            $("#gbox_bw-grid-table").find("table").attr("style","width:100%;");
+            comGridComplete("bw-grid-table", "editRecord");
+            
+        },
+		onPaging: function(){
+			comGridPage("bw-grid-table");
+		}
+	});
+	jQuery(bw_grid_selector).jqGrid('setGridParam',{postData : {"qymc":qymc}}).trigger("reloadGrid", [{ page: 1 }]);
+	// 调整jqgrid
+	ajustJqGrid(bw_grid_selector, bw_pager_selector);	
+	 
+};
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/CkInfo.js

@@ -0,0 +1,126 @@
+/**
+ * js
+ */
+var ck_grid_selector = "#ck-grid-table";
+var ck_pager_selector = "#ck-grid-pager";
+jQuery(function($) {
+	// 初始化Grid
+});
+
+
+/**
+ * 初始化Grid
+ */
+function ck_initGrid(ssjyr) {
+	jQuery(ck_grid_selector).jqGrid({
+		url : basePath + '/ck/list',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : [ 'id','仓库名称','仓库个数(个)','仓库用途','仓库面积','仓库容积'],
+		colModel : [ {
+			name : 'id',
+			index : 'id',
+			key : true,
+			hidden:true,
+			editable : false,
+			sortable : false
+		},{
+			name : 'ckmc',
+			index : 'ckmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'ckgs',
+			index : 'ckgs',
+			editable : false,
+			sortable : false
+		},{
+			name : 'zwckyt',
+			index : 'zwckyt',
+			editable : false,
+			sortable : false
+		},{
+			name : 'scyckmj',
+			index : 'scyckmj',
+			editable : false,
+			sortable : false
+		},{
+			name : 'scyckrj',
+			index : 'scyckrj',
+			editable : false,
+			sortable : false
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : ck_pager_selector, //定义翻页用的导航栏
+		page : 1, //设置初始的页码,初始为1
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
+		altRows : true, //设置为交替行表格,默认为false
+		multiselect : false, //可以多选://控制是否有chechbox选择框
+		multiboxonly : false, //只有选择checkbox才会起作用 
+		multiselect :false, //是否可以多选
+		loadComplete : function() {
+			var table = this;
+			setTimeout(function() {
+				updatePagerIcons(table);
+				enableTooltips(table);
+				
+			}, 0);
+		},
+		prmNames : {
+             oper : "oper",
+             page : "page",
+             rows : "rows",
+             sort : "sidx",
+             order : "sord"
+        },
+		postData :{
+			"ssjyr" : ssjyr
+		},
+		jsonReader : {
+			root : "list", // json中代表实际模型数据的入口
+			page : "page", // json中代表当前页码的数据
+			total : "pages", // json中代表页码总数的数据
+			records : "total", // json中代表数据行总数的数据
+			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
+		},
+        gridComplete: function () {
+        	$("#gbox_ck-grid-table").attr("style","width:100%;");
+            $("#gbox_ck-grid-table").find("div").attr("style","width:100%;");
+            $("#gview_ck-grid-table").children("div:first").attr("hidden","true");
+            $("#gbox_ck-grid-table").find("table").attr("style","width:100%;");
+            comGridComplete("ck-grid-table", "editRecord");
+            
+        },
+		onPaging: function(){
+			comGridPage("ck-grid-table");
+		}
+	});
+	jQuery(ck_grid_selector).jqGrid('setGridParam',{postData : {"ssjyr":ssjyr}}).trigger("reloadGrid", [{ page: 1 }]);
+	// 调整jqgrid
+	ajustJqGrid(ck_grid_selector, ck_pager_selector);	
+	 
+};
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/DcInfo.js

@@ -0,0 +1,133 @@
+/**
+ * js
+ */
+var dc_grid_selector = "#dc-grid-table";
+var dc_pager_selector = "#dc-grid-pager";
+jQuery(function($) {
+	// 初始化Grid
+});
+
+
+/**
+ * 初始化Grid
+ */
+function dc_initGrid(qymc) {
+	jQuery(dc_grid_selector).jqGrid({
+		url : basePath + '/dc/list',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : [ 'id','堆场名称','主要用途','堆场总面积(平方米)','堆场总容量(吨)','是否危险品堆场'],
+		colModel : [ {
+			name : 'id',
+			index : 'id',
+			key : true,
+			hidden:true,
+			editable : false,
+			sortable : false
+		},{
+			name : 'dcmc',
+			index : 'dcmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'zwdcyt',
+			index : 'zwdcyt',
+			editable : false,
+			sortable : false
+		},{
+			name : 'dczmj',
+			index : 'dczmj',
+			editable : false,
+			sortable : false
+		},{
+			name : 'dczrl',
+			index : 'dczrl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'wxpdc',
+			index : 'wxpdc',
+			editable : false,
+			sortable : false,
+			formatter : function (cell,opt,row) {
+				if (row.wxpdc == "N") {
+					return "否";
+				} else if (row.wxpdc == "Y") {
+					return "是";
+				}
+			}
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : dc_pager_selector, //定义翻页用的导航栏
+		page : 1, //设置初始的页码,初始为1
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
+		altRows : true, //设置为交替行表格,默认为false
+		multiselect : false, //可以多选://控制是否有chechbox选择框
+		multiboxonly : false, //只有选择checkbox才会起作用 
+		multiselect :false, //是否可以多选
+		loadComplete : function() {
+			var table = this;
+			setTimeout(function() {
+				updatePagerIcons(table);
+				enableTooltips(table);
+				
+			}, 0);
+		},
+		prmNames : {
+             oper : "oper",
+             page : "page",
+             rows : "rows",
+             sort : "sidx",
+             order : "sord"
+        },
+		postData :{
+			"qymc" : qymc
+		},
+		jsonReader : {
+			root : "list", // json中代表实际模型数据的入口
+			page : "page", // json中代表当前页码的数据
+			total : "pages", // json中代表页码总数的数据
+			records : "total", // json中代表数据行总数的数据
+			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
+		},
+        gridComplete: function () {
+        	$("#gbox_dc-grid-table").attr("style","width:100%;");
+            $("#gbox_dc-grid-table").find("div").attr("style","width:100%;");
+            $("#gview_dc-grid-table").children("div:first").attr("hidden","true");
+            $("#gbox_dc-grid-table").find("table").attr("style","width:100%;");
+            comGridComplete("dc-grid-table", "editRecord");
+            
+        },
+		onPaging: function(){
+			comGridPage("dc-grid-table");
+		}
+	});
+	jQuery(dc_grid_selector).jqGrid('setGridParam',{postData : {"qymc":qymc}}).trigger("reloadGrid", [{ page: 1 }]);
+	// 调整jqgrid
+	ajustJqGrid(dc_grid_selector, dc_pager_selector);	
+	 
+};
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrInfo.js

@@ -0,0 +1,398 @@
+/**
+ * js
+ */
+var zywxhwpm ='';
+/**
+ * 初始化
+ */
+jQuery(function($) {
+	// 初始化Grid
+});
+
+/**
+ * 数据处理
+ * @param data
+ */
+function manageInfo (data) {
+	scouce = data;
+	//加载所在地数据信息
+	getSzd(data[0].szd);
+	//绑定关联下拉框数据
+	var szgq = data[0].szgq;
+	var parama = {"szd":$("#szd2").val()};
+	//加载港区下拉框信息
+	getselectedInfo(szgq,"/jyr/getGq",parama,"#szgq2");
+	//加载行政区划下拉框信息
+	$('#xzqh').selectpicker('val',data[0].xzqh);
+	//加载上级港口经营人信息
+	getSelect(data[0].parentJyrId); 
+	
+	//加载所属行业大类
+	gethydl(data[0].sshydl);
+	//加载所属行业中类
+	gethyz(data[0].sshyz);
+	//加载多选框信息
+	getzdsp(data[0].sfzdsp);
+	getleibie(data[0].qyxz);
+	//设置下拉框选中
+	$("#qylx2").find("[value='"+data[0].qylx+"']").attr("selected","true");
+	
+	
+	$("#id").val(data[0].id);
+	$("#recordCode").val(data[0].recordCode);
+	$("#gkjyr2").val(data[0].gkjyr);
+	$("#yzbm").val(data[0].yzbm);
+	$("#gkjyr2").val(data[0].gkjyr);
+	//设置日起
+	$("#fzrq").datetimebox("setValue",formatDate(new Date(data[0].fzrq)));
+	$("#bafzrq").datetimebox("setValue",formatDate(new Date(data[0].bafzrq)));
+	$("#bayxq").datetimebox("setValue",formatDate(new Date(data[0].bayxq)));
+	$("#fzyxq").datetimebox("setValue",formatDate(new Date(data[0].fzyxq)));
+	//设置input
+	$("#bgdz").val(data[0].bgdz);
+	$("#fzjg").val(data[0].fzjg);
+	$("#zyhz").val(data[0].zyhz);
+	$("#jyfw").val(data[0].jyfw);
+	$("#jyqy").val(data[0].jyqy);
+//	alert($("#fddbr").html());
+	$("#fddbr2").val(data[0].fddbr);
+	$("#lxdh").val(data[0].lxdh);
+	$("#cz").val(data[0].cz);
+	$("#frzjhm2").val(data[0].byzd3);
+	$("#aqbmfzr").val(data[0].aqbmfzr);
+	$("#aqfzrlxdh").val(data[0].aqfzrlxdh);
+	$("#aqfzrsj").val(data[0].aqfzrsj);
+	$("#aqfzrzbdh").val(data[0].aqfzrzbdh);
+	$("#aqzgbm").val(data[0].aqzgbm);
+	$("#aqgljg").val(data[0].aqgljg);
+	$("#zzagrysl").val(data[0].zzagrysl);
+	$("#zcze").val(data[0].zcze);
+	$("#xsje").val(data[0].xsje);
+	$("#gsyyzzbh").val(data[0].gsyyzzbh);
+	$("#tzze").val(data[0].tzze);
+	$("#zczb").val(data[0].zczb);
+	$("#qyzzjgdm").val(data[0].qyzzjgdm);
+	$("#qyaqdj").val(data[0].qyaqdj);
+	$("#rs").val(data[0].rs);
+	$("#gjjgdm").val(data[0].gjjgdm);
+	$("#gkwxhwzyfzbh").val(data[0].gkwxhwzyfzbh);
+	$("#gkssbafhzsbh").val(data[0].gkssbafhzsbh);
+	$("#bafzjg").val(data[0].bafzjg);
+	$("#zywxhwpm").text(data[0].zywxhwpm);
+	
+//	$("#").val(data[0].);
+//	$("#form").form("load",data[0]);
+	
+}
+/**
+ * 下拉框绑定
+ */
+function getselectedInfo (souce,url,parama,select) {
+	$.ajax({
+		type : "post",
+		url : basePath + url,
+		data : parama,
+		success : function (data) {
+			$(select).empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (this.optVal == souce) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $(select).append(optionStr);
+		}
+	});
+}
+/**
+ * 加载所在地信息
+ */
+function getSzd (scouse) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyr/getszd",
+		success : function (data) {
+			$("#szd2").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (scouse == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $("#szd2").append(optionStr);
+		}
+	});
+	
+}
+
+/**
+ * 加载上级港口经营人信息
+ */
+function getSelect (scouse) {
+	var val = $("#szd2").val();
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyr/getSelect",
+		data : {"szd": val},
+		success : function (data) {
+			$("#parentJyrId").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (scouse == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $("#parentJyrId").append(optionStr);
+		}
+	});
+	
+}
+/**
+ * 加载所属行业大类
+ */
+function gethydl (scouse) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyr/gethydl",
+		success : function (data) {
+			$("#sshydl").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (scouse == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $("#sshydl").append(optionStr);
+		}
+	});
+	
+}
+/**
+ * 加载所属行业中类
+ */
+function gethyz (scouse) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyr/gethyz",
+		success : function (data) {
+			$("#sshyz").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (scouse == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $("#sshyz").append(optionStr);
+		}
+	});
+	
+}
+/***
+ * 设置初始时是否自动审批的选中状态和初始值
+ * @param value
+ */
+function getzdsp (value) {
+	if (value == "Y") {
+		$("#shengpi").find("input").attr("checked",true);
+		$("#sfzdsp").val("Y");
+	} else {
+		$("#shengpi").find("input").attr("checked",false);
+		$("#sfzdsp").val("N");
+	}
+}
+/**
+ * 初始化类别数据选中信息
+ * @param value
+ */
+function getleibie(value) {
+	var len = value.length;
+	if (len > 0) {
+		for ( var i = 0; i < len; i++) {
+			if (i <2 ) {
+				if (value.charAt(i) == "Y") {
+					$("#lb").find("input:eq("+i+")").attr("checked",true);
+				} else {
+					$("#lb").find("input:eq("+i+")").removeAttr("checked");
+				} 
+			} else if (i >=2 && i<5) {
+				if (value.charAt(i) == "Y") {
+					$("#matou").find("input:eq("+(i-2)+")").attr("checked",true);
+				} else {
+					$("#matou").find("input:eq("+(i-2)+")").removeAttr("checked");
+				} 
+				
+			} else if (i >=5 ) {
+				if (value.charAt(i) == "Y") {
+					$("#cangku").find("input:eq("+(i-5)+")").attr("checked",true);
+				} else {
+					$("#cangku").find("input:eq("+(i-5)+")").removeAttr("checked");
+				} 
+				
+			}
+		}
+		checkInfo();
+	}
+	
+}
+/**
+ * 根据选中的类别控制子类别是否显示
+ */
+function checkInfo() {
+	var a = $("#lb").find("input");
+	for (var i = 0; i<a.length; i++) {
+		if (a[0].checked) {
+			$("#mt").attr("style","display:inline");
+		} 
+		if (a[1].checked) {
+			$("#ck").attr("style","display:inline");
+		}
+		if (!a[0].checked) {
+			$("#mt").attr("style","display:none");
+		} 
+		if (!a[1].checked) {
+			$("#ck").attr("style","display:none");
+		} 
+	}
+	getqylb();
+}
+//选择每个类别时，都调用的方法
+function getqylbInfo () {
+	getqylb ();
+}
+
+/**
+ * 获取选中的企业类别
+ */
+function getqylb () {
+	var qylb ="";
+	var byzd1="";
+	var a = $("#lb").find("input");
+	for (var i = 0; i<a.length; i++) {
+		if (a[i].checked) {
+			qylb += "Y";
+			byzd1 += a[i].value + ",";
+		} else {
+			qylb += "N";
+			byzd1=byzd1.replace(a[i].value + ",",""); 
+			
+		}
+	}
+	var b = $("#matou").find("input");
+	for (var i = 0; i<b.length; i++) {
+		if (b[i].checked) {
+			qylb += "Y";
+			byzd1 += b[i].value+",";
+		} else {
+			qylb += "N";
+			byzd1=byzd1.replace(","+b[i].value,"");
+		}
+		
+	}
+	var c = $("#cangku").find("input");
+	for (var i = 0; i<c.length; i++) {
+		if (c[i].checked) {
+			qylb += "Y";
+			byzd1 += c[i].value+",";
+		} else {
+			qylb += "N";
+			byzd1=byzd1.replace(","+c[i].value,"");
+		}
+		
+	}
+	if (byzd1 != "") {
+		byzd1 = byzd1.substring(0, byzd1.length-1);
+	}
+	$("#byzd").val(byzd1);
+	$("#qylb").val(qylb);
+}
+
+/**	
+ * 点击选择事件
+ */
+function selectWxhw () {
+	//获得先已有的危险物品
+	zywxhwpm = $("#zywxhwpm").text();
+	wxhw_initGrid($("#szd2").val());//加载弹窗中的数据表格
+	showSearch();//显示弹窗中的条件查询的元素
+	$("#wh").window('open');//打开弹窗
+}
+/**
+ * 是否自动审批的checked
+ */
+function getshenpi () {
+	var shenpi = $("#shengpi").find("input");
+	for (var i = 0 ; i < shenpi.length;i++) {
+		if (shenpi[i].checked) {
+			$("#sfzdsp").val("Y");
+		}else {
+			$("#sfzdsp").val("N");
+		}
+	}
+}
+
+/**
+ * 保存数据
+ */
+function editJyr () {
+//	alert($('#jyrInfoform').serialize());
+	//生成企业类别qylb
+	var szd = $("#szd2").val();
+	$("#jyrszd").val(szd);
+	//检查选中项
+	getshenpi ();
+	getqylb ();
+	//赋值
+	var time = $("#fzrq").datetimebox('getValue');
+	$("#rq").val(time);
+	var time2 = $("#bafzrq").datetimebox('getValue');
+	$("#rq2").val(time2);
+	
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyr/save",
+		data : $('#jyrInfoform').serialize(),
+		success : function(data) {
+            // 成功删除后刷新页面
+            if (data && data.success == true) {
+                layer.alert("数据已成功保存！");
+                closeWin();
+                searchRecord();
+            } else {
+                layer.alert("数据保存失败！");
+            }
+        }
+	});
+	
+}
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrTjcxInfo.js

@@ -0,0 +1,225 @@
+/**
+ * js
+ */
+var tj_grid_selector = "#tj-grid-table";
+var tj_pager_selector = "#tj-grid-pager";
+jQuery(function($) {
+	// 初始化Grid
+});
+
+
+/**
+ * 初始化Grid
+ */
+function tj_initGrid() {
+	// 数据表格初始化
+	jQuery(tj_grid_selector).jqGrid({
+		url : basePath + '/tjcx/list',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : ['企业名称','石油货物码头','危险货物码头','普货','集装箱','万吨以上','万吨以下','千吨以上','千吨以下','数量','重大危险源单元数量','容积'],
+		colModel : [ {
+			name : 'gkjyr',
+			index : 'gkjyr',
+			editable : false,
+			sortable : false
+		},{
+			name : 'syhgmt',
+			index : 'syhgmt',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.syhgmt == null || row.syhgmt == '' ) {
+					return 0;
+				}
+				return row.syhgmt;
+			}
+		},{
+			name : 'wxhw',
+			index : 'wxhw',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.wxhw == null || row.wxhw == '' ) {
+					return 0;
+				}
+				return row.wxhw;
+			}
+		},{
+			name : 'ph',
+			index : 'ph',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.ph == null || row.ph == '' ) {
+					return 0;
+				}
+				return row.ph;
+			}
+		},{
+			name : 'jzx',
+			index : 'jzx',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.jzx == null || row.jzx == '' ) {
+					return 0;
+				}
+				return row.jzx;
+			}
+		},{
+			name : 'wd',
+			index : 'wd',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.wd == null || row.wd == '' ) {
+					return 0;
+				}
+				return row.wd;
+			}
+		},{
+			name : 'wdyx',
+			index : 'wdyx',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.wdyx == null || row.wdyx == '' ) {
+					return 0;
+				}
+				return row.wdyx;
+			}
+		},{
+			name : 'qd',
+			index : 'qd',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.qd == null || row.qd == '' ) {
+					return 0;
+				}
+				return row.qd;
+			}
+		},{
+			name : 'qdyx',
+			index : 'qdyx',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.qdyx == null || row.qdyx == '' ) {
+					return 0;
+				}
+				return row.qdyx;
+			}
+		},{
+			name : 'sl',
+			index : 'sl',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.sl == null || row.sl == '' ) {
+					return 0;
+				}
+				return row.sl;
+			}
+		},{
+			name : 'wxsj',
+			index : 'wxsj',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.wxsj == null || row.wxsj == '' ) {
+					return 0;
+				}
+				return row.wxsj;
+			}
+		},{
+			name : 'rl',
+			index : 'rl',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.rl == null || row.rl == '' ) {
+					return 0;
+				}
+				return row.rl;
+			}
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : tj_pager_selector, //定义翻页用的导航栏
+		page : 1, //设置初始的页码,初始为1
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
+		altRows : true, //设置为交替行表格,默认为false
+		multiselect : true, //可以多选://控制是否有chechbox选择框
+		multiboxonly : true, //只有选择checkbox才会起作用 
+		multiselect :true, //是否可以多选
+		loadComplete : function() {
+			var table = this;
+			setTimeout(function() {
+				updatePagerIcons(table);
+				enableTooltips(table);
+				
+			}, 0);
+		},
+		prmNames : {
+             oper : "oper",
+             page : "page",
+             rows : "rows",
+             sort : "sidx",
+             order : "sord"
+        },
+		jsonReader : {
+			root : "list", // json中代表实际模型数据的入口
+			page : "page", // json中代表当前页码的数据
+			total : "pages", // json中代表页码总数的数据
+			records : "total", // json中代表数据行总数的数据
+			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
+		},
+        gridComplete: function () {
+        	$("#gbox_tj-grid-table").attr("style","width:100%;");
+            $("#gbox_tj-grid-table").find("div").attr("style","width:100%;");
+            $("#gview_tj-grid-table").children("div:first").attr("hidden","true");
+            $("#gbox_tj-grid-table").find("table").attr("style","width:100%;");
+            comGridComplete("tj-grid-table", "editRecord");
+            
+        },
+		onPaging: function(){
+			comGridPage("tj-grid-table");
+		}
+	});
+	// 调整jqgrid
+	ajustJqGrid(tj_grid_selector, tj_pager_selector);
+	 
+};
+
+
+/**
+ * 关闭当前窗口
+ */
+function closeWh() {
+	$("#wh").window('close');
+}
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrWxhwtjcxInfo.js

@@ -0,0 +1,170 @@
+/**
+ * js
+ */
+var whtj_grid_selector = "#whtj-grid-table";
+var whtj_pager_selector = "#whtj-grid-pager";
+jQuery(function($) {
+	// 初始化Grid
+});
+
+
+/**
+ * 初始化Grid
+ */
+function whtj_initGrid() {
+	// 数据表格初始化
+	jQuery(whtj_grid_selector).jqGrid({
+		url : basePath + '/jyrwxhw/list',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : ['所在地','企业名称','类别','码头名称','万吨级泊位数量','千吨级泊位数量','吞吐量(TEU)','吞吐量(吨)','所在港区','建设规模','是否持有附证','主要作业货种','所在区域'],
+		colModel : [ {
+			name : 'bz',
+			index : 'bz',
+			editable : false,
+			sortable : false
+		},{
+			name : 'gkjyr',
+			index : 'gkjyr',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.syhgmt == null || row.syhgmt == '' ) {
+					return 0;
+				}
+				return row.syhgmt;
+			}
+		},{
+			name : 'byzd1',
+			index : 'byzd1',
+			editable : false,
+			sortable : false
+		},{
+			name : 'bwmc',
+			index : 'bwmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'wd',
+			index : 'wd',
+			editable : false,
+			sortable : false
+		},{
+			name : 'qd',
+			index : 'qd',
+			editable : false,
+			sortable : false
+		},{
+			name : 'jzxttl',
+			index : 'jzxttl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'ttl',
+			index : 'qd',
+			editable : false,
+			sortable : false
+		},{
+			name : 'gqmc',
+			index : 'gqmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'gm',
+			index : 'gm',
+			editable : false,
+			sortable : false
+		},{
+			name : 'sffz',
+			index : 'sffz',
+			editable : false,
+			sortable : false
+		},{
+			name : 'hz',
+			index : 'hz',
+			editable : false,
+			sortable : false
+		},{
+			name : 'qylx',
+			index : 'qylx',
+			editable : false,
+			sortable : false
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : whtj_pager_selector, //定义翻页用的导航栏
+		page : 1, //设置初始的页码,初始为1
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
+		altRows : true, //设置为交替行表格,默认为false
+		multiselect : true, //可以多选://控制是否有chechbox选择框
+		multiboxonly : true, //只有选择checkbox才会起作用 
+		multiselect :true, //是否可以多选
+		loadComplete : function() {
+			var table = this;
+			setTimeout(function() {
+				updatePagerIcons(table);
+				enableTooltips(table);
+				
+			}, 0);
+		},
+		prmNames : {
+             oper : "oper",
+             page : "page",
+             rows : "rows",
+             sort : "sidx",
+             order : "sord"
+        },
+		jsonReader : {
+			root : "list", // json中代表实际模型数据的入口
+			page : "page", // json中代表当前页码的数据
+			total : "pages", // json中代表页码总数的数据
+			records : "total", // json中代表数据行总数的数据
+			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
+		},
+        gridComplete: function () {
+        	$("#gbox_whtj-grid-table").attr("style","width:100%;");
+            $("#gbox_whtj-grid-table").find("div").attr("style","width:100%;");
+            $("#gview_whtj-grid-table").children("div:first").attr("hidden","true");
+            $("#gbox_whtj-grid-table").find("table").attr("style","width:100%;");
+            comGridComplete("whtj-grid-table", "editRecord");
+            
+        },
+		onPaging: function(){
+			comGridPage("whtj-grid-table");
+		}
+	});
+	// 调整jqgrid
+	ajustJqGrid(whtj_grid_selector, whtj_pager_selector);
+	 
+};
+
+
+/**
+ * 关闭当前窗口
+ */
+function closeWh() {
+	$("#wh").window('close');
+}
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/WxhwName.js

@@ -12,7 +12,6 @@ jQuery(function($) {
  * 初始化Grid
  */
 function wxhw_initGrid(szd) {
-	alert(szd);
 //	resizePageGrid(grid_selector);
 	// 数据表格初始化
 //	jQuery(wxhw_grid_selector).jqGrid("clearGridData");

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/index.js

@@ -3,18 +3,20 @@
  */
 var grid_selector = "#grid-table";
 var pager_selector = "#grid-pager";
+var scouce;
+var jyrInfo;
 jQuery(function($) {
 	// 初始化Grid
 	initGrid();
+	$("#jyrwin").window("close");
 	$("#win").window("close");
-	$("#wh").window("close");
+	$("#jyrinfo").window("close");
+	
 	
 	getgq();
 	xzqhSelect();
 	
 });
-
-
 /**
  * 初始化Grid
  */
@@ -24,7 +26,6 @@ function initGrid() {
 	// 数据表格初始化
 	jQuery(grid_selector).jqGrid({
 		url : basePath + '/jyr/list',
-		
 		mtype : "POST", //提交方式
 		datatype : "json",
 		autowidth: false,
@@ -160,11 +161,65 @@ function initGrid() {
         },
 		onPaging: function(){
 			comGridPage("grid-table");
+		},
+		ondblClickRow : function (id,row,cel,eve) {
+			
+			$.ajax({
+				type : 'POST',
+				dataType : "json",
+				data : {"id":id},
+				url : basePath + '/jyr/initEdit',//请求的路径				
+				success : function(data) {
+//					$("#win").window("open");
+//					jyrmanageInfo(data);
+					$("#jyrwin").window({title:"查看"});
+					$("#jyrwin").window("open");
+					$("#jyrInfoform").form("reset");//重置表单数据
+					
+					$("#tab-tools").attr("hidden",true);
+					manageInfo(data);
+					$("#tt").tabs('enableTab',1);
+					$("#tt").tabs('enableTab',2);
+					$("#tt").tabs('enableTab',3);
+					bw_initGrid(data[0].id);
+					ck_initGrid(data[0].id);
+					dc_initGrid(data[0].id);
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+					alert("error");
+		        }
+			});
+			
 		}
 	});
 	// 调整jqgrid
 	ajustJqGrid(grid_selector, pager_selector);
 };
+
+
+/**
+ * 下拉框绑定
+ */
+function getselectedInfo (souce,url,parama,select) {
+	$.ajax({
+		type : "post",
+		url : basePath + url,
+		data : parama,
+		success : function (data) {
+			$(select).empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (this.optVal == souce) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $(select).append(optionStr);
+		}
+	});
+}
 /**
  * 选择所在地时联动港口信息
  */
@@ -250,12 +305,45 @@ function searchRecord() {
 };
 
 /**
+ * 编辑信息
+ */
+function editInfo() {
+	// 获取选择行
+	var ids = getMultiData(grid_selector);
+	if(isNull(ids) || ids.indexOf(",")!=-1) {
+		layer.alert("请选择且只选择一条记录");
+	} else {
+		$("#szd2").attr("disabled","true");
+	    $.ajax({
+			type : 'POST',
+			dataType : "json",
+			data : {"id":ids},
+			url : basePath + '/jyr/initEdit',//请求的路径				
+			success : function(data) {
+				$("#jyrwin").window({title:"编辑"});
+				$("#jyrwin").window("open");
+				
+				$("#jyrInfoform").form("reset");//重置表单数据
+				
+				$("#tab-tools").removeAttr("hidden");
+				manageInfo(data);
+				$("#tt").tabs("disableTab","泊位信息");
+				$("#tt").tabs("disableTab","堆场信息");
+				$("#tt").tabs("disableTab","仓库信息");
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+	        }
+		});
+	}
+};
+/**
  * 增加信息
  */
-function addInfo() {
-	$("#win").window("open");
+function addJyrInfo() {
+	alert(1);
+	$("#jyrwin").window("open");
 	$("#szd2").removeAttr("disabled");
-	$("#win").window({title:"新增"});
+	$("#jyrwin").window({title:"新增"});
 	// 清空表单信息
 	comClearFormData("#jyrInfoform");
 	//加载数据
@@ -278,14 +366,14 @@ function addInfo() {
  */
 function delInfo() {
 	// 获取选择行
-	var ids = getMultiData(grid_selector);
+	var ids = getMultiData(grid_selector);//此ids是多个id组成的字符串
 	if(!isNull(ids)) {
 		layer.confirm('确定删除吗?', {icon: 3, title:'提示'}, function(index){
 			$.ajax({
 				type : 'POST',
 				dataType : "json",
 				data : {"ids":ids},
-				url : basePath + '/jyr/del',//请求的路径				
+				url : basePath + '/jyr/delJyrInfo',//请求的路径				
 				success : function(data) {
 					layer.close(index);
 					searchRecord();
@@ -299,128 +387,16 @@ function delInfo() {
 		layer.alert("请选择记录");
 	}
 };
-
-/**
- * 编辑信息
- */
-function editInfo() {
-	$("#szd2").attr("disabled","true");
-	// 获取选择行
-	var ids = getMultiData(grid_selector);
-	if(isNull(ids) || ids.indexOf(",")!=-1) {
-		layer.alert("请选择且只选择一条记录");
-	} else {
-	    $.ajax({
-			type : 'POST',
-			dataType : "json",
-			data : {"id":ids},
-			url : basePath + '/jyr/initEdit',//请求的路径				
-			success : function(data) {
-				$("#win").window("open");
-				manageInfo(data);
-			},
-			error: function (XMLHttpRequest, textStatus, errorThrown) {
-	        }
-		});
-	}
-};
-var scouce;
-/**
- * 数据处理
- * @param data
- */
-function manageInfo (data) {
-	scouce = data;
-	//加载所在地数据信息
-	getSzd(data[0].szd);
-	//绑定关联下拉框数据
-	var szgq = data[0].szgq;
-	var parama = {"szd":$("#szd2").val()};
-	//加载港区下拉框信息
-	getselectedInfo(szgq,"/jyr/getGq",parama,"#szgq2");
-	//加载行政区划下拉框信息
-	$('#xzqh').selectpicker('val',data[0].xzqh);
-	//加载上级港口经营人信息
-	getSelect(data[0].parentJyrId); 
-	
-	//加载所属行业大类
-	gethydl(data[0].sshydl);
-	//加载所属行业中类
-	gethyz(data[0].sshyz);
-	
-	$("#qylx2").find("[value='"+data[0].qylx+"']").attr("selected","true");
-	
-	
-	$("#id").val(data[0].id);
-	$("#recordCode").val(data[0].recordCode);
-	$("#gkjyr2").val(data[0].gkjyr);
-	$("#yzbm").val(data[0].yzbm);
-	$("#gkjyr2").val(data[0].gkjyr);
-	//设置日起
-	$("#fzrq").datetimebox("setValue",formatDate(new Date(data[0].fzrq)));
-	$("#bafzrq").datetimebox("setValue",formatDate(new Date(data[0].bafzrq)));
-	$("#bayxq").datetimebox("setValue",formatDate(new Date(data[0].bayxq)));
-	$("#fzyxq").datetimebox("setValue",formatDate(new Date(data[0].fzyxq)));
-	//设置input
-	$("#bgdz").val(data[0].bgdz);
-	$("#fzjg").val(data[0].fzjg);
-	$("#zyhz").val(data[0].zyhz);
-	$("#jyfw").val(data[0].jyfw);
-	$("#jyqy").val(data[0].jyqy);
-//	alert($("#fddbr").html());
-	$("#fddbr2").val(data[0].fddbr);
-	$("#lxdh").val(data[0].lxdh);
-	$("#cz").val(data[0].cz);
-	$("#frzjhm2").val(data[0].byzd3);
-	$("#aqbmfzr").val(data[0].aqbmfzr);
-	$("#aqfzrlxdh").val(data[0].aqfzrlxdh);
-	$("#aqfzrsj").val(data[0].aqfzrsj);
-	$("#aqfzrzbdh").val(data[0].aqfzrzbdh);
-	$("#aqzgbm").val(data[0].aqzgbm);
-	$("#aqgljg").val(data[0].aqgljg);
-	$("#zzagrysl").val(data[0].zzagrysl);
-	$("#zcze").val(data[0].zcze);
-	$("#xsje").val(data[0].xsje);
-	$("#gsyyzzbh").val(data[0].gsyyzzbh);
-	$("#tzze").val(data[0].tzze);
-	$("#zczb").val(data[0].zczb);
-	$("#qyzzjgdm").val(data[0].qyzzjgdm);
-	$("#qyaqdj").val(data[0].qyaqdj);
-	$("#rs").val(data[0].rs);
-	$("#gjjgdm").val(data[0].gjjgdm);
-	$("#gkwxhwzyfzbh").val(data[0].gkwxhwzyfzbh);
-	$("#gkssbafhzsbh").val(data[0].gkssbafhzsbh);
-	$("#bafzjg").val(data[0].bafzjg);
-	$("#zywxhwpm").text(data[0].zywxhwpm);
-	getzdsp(data[0].sfzdsp);
-	getleibie(data[0].qyxz);
-//	$("#").val(data[0].);
-//	$("#form").form("load",data[0]);
-	
+//统计信息查询
+function tjxx () {
+	$("#jyrinfo").window("open");
+	tj_initGrid();
 }
-/**
- * 下拉框绑定
- */
-function getselectedInfo (souce,url,parama,select) {
-	$.ajax({
-		type : "post",
-		url : basePath + url,
-		data : parama,
-		success : function (data) {
-			$(select).empty();
-			var optionStr = "<option value = ''>--请选择--</option>";
-		    $.each(data, function() {
-		    	if (this.optVal == souce) {
-		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
-		    	} else {
-		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
-		    	}
-		        
-		    });
-		    $(select).append(optionStr);
-		}
-	});
+
+function whqy () {
+	alert($("#jyrinfo").html());
 }
+
 //加载行政区划下拉框选项
 function xzqhSelect() {
  $.ajax({
@@ -432,7 +408,9 @@ function xzqhSelect() {
      }
  });
 }
- 
+function closeWin () {
+	$("#jyrwin").window("close");
+}
 
 formatterDate = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();