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

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/common/util/FileUtil.java

@@ -0,0 +1,144 @@
+package com.xt.js.gkaq.common.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import com.xt.js.gkaq.common.Constants;
+import com.xt.js.gkaq.frame.model.UserModel;
+/**
+ * 文件工具类
+ * @author lxh
+ *
+ */
+public class FileUtil {
+
+	/**
+	 * 文件上传
+	 * @param request
+	 * @return
+	 * @throws IllegalStateException
+	 * @throws IOException
+	 */
+	public static String fileUp (HttpServletRequest request) throws IllegalStateException, IOException {
+		UserModel user = (UserModel) request.getSession().getAttribute(Constants.SESSION_KEY_USER);//当前用户
+    	String webpath = request.getSession().getServletContext().getRealPath("/uplod");//程序路径
+    	String filename = "";
+    	File webFile = new File(webpath);
+    	//判断文件夹是否存在，不存在则新建
+	   	 if (!webFile.exists()) {
+	   		webFile.mkdir();
+	   	 }
+    	// 创建一个通用的多部分解析器
+     	CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(request.getSession()
+     	        .getServletContext());
+     	// 判断 request 是否有文件上传,即多部分请求
+     	if (multipartResolver.isMultipart(request)) {
+     		// 转换成多部分request
+     	    MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
+     	    // 取得request中的所有文件名
+             Iterator<String> iter = multiRequest.getFileNames();  
+             while(iter.hasNext()){  
+                 //取得上传文件  
+                 MultipartFile file = multiRequest.getFile(iter.next());  
+                 if(file != null){  
+                     //取得当前上传文件的文件名称  
+                     String myFileName = file.getOriginalFilename();
+                     //如果名称不为“”,说明该文件存在，否则说明该文件不存在  
+                     if(myFileName.trim() != ""){  
+                    	//上传文件类型
+                         String fileType = myFileName.substring(myFileName.indexOf("."));
+                    	 Date time = new Date();
+                       	 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+                         //重命名上传后的文件名  
+                         String fileName = user.getId() + sdf.format(time)+fileType;  
+                         filename = fileName;
+                         //定义上传路径  
+                         String path = webpath+"/" + fileName;  
+                         File localFile = new File(path);
+                         file.transferTo(localFile);  
+                     }  
+                 }  
+           }
+     	}
+     	return filename;
+	}
+	
+	/**
+     * 将文件转成流
+     * @param is
+     * @return
+     * @throws IOException
+     */
+	public static byte[] inputStreamToByte(InputStream is) throws IOException {
+    	ByteArrayOutputStream bAOutputStream = new ByteArrayOutputStream();
+    	int ch;
+    	while((ch = is.read() ) != -1){
+    	bAOutputStream.write(ch);
+    	}
+    	byte data [] =bAOutputStream.toByteArray();
+    	bAOutputStream.close();
+    	return data;
+    }
+    /**
+     * 文件删除
+     * @param filepath
+     */
+    public static void filedelete (String filepath) {
+    	File f = new File(filepath);
+    	//是否是文件，存在则删除
+	   	 if (f.isFile()) {
+	   		f.delete();
+	   	 }
+    }
+    /**
+     * 文件下载
+     * @param request
+     * @param response
+     * @param value 文件内容
+     * @param wjm 文件名称（带后缀名的）
+     */
+    public static void fileDownLoad (HttpServletRequest request,HttpServletResponse response,byte[] value,String wjm) {
+    	String userAgent = request.getHeader("User-Agent"); 
+    	try {
+	    	//针对IE或者以IE为内核的浏览器：
+	    	if (userAgent.contains("MSIE")||userAgent.contains("Trident")) {
+				wjm = java.net.URLEncoder.encode(wjm, "UTF-8");
+				
+	    	} else {
+	    	//非IE浏览器的处理：
+				wjm = new String(wjm.getBytes("UTF-8"),"ISO-8859-1");
+	    	}
+    		OutputStream out = response.getOutputStream();
+    		InputStream in = new ByteArrayInputStream(value);
+    		response.setContentType("application/octet-stream;charset=UTF-8");  
+    		response.setHeader("Content-Type","application/vnd.ms-excel;charset=utf-8"); //弹出保存框的语句，后面可以填入默认名称和类型           
+    		response.setHeader("Content-Disposition","Attachment;filename="+wjm); 
+    		response.setCharacterEncoding("UTF-8");
+    		byte[] buffer = new byte[1024]; int size = 0;
+    		while ((size = in.read(buffer)) != -1) {     
+    			out.write(buffer, 0, size); 
+    			}     
+    		out.flush();      
+    		out.close(); 
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		} catch (Exception  e) {
+			e.printStackTrace();
+		} 
+    }
+}

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

@@ -0,0 +1,12 @@
+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.FjbModel;
+
+public interface FjbModelMapper extends BaseMapper<FjbModel> {
+	List<FjbModel> selectByInfo (FjbModel model) ;
+	
+	FjbModel selectByWjnr (FjbModel model);
+}

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

@@ -0,0 +1,13 @@
+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.GksssbListModel;
+import com.xt.js.gkaq.web.model.GksssbModel;
+import com.xt.js.gkaq.web.model.GksssbTjModel;
+
+public interface GksssbModelMapper extends BaseMapper<GksssbModel> {
+	public List<GksssbListModel> selectByInfo(GksssbListModel model);
+	public List<GksssbTjModel> selectTjInfo (GksssbTjModel model);
+}

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

@@ -3,9 +3,13 @@ package com.xt.js.gkaq.web.mappers;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
 import com.xt.js.gkaq.web.model.JyrUserListModel;
 import com.xt.js.gkaq.web.model.JyrUserModel;
+import com.xt.js.gkaq.web.model.JyrUserTJModel;
 
 public interface JyrUserModelMapper extends BaseMapper<JyrUserModel> {
 	public List<JyrUserListModel> selectByInfo(JyrUserModel model);
+	public List<JyrUserTJModel> selectTJByInfo (JyrUserModel model);
+	public List<ComboBoxDto> getSelect (String code);
 }

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

@@ -3,8 +3,12 @@ package com.xt.js.gkaq.web.mappers;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.model.CodeModelDto;
+import com.xt.js.gkaq.web.model.RyzsbInfoModel;
 import com.xt.js.gkaq.web.model.RyzsbModel;
 
 public interface RyzsbModelMapper extends BaseMapper<RyzsbModel> {
-	public List<RyzsbModel> selectByInfo(RyzsbModel model);
+	public List<RyzsbInfoModel> selectByInfo(RyzsbModel model);
+	public List<ComboBoxDto> selectCode(CodeModelDto model);
 }

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

@@ -1,7 +1,5 @@
 package com.xt.js.gkaq.web.model;
 
-import java.sql.Blob;
-
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
  * ¸½¼þ±íModel
@@ -10,12 +8,16 @@ import com.xt.js.gkaq.common.BaseUUIDModel;
  */
 public class FjbModel extends BaseUUIDModel {
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2745694143144635827L;
 	private String wjm;
 	private String wjhzm;
 	private String bz;
 	private String wjcflj;
 	private String wjnr;
-	private String wjdx;
+	private Long wjdx;
 	private String ssid;
 	private String sslx;
 	private String lx;
@@ -35,6 +37,66 @@ public class FjbModel extends BaseUUIDModel {
 	private String byzd5;
 	private String szd;//ËùÔÚµØ
 	
+	public String getWjm() {
+		return wjm;
+	}
+	public void setWjm(String wjm) {
+		this.wjm = wjm;
+	}
+	public String getWjhzm() {
+		return wjhzm;
+	}
+	public void setWjhzm(String wjhzm) {
+		this.wjhzm = wjhzm;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getWjcflj() {
+		return wjcflj;
+	}
+	public void setWjcflj(String wjcflj) {
+		this.wjcflj = wjcflj;
+	}
+	public String getWjnr() {
+		return wjnr;
+	}
+	public void setWjnr(String wjnr) {
+		this.wjnr = wjnr;
+	}
+	public Long getWjdx() {
+		return wjdx;
+	}
+	public void setWjdx(Long wjdx) {
+		this.wjdx = wjdx;
+	}
+	public String getSsid() {
+		return ssid;
+	}
+	public void setSsid(String ssid) {
+		this.ssid = ssid;
+	}
+	public String getSslx() {
+		return sslx;
+	}
+	public void setSslx(String sslx) {
+		this.sslx = sslx;
+	}
+	public String getLx() {
+		return lx;
+	}
+	public void setLx(String lx) {
+		this.lx = lx;
+	}
+	public String getGq() {
+		return gq;
+	}
+	public void setGq(String gq) {
+		this.gq = gq;
+	}
 	public String getSftb() {
 		return sftb;
 	}

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

@@ -0,0 +1,108 @@
+package com.xt.js.gkaq.web.model;
+/**
+ * 安全设施设备扩展Model
+ * @author 李小虎
+ *
+ */
+public class GksssbListModel {
+	private String id;
+	private String ssmc;
+	private String ggxh;
+	private String sl;
+	private String yxq;
+	private String gkjyr;
+	private String yjfl;
+	private String ejfl;
+	private String tbr;
+	private String lxdh;
+	private String cfcs;
+	private String szd;
+	private String gqmc;
+	private String bz;
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getSsmc() {
+		return ssmc;
+	}
+	public void setSsmc(String ssmc) {
+		this.ssmc = ssmc;
+	}
+	public String getGgxh() {
+		return ggxh;
+	}
+	public void setGgxh(String ggxh) {
+		this.ggxh = ggxh;
+	}
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public String getYxq() {
+		return yxq;
+	}
+	public void setYxq(String yxq) {
+		this.yxq = yxq;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getYjfl() {
+		return yjfl;
+	}
+	public void setYjfl(String yjfl) {
+		this.yjfl = yjfl;
+	}
+	public String getEjfl() {
+		return ejfl;
+	}
+	public void setEjfl(String ejfl) {
+		this.ejfl = ejfl;
+	}
+	public String getTbr() {
+		return tbr;
+	}
+	public void setTbr(String tbr) {
+		this.tbr = tbr;
+	}
+	public String getLxdh() {
+		return lxdh;
+	}
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+	public String getCfcs() {
+		return cfcs;
+	}
+	public void setCfcs(String cfcs) {
+		this.cfcs = cfcs;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getGqmc() {
+		return gqmc;
+	}
+	public void setGqmc(String gqmc) {
+		this.gqmc = gqmc;
+	}
+	
+	
+}

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

@@ -0,0 +1,196 @@
+package com.xt.js.gkaq.web.model;
+
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * ¸Û¿ÚÉèÊ©É豸Model
+ * @author ÀîС»¢
+ *
+ */
+public class GksssbModel extends BaseUUIDModel {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7312447059388292213L;
+	private String ssmc;
+	private String qymc;
+	private String tbr;
+	private String lxdh;
+	private String szd;
+	private String szgq;
+	private String ggxh;
+	private String sl;
+	private Date yxq;
+	private String cfcs;
+	private String bz;
+	private String sldw;
+	private String yjfl;
+	private String ejfl;
+	
+	private String sftb;
+	private String tbzt;
+	private Long tbdyid;
+	private String qylb;
+	private Long ssqy;
+	private String recordcode;
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	
+	public String getSsmc() {
+		return ssmc;
+	}
+	public void setSsmc(String ssmc) {
+		this.ssmc = ssmc;
+	}
+	public String getQymc() {
+		return qymc;
+	}
+	public void setQymc(String qymc) {
+		this.qymc = qymc;
+	}
+	public String getTbr() {
+		return tbr;
+	}
+	public void setTbr(String tbr) {
+		this.tbr = tbr;
+	}
+	public String getLxdh() {
+		return lxdh;
+	}
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(String szgq) {
+		this.szgq = szgq;
+	}
+	public String getGgxh() {
+		return ggxh;
+	}
+	public void setGgxh(String ggxh) {
+		this.ggxh = ggxh;
+	}
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public Date getYxq() {
+		return yxq;
+	}
+	public void setYxq(Date yxq) {
+		this.yxq = yxq;
+	}
+	public String getCfcs() {
+		return cfcs;
+	}
+	public void setCfcs(String cfcs) {
+		this.cfcs = cfcs;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getSldw() {
+		return sldw;
+	}
+	public void setSldw(String sldw) {
+		this.sldw = sldw;
+	}
+	public String getYjfl() {
+		return yjfl;
+	}
+	public void setYjfl(String yjfl) {
+		this.yjfl = yjfl;
+	}
+	public String getEjfl() {
+		return ejfl;
+	}
+	public void setEjfl(String ejfl) {
+		this.ejfl = ejfl;
+	}
+	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;
+	}
+	
+	
+}

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

@@ -0,0 +1,60 @@
+package com.xt.js.gkaq.web.model;
+/**
+ * 安全设施设备统计Model
+ * @author 李小虎
+ *
+ */
+public class GksssbTjModel {
+	private String sl;
+	private String ssmc;
+	private String sldw;
+	private String szd;
+	private String szgq;
+	private String yjfl;
+	private String qymc;
+	
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public String getSsmc() {
+		return ssmc;
+	}
+	public void setSsmc(String ssmc) {
+		this.ssmc = ssmc;
+	}
+	public String getSldw() {
+		return sldw;
+	}
+	public void setSldw(String sldw) {
+		this.sldw = sldw;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(String szgq) {
+		this.szgq = szgq;
+	}
+	public String getYjfl() {
+		return yjfl;
+	}
+	public void setYjfl(String yjfl) {
+		this.yjfl = yjfl;
+	}
+	public String getQymc() {
+		return qymc;
+	}
+	public void setQymc(String qymc) {
+		this.qymc = qymc;
+	}
+	
+	
+}

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

@@ -0,0 +1,34 @@
+package com.xt.js.gkaq.web.model;
+
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 经营人人员统计查询Model
+ * @author 李小虎
+ *
+ */
+public class JyrUserTJModel {
+	private String qymc;
+	private String rylx;
+	private String rs;
+	public String getQymc() {
+		return qymc;
+	}
+	public void setQymc(String qymc) {
+		this.qymc = qymc;
+	}
+	public String getRylx() {
+		return rylx;
+	}
+	public void setRylx(String rylx) {
+		this.rylx = rylx;
+	}
+	public String getRs() {
+		return rs;
+	}
+	public void setRs(String rs) {
+		this.rs = rs;
+	}
+	
+}

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

@@ -0,0 +1,93 @@
+package com.xt.js.gkaq.web.model;
+
+import java.sql.Blob;
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 人员证书表扩展
+ * @author 李小虎
+ *
+ */
+public class RyzsbInfoModel{
+
+	private String id;
+	private String ryid;//人员编号（身份证号）
+	private String zsmc;//证书名称
+	private String zszl;//证书种类
+	private String zsbh;//证书编号
+	private Date yxq;//有效期
+	private String bz;//备注
+	private String zsnr;//证书内容(关联的大字段表的id)
+	private String szd;//所在地
+	private String fjid;
+	private String wjm;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getRyid() {
+		return ryid;
+	}
+	public void setRyid(String ryid) {
+		this.ryid = ryid;
+	}
+	public String getZsmc() {
+		return zsmc;
+	}
+	public void setZsmc(String zsmc) {
+		this.zsmc = zsmc;
+	}
+	public String getZszl() {
+		return zszl;
+	}
+	public void setZszl(String zszl) {
+		this.zszl = zszl;
+	}
+	public String getZsbh() {
+		return zsbh;
+	}
+	public void setZsbh(String zsbh) {
+		this.zsbh = zsbh;
+	}
+	public Date getYxq() {
+		return yxq;
+	}
+	public void setYxq(Date yxq) {
+		this.yxq = yxq;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getZsnr() {
+		return zsnr;
+	}
+	public void setZsnr(String zsnr) {
+		this.zsnr = zsnr;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getFjid() {
+		return fjid;
+	}
+	public void setFjid(String fjid) {
+		this.fjid = fjid;
+	}
+	public String getWjm() {
+		return wjm;
+	}
+	public void setWjm(String wjm) {
+		this.wjm = wjm;
+	}
+	
+	
+}

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

@@ -1,6 +1,7 @@
 package com.xt.js.gkaq.web.model;
 
 import java.sql.Blob;
+import java.util.Date;
 
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
@@ -19,7 +20,7 @@ public class RyzsbModel extends BaseUUIDModel {
 	private String zsmc;//证书名称
 	private String zszl;//证书种类
 	private String zsbh;//证书编号
-	private String yxq;//有效期
+	private Date yxq;//有效期
 	private String bz;//备注
 	private String zsnr;//证书内容(关联的大字段表的id)
 	
@@ -59,10 +60,10 @@ public class RyzsbModel extends BaseUUIDModel {
 	public void setZsbh(String zsbh) {
 		this.zsbh = zsbh;
 	}
-	public String getYxq() {
+	public Date getYxq() {
 		return yxq;
 	}
-	public void setYxq(String yxq) {
+	public void setYxq(Date yxq) {
 		this.yxq = yxq;
 	}
 	public String getBz() {

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

@@ -0,0 +1,11 @@
+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.BloBModel;
+import com.xt.js.gkaq.web.model.RyzsbModel;
+
+public interface CopyOfBloBService extends BaseUUIDModelService<BloBModel> {
+	
+}

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

@@ -0,0 +1,14 @@
+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.BloBModel;
+import com.xt.js.gkaq.web.model.FjbModel;
+import com.xt.js.gkaq.web.model.RyzsbModel;
+
+public interface FjbService extends BaseUUIDModelService<FjbModel> {
+	List<FjbModel> selectByInfo (FjbModel model) ;
+	
+	FjbModel selectByWjnr (FjbModel model);
+}

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

@@ -0,0 +1,13 @@
+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.GksssbListModel;
+import com.xt.js.gkaq.web.model.GksssbModel;
+import com.xt.js.gkaq.web.model.GksssbTjModel;
+
+public interface GksssbService extends BaseUUIDModelService<GksssbModel> {
+	public List<GksssbListModel> selectByInfo (GksssbListModel model);
+	public List<GksssbTjModel> selectTjInfo (GksssbTjModel model);
+}

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

@@ -3,9 +3,13 @@ package com.xt.js.gkaq.web.service;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
 import com.xt.js.gkaq.web.model.JyrUserListModel;
 import com.xt.js.gkaq.web.model.JyrUserModel;
+import com.xt.js.gkaq.web.model.JyrUserTJModel;
 
 public interface JyrUserService extends BaseUUIDModelService<JyrUserModel> {
 	public List<JyrUserListModel> selectInfo (JyrUserModel model);
+	public List<JyrUserTJModel> selectTJByInfo (JyrUserModel model);
+	public List<ComboBoxDto> getSelect (String code);
 }

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

@@ -3,8 +3,12 @@ package com.xt.js.gkaq.web.service;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.model.CodeModelDto;
+import com.xt.js.gkaq.web.model.RyzsbInfoModel;
 import com.xt.js.gkaq.web.model.RyzsbModel;
 
 public interface RyzsbService extends BaseUUIDModelService<RyzsbModel> {
-	public List<RyzsbModel> selectInfo (RyzsbModel model);
+	public List<RyzsbInfoModel> selectInfo (RyzsbModel model);
+	public List<ComboBoxDto> selectCode(CodeModelDto model);
 }

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

@@ -19,8 +19,5 @@ public class BloBServiceImpl extends BaseUUIDModelServiceImpl<BloBModel> impleme
 	protected BaseMapper<BloBModel> getMapper() {
 		return mapper;
 	}
-
-
-	
    
 }

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

@@ -0,0 +1,41 @@
+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.BloBModelMapper;
+import com.xt.js.gkaq.web.mappers.FjbModelMapper;
+import com.xt.js.gkaq.web.model.BloBModel;
+import com.xt.js.gkaq.web.model.FjbModel;
+import com.xt.js.gkaq.web.service.BloBService;
+import com.xt.js.gkaq.web.service.FjbService;
+
+@Service
+public class FjbServiceImpl extends BaseUUIDModelServiceImpl<FjbModel> implements FjbService {
+	@Autowired
+	FjbModelMapper mapper;
+	
+	@Override
+	protected BaseMapper<FjbModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<FjbModel> selectByInfo(FjbModel model) {
+		return mapper.selectByInfo(model);
+	}
+
+	@Override
+	public FjbModel selectByWjnr(FjbModel model) {
+		return mapper.selectByWjnr(model);
+	}
+
+
+	
+   
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/GksssbServiceImpl.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.GksssbModelMapper;
+import com.xt.js.gkaq.web.model.GksssbListModel;
+import com.xt.js.gkaq.web.model.GksssbModel;
+import com.xt.js.gkaq.web.model.GksssbTjModel;
+import com.xt.js.gkaq.web.service.GksssbService;
+
+@Service
+public class GksssbServiceImpl extends BaseUUIDModelServiceImpl<GksssbModel> implements GksssbService {
+	@Autowired
+	GksssbModelMapper mapper;
+	
+	@Override
+	protected BaseMapper<GksssbModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<GksssbListModel> selectByInfo(GksssbListModel model) {
+		return mapper.selectByInfo(model);
+	}
+
+	@Override
+	public List<GksssbTjModel> selectTjInfo(GksssbTjModel model) {
+		return mapper.selectTjInfo(model);
+	}
+}

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

@@ -17,6 +17,7 @@ import com.xt.js.gkaq.web.model.BwModel;
 import com.xt.js.gkaq.web.model.GqModel;
 import com.xt.js.gkaq.web.model.JyrUserListModel;
 import com.xt.js.gkaq.web.model.JyrUserModel;
+import com.xt.js.gkaq.web.model.JyrUserTJModel;
 import com.xt.js.gkaq.web.service.BwService;
 import com.xt.js.gkaq.web.service.GqService;
 import com.xt.js.gkaq.web.service.JyrUserService;
@@ -35,4 +36,15 @@ public class JyrUserServiceImpl extends BaseUUIDModelServiceImpl<JyrUserModel> i
 	public List<JyrUserListModel> selectInfo(JyrUserModel model) {
 		return mapper.selectByInfo(model);
 	}
+
+	@Override
+	public List<JyrUserTJModel> selectTJByInfo(JyrUserModel model) {
+		// TODO Auto-generated method stub
+		return mapper.selectTJByInfo(model);
+	}
+
+	@Override
+	public List<com.xt.js.gkaq.dwxx.model.ComboBoxDto> getSelect(String code) {
+		return mapper.getSelect(code);
+	}
 }

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

@@ -7,7 +7,10 @@ import org.springframework.stereotype.Service;
 
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.model.CodeModelDto;
 import com.xt.js.gkaq.web.mappers.RyzsbModelMapper;
+import com.xt.js.gkaq.web.model.RyzsbInfoModel;
 import com.xt.js.gkaq.web.model.RyzsbModel;
 import com.xt.js.gkaq.web.service.RyzsbService;
 
@@ -22,10 +25,15 @@ public class RyzsbServiceImpl extends BaseUUIDModelServiceImpl<RyzsbModel> imple
 	}
 
 	@Override
-	public List<RyzsbModel> selectInfo(RyzsbModel model) {
+	public List<RyzsbInfoModel> selectInfo(RyzsbModel model) {
 		return mapper.selectByInfo(model);
 	}
 
+	@Override
+	public List<ComboBoxDto> selectCode(CodeModelDto model) {
+		return mapper.selectCode(model);
+	}
+
 	
    
 }

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

@@ -26,14 +26,6 @@ public class BloBVo extends BaseVo {
 	private String byzd5;
 	private String szd;//ËùÔÚµØ
 	
-	private String file;
-	
-	public String getFile() {
-		return file;
-	}
-	public void setFile(String file) {
-		this.file = file;
-	}
 	public String getId() {
 		return id;
 	}

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

@@ -0,0 +1,175 @@
+package com.xt.js.gkaq.web.vo;
+
+/**
+ * 附件表Vo
+ * @author 李小虎
+ *
+ */
+public class FjbVo{
+	private String id;
+	private String wjm;
+	private String wjhzm;
+	private String bz;
+	private String wjcflj;
+	private String wjnr;
+	private Long wjdx;
+	private String ssid;
+	private String sslx;
+	private String lx;
+	private String gq;
+	
+	
+	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 szd;//所在地
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getWjm() {
+		return wjm;
+	}
+	public void setWjm(String wjm) {
+		this.wjm = wjm;
+	}
+	public String getWjhzm() {
+		return wjhzm;
+	}
+	public void setWjhzm(String wjhzm) {
+		this.wjhzm = wjhzm;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getWjcflj() {
+		return wjcflj;
+	}
+	public void setWjcflj(String wjcflj) {
+		this.wjcflj = wjcflj;
+	}
+	public String getWjnr() {
+		return wjnr;
+	}
+	public void setWjnr(String wjnr) {
+		this.wjnr = wjnr;
+	}
+	public Long getWjdx() {
+		return wjdx;
+	}
+	public void setWjdx(Long wjdx) {
+		this.wjdx = wjdx;
+	}
+	public String getSsid() {
+		return ssid;
+	}
+	public void setSsid(String ssid) {
+		this.ssid = ssid;
+	}
+	public String getSslx() {
+		return sslx;
+	}
+	public void setSslx(String sslx) {
+		this.sslx = sslx;
+	}
+	public String getLx() {
+		return lx;
+	}
+	public void setLx(String lx) {
+		this.lx = lx;
+	}
+	public String getGq() {
+		return gq;
+	}
+	public void setGq(String gq) {
+		this.gq = gq;
+	}
+	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 getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	
+	
+}

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

@@ -0,0 +1,104 @@
+package com.xt.js.gkaq.web.vo;
+
+import com.xt.js.gkaq.common.BaseVo;
+
+/**
+ * 安全设施设备扩展Model
+ * @author 李小虎
+ *
+ */
+public class GksssbListVo extends BaseVo {
+	private String id;
+	private String ssmc;
+	private String ggxh;
+	private String sl;
+	private String yxq;
+	private String gkjyr;
+	private String yjfl;
+	private String ejfl;
+	private String tbr;
+	private String lxdh;
+	private String cfcs;
+	private String szd;
+	private String gqmc;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getSsmc() {
+		return ssmc;
+	}
+	public void setSsmc(String ssmc) {
+		this.ssmc = ssmc;
+	}
+	public String getGgxh() {
+		return ggxh;
+	}
+	public void setGgxh(String ggxh) {
+		this.ggxh = ggxh;
+	}
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public String getYxq() {
+		return yxq;
+	}
+	public void setYxq(String yxq) {
+		this.yxq = yxq;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getYjfl() {
+		return yjfl;
+	}
+	public void setYjfl(String yjfl) {
+		this.yjfl = yjfl;
+	}
+	public String getEjfl() {
+		return ejfl;
+	}
+	public void setEjfl(String ejfl) {
+		this.ejfl = ejfl;
+	}
+	public String getTbr() {
+		return tbr;
+	}
+	public void setTbr(String tbr) {
+		this.tbr = tbr;
+	}
+	public String getLxdh() {
+		return lxdh;
+	}
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+	public String getCfcs() {
+		return cfcs;
+	}
+	public void setCfcs(String cfcs) {
+		this.cfcs = cfcs;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getGqmc() {
+		return gqmc;
+	}
+	public void setGqmc(String gqmc) {
+		this.gqmc = gqmc;
+	}
+	
+	
+}

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

@@ -0,0 +1,63 @@
+package com.xt.js.gkaq.web.vo;
+
+import com.xt.js.gkaq.common.BaseVo;
+
+/**
+ * 安全设施设备统计Model
+ * @author 李小虎
+ *
+ */
+public class GksssbTjVo extends BaseVo {
+	private String sl;
+	private String ssmc;
+	private String sldw;
+	private String szd;
+	private String szgq;
+	private String yjfl;
+	private String qymc;
+	
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public String getSsmc() {
+		return ssmc;
+	}
+	public void setSsmc(String ssmc) {
+		this.ssmc = ssmc;
+	}
+	public String getSldw() {
+		return sldw;
+	}
+	public void setSldw(String sldw) {
+		this.sldw = sldw;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(String szgq) {
+		this.szgq = szgq;
+	}
+	public String getYjfl() {
+		return yjfl;
+	}
+	public void setYjfl(String yjfl) {
+		this.yjfl = yjfl;
+	}
+	public String getQymc() {
+		return qymc;
+	}
+	public void setQymc(String qymc) {
+		this.qymc = qymc;
+	}
+	
+	
+}

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

@@ -0,0 +1,199 @@
+package com.xt.js.gkaq.web.vo;
+
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * ¸Û¿ÚÉèÊ©É豸Model
+ * @author ÀîС»¢
+ *
+ */
+public class GksssbVo extends BaseVo {
+	private String id;
+	private String ssmc;
+	private String qymc;
+	private String tbr;
+	private String lxdh;
+	private String szd;
+	private String szgq;
+	private String ggxh;
+	private String sl;
+	private String yxq;
+	private String cfcs;
+	private String bz;
+	private String sldw;
+	private String yjfl;
+	private String ejfl;
+	
+	private String sftb;
+	private String tbzt;
+	private Long tbdyid;
+	private String qylb;
+	private Long ssqy;
+	private String recordcode;
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getSsmc() {
+		return ssmc;
+	}
+	public void setSsmc(String ssmc) {
+		this.ssmc = ssmc;
+	}
+	public String getQymc() {
+		return qymc;
+	}
+	public void setQymc(String qymc) {
+		this.qymc = qymc;
+	}
+	public String getTbr() {
+		return tbr;
+	}
+	public void setTbr(String tbr) {
+		this.tbr = tbr;
+	}
+	public String getLxdh() {
+		return lxdh;
+	}
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getSzgq() {
+		return szgq;
+	}
+	public void setSzgq(String szgq) {
+		this.szgq = szgq;
+	}
+	public String getGgxh() {
+		return ggxh;
+	}
+	public void setGgxh(String ggxh) {
+		this.ggxh = ggxh;
+	}
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public String getYxq() {
+		return yxq;
+	}
+	public void setYxq(String yxq) {
+		this.yxq = yxq;
+	}
+	public String getCfcs() {
+		return cfcs;
+	}
+	public void setCfcs(String cfcs) {
+		this.cfcs = cfcs;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getSldw() {
+		return sldw;
+	}
+	public void setSldw(String sldw) {
+		this.sldw = sldw;
+	}
+	public String getYjfl() {
+		return yjfl;
+	}
+	public void setYjfl(String yjfl) {
+		this.yjfl = yjfl;
+	}
+	public String getEjfl() {
+		return ejfl;
+	}
+	public void setEjfl(String ejfl) {
+		this.ejfl = ejfl;
+	}
+	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;
+	}
+	
+	
+}

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

@@ -0,0 +1,159 @@
+package com.xt.js.gkaq.web.vo;
+
+import java.sql.Blob;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 人员证书表Vo
+ * @author 李小虎
+ *
+ */
+public class RyzsbVo extends BaseVo {
+
+	private String id;
+	private String ryid;//人员编号（身份证号）
+	private String zsmc;//证书名称
+	private String zszl;//证书种类
+	private String zsbh;//证书编号
+	private String yxq;//有效期
+	private String bz;//备注
+	private String zsnr;//证书内容(关联的大字段表的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 szd;//所在地
+	
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getRyid() {
+		return ryid;
+	}
+	public void setRyid(String ryid) {
+		this.ryid = ryid;
+	}
+	public String getZsmc() {
+		return zsmc;
+	}
+	public void setZsmc(String zsmc) {
+		this.zsmc = zsmc;
+	}
+	public String getZszl() {
+		return zszl;
+	}
+	public void setZszl(String zszl) {
+		this.zszl = zszl;
+	}
+	public String getZsbh() {
+		return zsbh;
+	}
+	public void setZsbh(String zsbh) {
+		this.zsbh = zsbh;
+	}
+	public String getYxq() {
+		return yxq;
+	}
+	public void setYxq(String yxq) {
+		this.yxq = yxq;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getZsnr() {
+		return zsnr;
+	}
+	public void setZsnr(String zsnr) {
+		this.zsnr = zsnr;
+	}
+	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 getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	
+	
+}

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

@@ -21,7 +21,7 @@ public class ZdhqdVo extends BaseVo {
 
     private String zdfl;
 
-    private Date txsj;
+    private String txsj;
 
     private String tbr;
 
@@ -45,9 +45,9 @@ public class ZdhqdVo extends BaseVo {
 
     private String zdwh;
 
-    private Date fbrq;
+    private String fbrq;
 
-    private Date xdrq;
+    private String xdrq;
 
     private String sfczgc;
 
@@ -103,11 +103,11 @@ public class ZdhqdVo extends BaseVo {
 		this.zdfl = zdfl;
 	}
 
-	public Date getTxsj() {
+	public String getTxsj() {
 		return txsj;
 	}
 
-	public void setTxsj(Date txsj) {
+	public void setTxsj(String txsj) {
 		this.txsj = txsj;
 	}
 
@@ -199,19 +199,19 @@ public class ZdhqdVo extends BaseVo {
 		this.zdwh = zdwh;
 	}
 
-	public Date getFbrq() {
+	public String getFbrq() {
 		return fbrq;
 	}
 
-	public void setFbrq(Date fbrq) {
+	public void setFbrq(String fbrq) {
 		this.fbrq = fbrq;
 	}
 
-	public Date getXdrq() {
+	public String getXdrq() {
 		return xdrq;
 	}
 
-	public void setXdrq(Date xdrq) {
+	public void setXdrq(String xdrq) {
 		this.xdrq = xdrq;
 	}
 

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

@@ -5,8 +5,6 @@
     <id column="ID" property="id" jdbcType="VARCHAR" />
     <result column="VALUE" property="value" jdbcType="BLOB" />
     <result column="SZD" property="szd" jdbcType="VARCHAR" />
-
-
     <result column="SFTB" property="sftb" jdbcType="CHAR" />
     <result column="TBZT" property="tbzt" jdbcType="CHAR" />
     <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
@@ -24,12 +22,10 @@
     <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.String" >
     DELETE from AQ_BASIC_BLOB
     WHERE ID = #{id,jdbcType=VARCHAR}
@@ -90,8 +86,7 @@
 			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
 			TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,
 			BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
-	FROM
-			AQ_BASIC_BLOB
+	FROM AQ_BASIC_BLOB
 	WHERE ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
@@ -99,23 +94,6 @@
 			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
 			TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,
 			BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
-	FROM
-			AQ_BASIC_BLOB
+	FROM AQ_BASIC_BLOB
   </select>
-  <!-- <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.RyzsbModel">
-	  SELECT ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,
-			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
-			SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
-	  FROM AQ_BASIC_DWXX_RYZSB
-	<where>
-			RECORD_STATUS != '9'
-			<if test="id != null and id != '' ">
-				AND ID = #{id,jdbcType=VARCHAR}
-			</if>
-			<if test="ryid != null and ryid != '' ">
-				AND RYID = #{ryid,jdbcType=VARCHAR}
-			</if>
-			
-	</where>
-  </select> -->
 </mapper>

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

@@ -0,0 +1,158 @@
+<?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.FjbModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.FjbModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="WJM" property="wjm" jdbcType="VARCHAR" />
+    <result column="WJHZM" property="wjhzm" jdbcType="VARCHAR" />
+    <result column="BZ" property="bz" jdbcType="VARCHAR" />
+    <result column="WJCFLJ" property="wjcflj" jdbcType="VARCHAR" />
+    <result column="WJNR" property="wjnr" jdbcType="VARCHAR" />
+    <result column="WJDX" property="wjdx" jdbcType="DECIMAL" />
+    <result column="SSID" property="ssid" jdbcType="VARCHAR" />
+    <result column="SSLX" property="sslx" jdbcType="DECIMAL" />
+    <result column="LX" property="lx" jdbcType="DECIMAL" />
+    <result column="GQ" property="gq" jdbcType="DECIMAL" />
+    <result column="SZD" property="szd" 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>
+
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    DELETE from AQ_FJB
+    WHERE ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.RyzsbModel" >
+    insert into AQ_FJB (WJM,WJHZM,BZ,WJCFLJ,WJNR,WJDX,SSID,SSLX,LX,GQ,SZD,ID,
+						ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+						SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5)
+    values (
+     		#{wjm,jdbcType=VARCHAR},
+     		#{wjhzm,jdbcType=VARCHAR},
+     		#{bz,jdbcType=VARCHAR},
+     		#{wjcflj,jdbcType=VARCHAR},
+     		#{wjnr,jdbcType=VARCHAR},
+     		#{wjdx,jdbcType=DECIMAL},
+     		#{ssid,jdbcType=VARCHAR},
+     		#{sslx,jdbcType=VARCHAR},
+     		#{lx,jdbcType=VARCHAR},
+     		#{gq,jdbcType=VARCHAR},
+    		#{szd,jdbcType=VARCHAR}, 
+    		#{id,jdbcType=VARCHAR},
+    		
+     		#{createUser,jdbcType=VARCHAR}, 
+     		#{createTime,jdbcType=TIMESTAMP}, 
+     		#{updateUser,jdbcType=VARCHAR}, 
+     		#{updateTime,jdbcType=TIMESTAMP}, 
+     		#{state,jdbcType=DECIMAL},
+     		
+     		#{sftb,jdbcType=VARCHAR}, 
+     		#{tbzt,jdbcType=CHAR}, 
+     		#{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}
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.RyzsbModel" >
+    update AQ_FJB
+    set SZD = #{szd,jdbcType=VARCHAR},  
+      	WJM = #{wjm,jdbcType=VARCHAR},
+      	WJHZM = #{wjhzm,jdbcType=VARCHAR},
+      	BZ = #{bz,jdbcType=VARCHAR},
+      	WJCFLJ = #{wjcflj,jdbcType=VARCHAR},
+      	WJNR = #{wjnr,jdbcType=VARCHAR},
+      	WJDX = #{wjdx,jdbcType=DECIMAL},
+      	SSID = #{ssid,jdbcType=VARCHAR}, 
+		SSLX = #{sslx,jdbcType=VARCHAR},
+		LX = #{lx,jdbcType=VARCHAR},
+		GQ = #{gq,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}
+	
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+   SELECT WJM,WJHZM,BZ,WJCFLJ,WJNR,WJDX,SSID,SSLX,LX,GQ,SZD,ID,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			TBZT,TBDYID,SFTB,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	FROM
+			AQ_FJB
+	WHERE ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+     SELECT WJM,WJHZM,BZ,WJCFLJ,WJNR,WJDX,SSID,SSLX,LX,GQ,SZD,ID,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			TBZT,TBDYID,SFTB,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	FROM
+			AQ_FJB
+  </select>
+  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.FjbModel">
+	   SELECT WJM,WJHZM,BZ,WJCFLJ,WJNR,WJDX,SSID,SSLX,LX,GQ,SZD,ID,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			TBZT,TBDYID,SFTB,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+		FROM
+			AQ_FJB
+	<where>
+			RECORD_STATUS != '9'
+			<if test="sslx != null and sslx != ''">
+				AND SSLX = #{sslx,jdbcType=VARCHAR}
+			</if>
+			<if test="lx != null and lx != ''">
+				AND LX = #{lx,jdbcType=VARCHAR}
+			</if>
+			<if test="ssid != null and ssid != ''">
+				AND SSID = #{ssid,jdbcType=VARCHAR}
+			</if>
+	</where>
+  </select>
+  
+   <select id="selectByWjnr" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.FjbModel">
+	   SELECT WJM,WJHZM,BZ,WJCFLJ,WJNR,WJDX,SSID,SSLX,LX,GQ,SZD,ID,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			TBZT,TBDYID,SFTB,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+		FROM
+			AQ_FJB
+	<where>
+			RECORD_STATUS != '9'
+			<if test="sslx != null and sslx != ''">
+				AND WJNR = #{wjnr,jdbcType=VARCHAR}
+			</if>
+	</where>
+  </select>
+</mapper>

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

@@ -0,0 +1,207 @@
+<?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.GksssbModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.GksssbModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="SSMC" property="ssmc" jdbcType="VARCHAR" />
+    <result column="QYMC" property="qymc" jdbcType="VARCHAR" />
+    <result column="TBR" property="tbr" jdbcType="VARCHAR" />
+    <result column="LXDH" property="lxdh" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="SZGQ" property="szgq" jdbcType="VARCHAR" />
+    <result column="GGXH" property="ggxh" jdbcType="VARCHAR" />
+    <result column="SL" property="sl" jdbcType="VARCHAR" />
+    <result column="YXQ" property="yxq" jdbcType="TIMESTAMP" />
+    <result column="CFCS" property="cfcs" jdbcType="VARCHAR" />
+    <result column="BZ" property="bz" jdbcType="VARCHAR" />
+    <result column="SLDW" property="sldw" jdbcType="VARCHAR" />
+    <result column="YJFL" property="yjfl" jdbcType="VARCHAR" />
+    <result column="EJFL" property="ejfl" jdbcType="VARCHAR" />
+    <result column="TBZT" property="tbzt" jdbcType="VARCHAR" />
+    <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
+    <result column="QYLB" property="qylb" jdbcType="VARCHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
+    <result column="SFTB" property="sftb" jdbcType="VARCHAR" />
+    <result column="RECORD_CODE" property="recordcode" jdbcType="VARCHAR" />
+    <result column="RECORD_STATUS" property="state" 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="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.GksssbListModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="SSMC" property="ssmc" jdbcType="VARCHAR" />
+    <result column="GGXH" property="ggxh" jdbcType="VARCHAR" />
+    <result column="SL" property="sl" jdbcType="DECIMAL" />
+    <result column="YXQ" property="yxq" jdbcType="TIMESTAMP" />
+    <result column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
+    <result column="YJFL" property="yjfl" jdbcType="VARCHAR" />
+    <result column="EJFL" property="ejfl" jdbcType="VARCHAR" />
+    <result column="TBR" property="tbr" jdbcType="VARCHAR" />
+    <result column="LXDH" property="lxdh" jdbcType="VARCHAR" />
+    <result column="CFCS" property="cfcs" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="GQMC" property="gqmc" jdbcType="VARCHAR" />
+    <result column="BZ" property="bz" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <resultMap id="BaseResultTjInfoMap" type="com.xt.js.gkaq.web.model.GksssbTjModel" >
+    <result column="SSMC" property="ssmc" jdbcType="VARCHAR" />
+    <result column="SL" property="sl" jdbcType="DECIMAL" />
+    <result column="SLDW" property="sldw" jdbcType="VARCHAR" />
+    <result column="QYMC" property="qymc" jdbcType="VARCHAR" />
+    <result column="YJFL" property="yjfl" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="SZGQ" property="szgq" jdbcType="VARCHAR" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from AQ_DWXX_GKSSSB
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.GksssbModel" >
+    insert into AQ_DWXX_GKSSSB (ID,SSMC,QYMC,TBR,LXDH,SZD,SZGQ,GGXH,SL,YXQ,CFCS,BZ,SLDW,YJFL,EJFL,
+								ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+								SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5)
+    values (#{id,jdbcType=DECIMAL}, 
+    		#{ssmc,jdbcType=VARCHAR}, 
+    		#{qymc,jdbcType=DECIMAL}, 
+    		#{tbr,jdbcType=VARCHAR}, 
+    		#{lxdh,jdbcType=VARCHAR}, 
+    		#{szd,jdbcType=VARCHAR}, 
+    		#{szgq,jdbcType=VARCHAR},
+    		#{ggxh,jdbcType=VARCHAR},
+    		#{sl,jdbcType=VARCHAR},
+    		#{yxq,jdbcType=TIMESTAMP},
+    		#{cfcs,jdbcType=VARCHAR},
+    		#{bz,jdbcType=VARCHAR},
+    		#{sldw,jdbcType=VARCHAR}, 
+    		#{yjfl,jdbcType=VARCHAR}, 
+    		#{ejfl,jdbcType=VARCHAR},  
+    		#{createUser,jdbcType=VARCHAR}, 
+    		#{createTime,jdbcType=TIMESTAMP}, 
+    		#{updateUser,jdbcType=VARCHAR}, 
+    		#{updateTime,jdbcType=TIMESTAMP}, 
+    		#{state,jdbcType=VARCHAR}, 
+    		#{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}
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.GksssbModel" >
+    UPDATE AQ_DWXX_GKSSSB
+     SET SSMC=#{ssmc,jdbcType=VARCHAR}, 
+		 QYMC=#{qymc,jdbcType=DECIMAL}, 
+		 TBR = #{tbr,jdbcType=VARCHAR},  
+		 LXDH = #{lxdh,jdbcType=VARCHAR}, 
+		 SZD = #{szd,jdbcType=VARCHAR},  
+		 SZGQ = #{szgq,jdbcType=VARCHAR}, 
+		 GGXH = #{ggxh,jdbcType=VARCHAR}, 
+		 SL = #{sl,jdbcType=VARCHAR},   
+		 YXQ = #{yxq,jdbcType=TIMESTAMP},
+		 CFCS = #{cfcs,jdbcType=VARCHAR}, 
+		 BZ = #{bz,jdbcType=VARCHAR},   
+		 SLDW = #{sldw,jdbcType=VARCHAR}, 
+		 YJFL = #{yjfl,jdbcType=VARCHAR}, 
+		 EJFL = #{ejfl,jdbcType=VARCHAR}, 
+	     TBZT = #{tbzt,jdbcType=VARCHAR},
+	     TBDYID = #{tbdyid,jdbcType=DECIMAL},
+	     QYLB = #{qylb,jdbcType=VARCHAR}, 
+	     SSQY = #{ssqy,jdbcType=DECIMAL}, 
+	     SFTB = #{sftb,jdbcType=VARCHAR},
+	     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},
+	     
+	     ADD_DATE = #{createTime,jdbcType=TIMESTAMP},
+	     UPDATE_DATE = #{updateTime,jdbcType=TIMESTAMP},
+	     ADD_USER = #{createUser,jdbcType=VARCHAR},
+	     UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+	     RECORD_STATUS = #{state,jdbcType=VARCHAR}
+    WHERE ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+	SELECT
+		ID,SSMC,QYMC,TBR,LXDH,SZD,SZGQ,GGXH,SL,YXQ,CFCS,BZ,SLDW,YJFL,EJFL,
+		ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+		SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+		FROM AQ_DWXX_GKSSSB
+	WHERE ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap">
+    SELECT
+		ID,SSMC,QYMC,TBR,LXDH,SZD,SZGQ,GGXH,SL,YXQ,CFCS,BZ,SLDW,YJFL,EJFL,
+		ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+		SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	FROM AQ_DWXX_GKSSSB
+  </select>
+  
+  <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.GksssbListModel">
+  	SELECT
+		SS.ID,SS.SSMC,SS.GGXH,SS.SL,SS.YXQ,JYR.GKJYR,C.TEXT AS YJFL,
+		CO.TEXT AS EJFL,SS.TBR,SS.LXDH,SS.CFCS,COD.TEXT AS SZD,GQ.GQMC,SS.BZ
+	FROM
+		AQ_DWXX_GKSSSB SS
+		LEFT JOIN AQ_DWXX_JYRJCXX JYR ON JYR."ID" = SS.QYMC
+		LEFT JOIN AQ_BASIC_FRAME_CODE C ON C.VAL = SS.YJFL
+		LEFT JOIN AQ_BASIC_FRAME_CODE CO ON CO.VAL = SS.EJFL
+		LEFT JOIN AQ_BASIC_FRAME_CODE COD ON COD.VAL = SS.SZD
+		LEFT JOIN AQ_DWXX_GQ GQ ON GQ.ID = SS.SZGQ
+	<where>
+		SS.RECORD_STATUS != 9
+		<if test="szd != null and szd != ''">
+			AND SS.SZD = #{szd,jdbcType=VARCHAR}
+		</if>
+		<if test="gqmc != null and gqmc != ''">
+			AND SS.SZGQ = #{gqmc,jdbcType=VARCHAR}
+		</if>
+		<if test="gkjyr != null and gkjyr != ''">
+			AND SS.QYMC = #{gkjyr,jdbcType=VARCHAR}
+		</if>
+		<if test="ssmc != null and ssmc != ''">
+			AND SS.SSMC LIKE CONCAT(CONCAT('%', #{ssmc, jdbcType=VARCHAR}),'%')
+		</if>
+		<if test="ggxh != null and ggxh != ''">
+			AND SS.GGXH LIKE CONCAT(CONCAT('%', #{ggxh, jdbcType=VARCHAR}),'%')
+		</if>
+		<if test="cfcs != null and cfcs != ''">
+			AND SS.CFCS LIKE CONCAT(CONCAT('%', #{cfcs, jdbcType=VARCHAR}),'%')
+		</if>
+	</where>
+	ORDER BY JYR.GKJYR,SS.TBR
+  </select>
+  
+  <select id="selectTjInfo" resultMap="BaseResultTjInfoMap" parameterType="com.xt.js.gkaq.web.model.GksssbTjModel">
+  	SELECT 
+  		SUM(SS.SL) AS SL, SS.SSMC,SS.SLDW
+	FROM 
+	 	AQ_DWXX_GKSSSB SS 
+	<where>
+		SS.RECORD_STATUS != 9 
+		AND SS.YJFL = #{yjfl,jdbcType=VARCHAR}
+		AND SS.SZD = #{szd,jdbcType=VARCHAR}
+		<if test="szgq != null and szgq != ''">
+			AND SS.SZGQ = #{szgq,jdbcType=VARCHAR}
+		</if>
+		<if test="qymc != null and qymc != ''">
+			AND SS.QYMC = #{qymc,jdbcType=VARCHAR}
+		</if>
+	</where>
+		
+	GROUP BY SS.EJFL,SS.SSMC,SS.SLDW
+  </select>
+</mapper>

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

@@ -61,7 +61,15 @@
     <result column="GQMC" property="gqmc" jdbcType="VARCHAR" />
     <result column="BZ" property="bz" jdbcType="VARCHAR" />
   </resultMap>
-  
+  <resultMap id="BaseResultTJMap" type="com.xt.js.gkaq.web.model.JyrUserTJModel" >
+  	<result column="QYMC" property="qymc" jdbcType="VARCHAR" />
+  	<result column="RYLX" property="rylx" jdbcType="VARCHAR" />
+  	<result column="RS" property="rs" jdbcType="VARCHAR" />
+  </resultMap>
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.dwxx.model.ComboBoxDto" >
+    <result column="VAL" property="optVal" jdbcType="VARCHAR" />
+    <result column="TEXT" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_DWXX_JYRDRYXX
     where ID = #{id,jdbcType=VARCHAR}
@@ -205,5 +213,28 @@
 			</if>
 		</where>
   </select>
-  
+   <select id="selectTJByInfo" resultMap="BaseResultTJMap" parameterType="com.xt.js.gkaq.web.model.JyrUserModel">
+   		SELECT J.GKJYR AS QYMC,C.TEXT AS RYLX,SUM(1) AS RS FROM AQ_DWXX_JYRDRYXX RY
+					LEFT JOIN AQ_DWXX_JYRJCXX J ON J.ID = RY.SSJYR
+					LEFT JOIN AQ_BASIC_FRAME_CODE C ON C.VAL = RY.RYLX
+		<where>
+				RY.SZD = #{szd,jdbcType=VARCHAR}
+			<if test="rylx != null and rylx != ''">
+				AND RY.RYLX = #{rylx,jdbcType=VARCHAR}
+			</if>
+			<if test="byzd1 != null and byzd1 !=''">
+				AND <![CDATA[RY.ADD_DATE >= "TO_TIMESTAMP"(#{byzd1,jdbcType=VARCHAR}, 'yyyy-MM-dd hh24:mi:ss:ff9')]]>
+				AND <![CDATA[RY.ADD_DATE <= "TO_TIMESTAMP"(#{byzd2,jdbcType=VARCHAR}, 'yyyy-MM-dd hh24:mi:ss:ff9')]]>
+			</if>
+			
+		</where>
+			GROUP BY J.GKJYR,C.TEXT
+			ORDER BY J.GKJYR
+   </select>
+   <select id="getSelect" resultMap="ComboBoxMap" parameterType="java.lang.String" >
+	   select TEXT, VAL from AQ_BASIC_FRAME_CODE 
+		where CODE = #{code,jdbcType=VARCHAR}
+	    and STATE != 9
+		order by SORTNO
+  </select>
 </mapper>

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

@@ -11,7 +11,6 @@
     <result column="YXQ" property="yxq" jdbcType="TIMESTAMP" />
     <result column="BZ" property="bz" jdbcType="VARCHAR" />
     <result column="ZSNR" property="zsnr" jdbcType="VARCHAR" />
-
     <result column="SFTB" property="sftb" jdbcType="CHAR" />
     <result column="TBZT" property="tbzt" jdbcType="CHAR" />
     <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
@@ -29,10 +28,23 @@
     <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.RyzsbInfoModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="RYID" property="ryid" jdbcType="VARCHAR" />
+    <result column="ZSMC" property="zsmc" jdbcType="VARCHAR" />
+    <result column="ZSZL" property="zszl" jdbcType="VARCHAR" />
+    <result column="ZSBH" property="zsbh" jdbcType="VARCHAR" />
+    <result column="YXQ" property="yxq" jdbcType="TIMESTAMP" />
+    <result column="BZ" property="bz" jdbcType="VARCHAR" />
+    <result column="ZSNR" property="zsnr" jdbcType="VARCHAR" />
+    <result column="FJID" property="fjid" jdbcType="VARCHAR" />
+    <result column="WJM" property="wjm" 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" />
+    <result column="TEXT" property="optName" jdbcType="VARCHAR" />
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
@@ -40,9 +52,8 @@
     WHERE ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.web.model.RyzsbModel" >
-    insert into AQ_DWXX_RYZSB (ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,
-									ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
-									SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5)
+    insert into AQ_DWXX_RYZSB (ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+								SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5)
     values (#{id,jdbcType=VARCHAR},
     		#{szd,jdbcType=VARCHAR}, 
      		#{zsnr,jdbcType=VARCHAR},
@@ -115,20 +126,26 @@
 	FROM
 			AQ_DWXX_RYZSB
   </select>
-  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.RyzsbModel">
-	  SELECT ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,
-			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
-			SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
-	  FROM AQ_DWXX_RYZSB
+  <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.RyzsbModel">
+	  SELECT ZS.ID,ZS.SZD,ZS.ZSNR,ZS.RYID,ZS.ZSMC,ZS.ZSZL,ZS.ZSBH,ZS.YXQ,ZS.BZ,
+			FJ.ID AS FJID, FJ.WJM
+	  FROM AQ_DWXX_RYZSB ZS
+	  LEFT JOIN AQ_FJB FJ ON FJ.SSID = ZS.ID 
 	<where>
-			RECORD_STATUS != '9'
+			ZS.RECORD_STATUS != '9'
+			AND FJ.SSLX IN (SELECT VAL FROM AQ_BASIC_FRAME_CODE WHERE PCODE = 'FJSSLX' AND CODE = 'T_YJPT_JYRDRYZS' AND STATE != '9' ) 
 			<if test="id != null and id != '' ">
-				AND ID = #{id,jdbcType=VARCHAR}
+				AND ZS.ID = #{id,jdbcType=VARCHAR}
 			</if>
 			<if test="ryid != null and ryid != '' ">
-				AND RYID = #{ryid,jdbcType=VARCHAR}
+				AND ZS.RYID = #{ryid,jdbcType=VARCHAR}
 			</if>
 			
 	</where>
   </select>
+  
+  <select id="selectCode" resultMap="ComboBoxMap" parameterType="com.xt.js.gkaq.frame.model.CodeModelDto" >
+  	select C.ID,C.VAL from AQ_BASIC_FRAME_CODE C 
+	WHERE C.STATE != 9 and C.CODE = #{code,jdbcType=VARCHAR} and C.PCODE = #{pcode,jdbcType=VARCHAR} order by C.PCODE desc, C.SORTNO 
+  </select>
 </mapper>

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

@@ -155,5 +155,6 @@
 				AND ZD.ZDMC LIKE CONCAT(CONCAT('%', #{zdmc, jdbcType=VARCHAR}),'%')
 			</if>
 		</where>
+		ORDER BY ZD.XDRQ DESC 
   </select>
 </mapper>

gkaqv2/trunk/modules/web/src/main/resources/spring/mvc.xml

@@ -19,6 +19,11 @@
 		<context:include-filter type="annotation"
 			expression="org.springframework.stereotype.Controller" />
 	</context:component-scan>
+	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">    
+        <property name="defaultEncoding" value="UTF-8"></property>     
+        <property name="maxUploadSize" value="10485760000"></property>    
+        <property name="maxInMemorySize" value="40960"></property>    
+   </bean>
 
 	<mvc:annotation-driven>
 		<mvc:message-converters>

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

@@ -0,0 +1,123 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<script src="<%=request.getContextPath()%>/static/js/ajaxfileupload.js" type="text/javascript"></script>
+	   	 <form class="form-horizontal" id="gksssbInfoform" method="post"  enctype="multipart/form-data" >
+		    <input type="hidden" id="id" name="id">
+			
+	    	<div class="form-group">
+		        <label class="col-sm-2 control-label" for="jyrssmc">安全设施设备</label>
+				<div class="col-sm-4">
+					<input id="jyrssmc" name="ssmc" type="text" class="form-control"/>
+				</div>
+				<label class="col-sm-2 control-label" for="ssjyr">港口经营人名称</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="ssjyr" name = "qymc">
+						
+					</select>
+				</div>
+				
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-2 control-label">填表人</label>
+				<div class="col-sm-4" id="lb">
+					<input id="tbr" name="tbr" type="text" class="form-control"/>
+				</div>
+				<label class="col-sm-2 control-label">联系电话</label>
+				<div class="col-sm-4">
+					<input id="lxdh" name="lxdh" type="text" class="form-control"/>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="jyrszd">所在地</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="jyrszd" name = "szd" onchange="getgq2()">
+						
+					</select>
+				</div>
+				<label class="col-sm-2 control-label" for="jyrssgq">所在港区</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="jyrssgq" name = "szgq">
+						
+					</select>
+				</div>
+			</div> 
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="yjfl">一级分类</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="yjfl" name = "yjfl">
+						
+					</select>
+				</div>
+				<label class="col-sm-2 control-label" for="ejfl">二级分类</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="ejfl" name = "ejfl">
+						
+					</select>
+				</div>
+			</div> 
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="sl">数量</label>
+				<div class="col-sm-4">
+					<input type="text" id="sl" name="sl" class="form-control"/>
+				</div>
+				<label class="col-sm-2 control-label" for="sldw">数量单位</label>
+				<div class="col-sm-4">
+					<input type="text" id="sldw" name="sldw" class="form-control"/>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="ssggxh">规格型号</label>
+				<div class="col-sm-4">
+					<input type="text" id="ssggxh" name="ggxh" class="form-control"/>
+				</div>
+				<label class="col-sm-2 control-label" for="yxq">有效期</label>
+				<div class="col-sm-4">
+					<input type="text" id = "yxq" name = "yxq" class="easyui-datetimebox" style = "width:100%;"
+					 data-options="showSeconds:false,formatter:formatterDateNotsfm"/>
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-2 control-label" for="sscfcs">存放场所</label>
+				<div class="col-sm-10">
+					<textarea id = "sscfcs" name = "cfcs" class="form-control"></textarea>
+				</div>
+				
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-2 control-label" for="bz">备注</label>
+				<div class="col-sm-10">
+					<textarea id = "bz" name = "bz" class="form-control"></textarea>
+				</div>
+				
+			</div>
+			<div style="padding-left: 20px;">
+					<div id="tab-tools" style="margin:10px;">
+				    	<div class="center-block" style="width:160px; margin-left: 0px;" >
+				    			<input id="lefile" type="file" name="file" onchange="lefileChange()" style="display:none">
+						      	<button type="button" class="btn btn-success btn-round btn-sm"
+									onclick="$('input[id=lefile]').click();">
+								<i class="glyphicon glyphicon-ok" ></i> 浏览
+						</button>
+						 </div>
+					</div>
+					<table class="easyui-datagrid" style="width:97%;height: 200px; padpadding:10px;" id="zstbl"
+					        data-options="fitColumns:true,singleSelect:true,striped:true">   
+					    <thead>   
+					        <tr>   
+					        	<th data-options="field:'ssid',width:20,align:'center',hidden:true">ssid</th>
+					            <th data-options="field:'del',width:20,align:'center'">删除</th>   
+					            <th data-options="field:'zs',width:60,align:'center'">名称</th>
+					            <th data-options="field:'ope',width:20,align:'center'">打开</th>  
+					            <th data-options="field:'fjid',width:20,align:'center',hidden:true">附件表的id</th>
+					            <th data-options="field:'zsnr',width:20,align:'center',hidden:true">关联blob的Id</th>
+					            <th data-options="field:'filename',width:20,align:'center',hidden:true">保存文件名</th>
+					            <th data-options="field:'wjdx',width:20,align:'center',hidden:true">保存文件的大小</th>
+					            <th data-options="field:'wjhzm',width:20,align:'center',hidden:true">保存文件的后缀名</th>
+					        </tr>   
+					    </thead>   
+					</table>  
+					
+				</div>
+	  	 </form>
+
+<script src="<%=request.getContextPath()%>/static/js/gksssb/GksssbInfo.js"></script>

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

@@ -0,0 +1,60 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	
+	   	 <form class="form-horizontal" id="gksssbLookform" method="post" style="height: 100%;" enctype="multipart/form-data" >
+		    <input type="hidden" id="id" name="id">
+			
+	    	<div class="form-group">
+				<label class="col-sm-2 control-label" for="ssjyr">港口经营人名称</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="ckjyr" name = "qymc">
+						
+					</select>
+				</div>
+				
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-2 control-label">填表人</label>
+				<div class="col-sm-4" id="lb">
+					<input id="cktbr" name="tbr" type="text" class="form-control"/>
+				</div>
+				<label class="col-sm-2 control-label">联系电话</label>
+				<div class="col-sm-4">
+					<input id="cklxdh" name="lxdh" type="text" class="form-control"/>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="jyrszd">所在地</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="ckszd" name = "szd" onchange="getgq2()">
+						
+					</select>
+				</div>
+				<label class="col-sm-2 control-label" for="jyrssgq">所在港区</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="ckgq" name = "szgq">
+						
+					</select>
+				</div>
+			</div> 
+			<div>
+					<table class="easyui-datagrid" style="width:100%;height:300px; padpadding:10px;" id="sssbList"
+					        data-options="fitColumns:true,singleSelect:true">   
+					    <thead>   
+					        <tr>   
+					        	<th data-options="field:'ssmc',width:20,align:'center'">安全设施设备</th>
+					            <th data-options="field:'ggxh',width:10,align:'center'">规格型号</th>   
+					            <th data-options="field:'sl',width:10,align:'center'">数量</th>   
+					            <th data-options="field:'yxq',width:10,align:'center'">有效期</th>
+					            <th data-options="field:'yjfl',width:10,align:'center'">一级分类</th>
+					            <th data-options="field:'ejfl',width:10,align:'center'">二级分类</th>
+					            <th data-options="field:'id',width:10,align:'center'">检验报告(或证书)</th>
+					            <th data-options="field:'cfcs',width:10,align:'center'">存放场所</th>
+					            <th data-options="field:'bz',width:10,align:'center'">备注</th>
+					        </tr>   
+					    </thead>   
+					</table>  
+				</div>
+	  	 </form>
+
+<script src="<%=request.getContextPath()%>/static/js/gksssb/GksssbLook.js"></script>

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

@@ -0,0 +1,47 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	
+	<div class="p_searchdiv" style = "width:100%;display:block;">
+			<table class="tabsearch" style = "margin-top: 10px;width:100%;">
+				<tr class="trsearch">
+					<td class="tdname">安全设施设备分类</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="tjyjfl" name = "yjfl">
+						</select>
+					</td>
+					<td class="tdname">所在地</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="tjszd" name = "szd" onchange="gettjgq()">
+						
+						</select>	
+					</td>
+					
+					<td class="tdname">港区</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="gq" name = "szgq">
+						
+						</select>	
+					</td>
+					<td class="tdname">港口经营人名称</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="qymc" name = "qymc">
+						
+						</select>	
+					</td>
+					<td class="tdname"></td>
+					<td class="tdcontent" colspan="6" style="text-align: right;">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="gksssbTjSearch()"/>
+					</td>
+					<td class="tdcontent">
+							<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png"  style="margin-left: 40px;"
+								onclick="printJyrTjInfo()" title="打印"/>
+					</td>
+				</tr>
+			</table>
+		</div>
+	
+	<table id="tj-grid-table" style = "width:100%;"></table>
+		<div id="tj-grid-pager" style = "width:100%;"></div>
+		
+<script src="<%=base%>/static/js/gksssb/GksssbTjInfo.js"></script>	

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

@@ -0,0 +1,157 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+<!DOCTYPE html>
+<html>
+<head>
+<title>安全设施设备信息</title>
+<%@ include file="../../layouts/header.jsp"%>
+<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-select/css/bootstrap-select.min.css" />
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+
+<script src="<%=base%>/static/js/gksssb/index.js"></script>
+	<style type="text/css">
+		.tdname{font-weight: bolder;}
+		
+	</style>
+</head>
+
+<body class="p_body">
+<div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
+<!-- 内容部分 -->
+<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
+	<div class="p_all">
+	<%@ include file="../../layouts/menubar.jsp"%>
+	<div class="p_block">
+		<div class="p_headdiv">
+			<div class="p_headblock">
+				<div class="p_headleft">安全设施设备信息</div>
+			</div>
+		</div>
+		<div class="p_buttondiv">
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" 
+					onclick="addJyrUserInfo()" title="新增"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" 
+					onclick="delInfo()" title="删除"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" 
+					onclick="editInfo()" title="编辑"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" 
+					onclick="showSearch()" title="查询"/>
+			</div>
+			<div class="p_buttonbg">
+				<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="gksssbTj()" title="统计信息"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+					onclick="" title="复制"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
+					onclick="" title="导入模板"/>
+					
+			</div>
+		</div>
+		<div class="p_searchdiv">
+			<table class="tabsearch">
+				<tr class="trsearch">
+					<td class="tdname">所在地</td>
+					<td class="tdcontent">
+						<select class="p_txt" id ="szd" name = "szd" onchange="getgq()">
+							<option value = "">--请选择--</option>
+							<c:forEach items="${code }" var="code">
+								<option value = "${code.optVal }">${code.optName}</option>
+							</c:forEach>	
+						</select>
+					</td>
+					<td class="tdname">所在港区 </td>
+					<td class="tdcontent">
+						<select class="p_txt" id ="ssgq" name = "ssgq">
+							<option value = "">--请选择--</option>
+						</select>
+					</td>
+					<td class="tdname">港口经营人名称</td>
+					<td class="tdcontent">
+						<select class="p_txt" id ="jyr" name = "jyr">
+							<option value = "">--请选择--</option>
+						</select>
+					</td>
+				</tr>
+				<tr class="trsearch">
+					<td class="tdname">安全设施设备</td>
+					<td class="tdcontent">
+						<input type="text" id="ssmc" name="ssmc" class="p_txt"/>	
+					</td>
+					<td class="tdname">规格型号</td>
+					<td class="tdcontent">
+						<input type="text" id="ggxh" name="ggxh" class="p_txt"/>
+					</td>
+					<td class="tdname">存放场所</td>
+					<td class="tdcontent">
+						<input type="text" id="cfcs" name="cfcs" class="p_txt"/>
+					</td>
+					<td class="tdname">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="searchRecord()"/>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div class="page-content">
+			<!--列表部分-->
+			<table id="grid-table"></table>
+			<div id="grid-pager"></div>
+		</div>
+	</div>
+	</div>
+		<div id="gksssbwin" class="easyui-window" title="编辑" style="width:40%;height: 60%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		  <div id="tab-tools" style="margin-bottom:10px;">
+			    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
+					      	<button class="btn btn-success btn-round btn-sm"
+								onclick="eidit()">
+								<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="../gksssb/GksssbInfo.jsp" %>
+		</div>
+		<div id="gksssbTjwin" 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="../gksssb/GksssbTjInfo.jsp" %>
+       	</div>
+       	<div id="gksssbLookwin" class="easyui-window" title="查看" style="width:80%;height: 70%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		 <%@ include file="../gksssb/GksssbLook.jsp" %>
+       	</div>
+</div>
+<!-- 头部 -->
+<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
+	<%@ include file="../../layouts/navbar.jsp"%>
+</div>
+<!-- 左边部分 -->
+<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
+	<%@ include file="../../layouts/sidebar.jsp"%>
+</div>
+<!-- 底部 -->
+<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
+	<%@ include file="../../layouts/footer.jsp"%>
+</div>
+</div>
+</body>
+</html>

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

@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
-	
+	<script src="<%=request.getContextPath()%>/static/js/ajaxfileupload.js" type="text/javascript"></script>
 	   	 <form class="form-horizontal" id="jyrGlzdInfoform" method="post"  enctype="multipart/form-data" >
 		    <input type="hidden" id="id" name="id">
 			
@@ -20,7 +20,7 @@
 			<div class="form-group">
 				 <label class="col-sm-2 control-label">所在地</label>
 				<div class="col-sm-4" id="lb">
-					<select class="form-control" id ="jyrszd" name = "szd">
+					<select class="form-control" id ="jyrszd" name = "szd" onchange="getgq()">
 						
 					</select>
 				</div>
@@ -42,7 +42,6 @@
 					<select class="form-control" id ="jyrzdfl" name = "zdfl">
 						
 					</select>
-					
 				</div>
 			</div> 
 			
@@ -52,11 +51,13 @@
 				<div class="col-sm-4">
 					<input type="text" id="fbrq" name="fbrq" class="easyui-datetimebox p_txt"
 					 data-options="showSeconds:false,formatter:formatterDateNotsfm"/>
+					 <input type = "hidden" id = "fbsj" />
 				</div>
 				<label class="col-sm-2 control-label" for="xdrq">修订日期</label>
 				<div class="col-sm-4">
 					<input type="text" id="xdrq" name="xdrq" class="easyui-datetimebox p_txt"
 					 data-options="showSeconds:false,formatter:formatterDateNotsfm"/>
+					 <input type = "hidden" id = "xdsj" />
 				</div>
 			</div>
 			<div class="form-group">
@@ -68,6 +69,7 @@
 				<div class="col-sm-4">
 					<input type="text" id="txsj" name="txsj" class="easyui-datetimebox p_txt"
 					 data-options="showSeconds:false,formatter:formatterDateNotsfm"/>
+					 <input type = "hidden" id = "tbsj" />
 				</div>
 			</div>
 			<div class="form-group">
@@ -84,32 +86,30 @@
 			<div style="padding-left: 20px;">
 					<div id="tab-tools" style="margin:10px;">
 				    	<div class="center-block" style="width:160px; margin-left: 0px;" >
-				    			<input id="lefile" name = "file" type="file" style="display:none">
+				    			<input id="lefile" type="file" name="file" onchange="lefileChange()" style="display:none">
 						      	<button type="button" class="btn btn-success btn-round btn-sm"
 									onclick="$('input[id=lefile]').click();">
 								<i class="glyphicon glyphicon-ok" ></i> 浏览
 						</button>
 						 </div>
 					</div>
-					<table class="easyui-datagrid" style="width:97%;height: 80%; padpadding:10px;" id="zstbl"
+					<table class="easyui-datagrid" style="width:97%;height: 200px; padpadding:10px;" id="zstbl"
 					        data-options="fitColumns:true,singleSelect:true,striped:true">   
 					    <thead>   
 					        <tr>   
-					        	<th data-options="field:'id',width:20,align:'center',hidden:true">id</th>
+					        	<th data-options="field:'ssid',width:20,align:'center',hidden:true">ssid</th>
 					            <th data-options="field:'del',width:20,align:'center'">删除</th>   
-					            <th data-options="field:'name',width:15,align:'center'">名称</th>   
-					            <th data-options="field:'ope',width:20,align:'center'">打开</th>
+					            <th data-options="field:'zs',width:60,align:'center'">名称</th>
+					            <th data-options="field:'ope',width:20,align:'center'">打开</th>  
+					            <th data-options="field:'fjid',width:20,align:'center',hidden:true">附件表的id</th>
+					            <th data-options="field:'zsnr',width:20,align:'center',hidden:true">关联blob的Id</th>
+					            <th data-options="field:'filename',width:20,align:'center',hidden:true">保存文件名</th>
+					            <th data-options="field:'wjdx',width:20,align:'center',hidden:true">保存文件的大小</th>
+					            <th data-options="field:'wjhzm',width:20,align:'center',hidden:true">保存文件的后缀名</th>
 					        </tr>   
 					    </thead>   
 					</table>  
 					
 				</div>
 	  	 </form>
-				
-				
-			<div id="jyrUserZsinfo" class="easyui-window" title="人员证书信息新增" style="width:30%;height: 40%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		  	<%@ include file="../jyrUser/JyrUserZsInfo.jsp" %>
-       		</div>
-
 <script src="<%=request.getContextPath()%>/static/js/glzd/GlzdInfo.js"></script>

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

@@ -17,10 +17,11 @@
 </head>
 
 <body class="p_body">
-<div class="easyui-layout" data-options="fit:true">
+<div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
 <!-- ÄÚÈݲ¿·Ö -->
 <div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
 	<div class="p_all">
+	<%@ include file="../../layouts/menubar.jsp"%>
 	<div class="p_block">
 		<div class="p_headdiv">
 			<div class="p_headblock">

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

@@ -322,24 +322,9 @@
 					
 		</div>
 		
-		<%-- <div id="fileUp" class="easyui-window" title="文件上传" style="width:30%;"    
+		<div id="fileUp" class="easyui-window" title="文件上传" style="width:30%;"    
        		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		 <form name="form2" id ="fileform" enctype="multipart/form-data" method="post" action="<%=basePath%>/jyr/UploadFile"> 
-				<table border="0" cellpadding="0" cellspacing="0">
-			    <tr> 
-			          <td><b>请选择上传的文件：</b>
-			            <input id="file" name="file" type="file" size="35"><input type="button" value="添加" onclick="addRow()">
-			          </td>
-			        </tr>
-			        <tr style="display: none;" id="myTr">
-			         <td><b>请选择上传的文件：</b>
-			            <input id="file" name="file" type="file" size="35"><input type="button" value="删除" onclick="delRow(this)">
-			          </td>
-			        </tr>
-				</table>
-				<input name="Submit" type="submit"class="btn_grey" value="确认">
-				<input name="Submit2" type="button" class="btn_grey" onClick="$('#fileUp').window('close')" value="关闭">
-			</form>
-		</div>  --%>
+       		  <%@ include file="../jyr/JyrZsInfo.jsp"%>    
+		</div>
 		
 <script src="<%=base%>/static/js/jyr/JyrInfo.js"></script>	

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

@@ -0,0 +1,39 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<script src="<%=request.getContextPath()%>/static/js/ajaxfileupload.js" type="text/javascript"></script>
+	   	 <form class="form-horizontal" id="jyrUserZsInfoform" method="post"  enctype="multipart/form-data" action="<%=request.getContextPath()%>/jyrUser/saveBlob" >
+		    <input type="hidden" id="zsid" name="zsid">
+			<input type="hidden" id="zsnr" name="zsnr">
+			<input type="hidden" id="fjbid" name="fjbid">
+			<input type="hidden" id="index" name="index">
+			<div class="form-group">
+				<div class="col-sm-5">
+						<input id="lefile" type="file" name="file" onchange="lefileChange()" style="display:none">
+						<button type="button" class="btn btn-success btn-round btn-sm"
+								onclick="$('input[id=lefile]').click();">
+								<i class="glyphicon glyphicon-ok" ></i> 浏览
+						</button>
+				</div>
+			</div>
+			<div class="form-group">
+				<table class="easyui-datagrid" style="width:97%;height: 200px; padpadding:10px;" id="zstbl"
+					        data-options="fitColumns:true,singleSelect:true,striped:true">   
+					    <thead>   
+					        <tr>   
+					        	<th data-options="field:'ssid',width:20,align:'center',hidden:true">ssid</th>
+					            <th data-options="field:'del',width:20,align:'center'">删除</th>   
+					            <th data-options="field:'zs',width:60,align:'center'">名称</th>
+					            <th data-options="field:'ope',width:20,align:'center'">打开</th>  
+					            <th data-options="field:'fjid',width:20,align:'center',hidden:true">附件表的id</th>
+					            <th data-options="field:'zsnr',width:20,align:'center',hidden:true">关联blob的Id</th>
+					            <th data-options="field:'filename',width:20,align:'center',hidden:true">保存文件名</th>
+					            <th data-options="field:'wjdx',width:20,align:'center',hidden:true">保存文件的大小</th>
+					            <th data-options="field:'wjhzm',width:20,align:'center',hidden:true">保存文件的后缀名</th>
+					        </tr>   
+					    </thead>   
+					</table>  
+			</div>
+	  	 </form>
+			
+
+<script src="<%=request.getContextPath()%>/static/js/jyr/JyrZsInfo.js"></script>

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

@@ -17,10 +17,11 @@
 </head>
 
 <body class="p_body">
-<div class="easyui-layout" data-options="fit:true">
+<div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
 <!-- ÄÚÈݲ¿·Ö -->
 <div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
 	<div class="p_all">
+	<%@ include file="../../layouts/menubar.jsp"%>
 	<div class="p_block">
 		<div class="p_headdiv">
 			<div class="p_headblock">

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

@@ -74,13 +74,18 @@
 					        data-options="fitColumns:true,singleSelect:true,striped:true">   
 					    <thead>   
 					        <tr>   
-					        	<th data-options="field:'id',width:20,align:'center',hidden:true">id</th>
+					        	<th data-options="field:'zsid',width:20,align:'center',hidden:true">证书的id</th>
 					            <th data-options="field:'zsmc',width:20,align:'center'">证书名称</th>   
-					            <th data-options="field:'zszl',width:15,align:'center'">证书种类</th>   
-					            <th data-options="field:'zsbh',width:20,align:'center'">证书编号</th>   
-					            <th data-options="field:'yxq',width:20,align:'center'">有效期</th>
+					            <th data-options="field:'zszl',width:10,align:'center'">证书种类</th>   
+					            <th data-options="field:'zsbh',width:10,align:'center'">证书编号</th>   
+					            <th data-options="field:'yxq',width:10,align:'center'">有效期</th>
 					            <th data-options="field:'zs',width:20,align:'center'">证书</th>
-					            <th data-options="field:'manage',width:20,align:'center'">操作</th>
+					            <th data-options="field:'fjid',width:20,align:'center',hidden:true">附件表的id</th>
+					            <th data-options="field:'zsnr',width:20,align:'center'">关联blob的Id</th>
+					            <th data-options="field:'filename',width:20,align:'center',hidden:true">保存文件名</th>
+					            <th data-options="field:'wjdx',width:20,align:'center',hidden:true">保存文件的大小</th>
+					            <th data-options="field:'wjhzm',width:20,align:'center',hidden:true">保存文件的后缀名</th>
+					            <th data-options="field:'manage',width:30,align:'center'">操作</th>
 					        </tr>   
 					    </thead>   
 					</table>  

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

@@ -0,0 +1,51 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	
+	<div class="p_searchdiv" style = "width:100%;display:block;">
+			<table class="tabsearch" style = "margin: 10px;width:100%;">
+				<tr class="trsearch">
+					<td class="tdname">所在地</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="tjszd" name = "szd" onchange="gettjgq()">
+						
+						</select>	
+					</td>
+					
+					<td class="tdname">人员类型</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="tjrylx" name = "rylx">
+						
+						</select>	
+					</td>
+					<td class="tdname">年度</td>
+					<td class="tdcontent">
+						<input type="text" id="addtime" name="addtime" class="form-control" />
+					</td>
+					<td class="tdname"></td>
+					<td class="tdcontent" colspan="6" style="text-align: right;">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="jyrUserTjSearch()"/>
+					</td>
+					<td class="tdcontent">
+							<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png"  style="margin-left: 40px;"
+								onclick="printJyrTjInfo()" title="打印"/>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<table id="tj-grid-table"></table>
+			<div id="tj-grid-pager"></div>
+		<!-- <div>
+			<table class="easyui-datagrid" id="sssbList" data-options="fitColumns:true,singleSelect:true"
+					style="width:100%;height:300px; padpadding:10px;">   
+				<thead>   
+			        <tr>   
+			        	<th data-options="field:'qymc',width:20,align:'center'">企业</th>
+			            <th data-options="field:'rylx',width:10,align:'center'">人员类型</th>   
+			            <th data-options="field:'rs',width:10,align:'center'">人数</th>
+			        </tr>   
+				 </thead>   
+			</table>  
+		</div> -->
+		
+<script src="<%=base%>/static/js/jyrUser/JyrUserTjInfo.js"></script>	

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

@@ -1,7 +1,10 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
-	   	 <form class="form-horizontal" id="jyrUserZsInfoform" method="post"  enctype="multipart/form-data" action="<%=request.getContextPath()%>"/jyrUser/saveBlob"" >
-		    <input type="hidden" id="id" name="id">
+	<script src="<%=request.getContextPath()%>/static/js/ajaxfileupload.js" type="text/javascript"></script>
+	   	 <form class="form-horizontal" id="jyrUserZsInfoform" method="post"  enctype="multipart/form-data" action="<%=request.getContextPath()%>/jyrUser/saveBlob" >
+		    <input type="hidden" id="zsid" name="zsid">
+			<input type="hidden" id="zsnr" name="zsnr">
+			<input type="hidden" id="fjbid" name="fjbid">
 			<input type="hidden" id="index" name="index">
 	    	<div class="form-group">
 		        <label class="col-sm-2 control-label" for="szd2">Ö¤ÊéÃû³Æ</label>
@@ -34,9 +37,9 @@
 			<div class="form-group">
 				<label class="col-sm-2 control-label" for="gkjyr2">¸½¼þÉÏ´«</label>
 				<div class="col-sm-5">
-					<input id="lefile" name = "file" type="file" style="display:none">
+					<input id="lefile" type="file" name="file" onchange="lefileChange()" style="display:none">
 					<div class="input-append">
-						<input id="zsfile" name = "file"  class="input-large form-control" type="text" >
+						<input id="zsfile" class="input-large form-control" type="text" >
 					</div>
 				</div>
 				<div class="col-sm-5">
@@ -53,7 +56,7 @@
 			<div id="tab-tools" style="margin-bottom:10px;">
 			    	<div class="center-block" style="width:160px; margin-left: auto;" >
 					      	<button type="button" class="btn btn-success btn-round btn-sm"
-								onclick="saveUserZs();">
+								 onclick="saveUserZs();" >
 								<i class="glyphicon glyphicon-ok"></i> ±£´æ
 							</button>
 							<button type="button" class="btn btn-grey btn-round btn-sm"

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

@@ -17,10 +17,11 @@
 </head>
 
 <body class="p_body">
-<div class="easyui-layout" data-options="fit:true">
+<div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
 <!-- 内容部分 -->
 <div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
 	<div class="p_all">
+	<%@ include file="../../layouts/menubar.jsp"%>
 	<div class="p_block">
 		<div class="p_headdiv">
 			<div class="p_headblock">
@@ -50,7 +51,7 @@
 			</div>
 			<div class="p_buttonbg">
 				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
-					onclick="" title="统计信息"/>
+					onclick="jyrUserTj()" title="统计信息"/>
 			</div>
 			<div class="p_buttonbg">
 				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
@@ -137,6 +138,10 @@
 			</div>
 			<%@ include file="../jyrUser/JyrUserInfo.jsp" %>
 		</div>
+		<div id="jyrUserTjwin" 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="../jyrUser/JyrUserTjInfo.jsp" %>
+        </div>
 </div>
 <!-- 头部 -->
 <div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/sidebar.jsp

@@ -7,6 +7,7 @@
 &emsp;&emsp;<a href="#" onclick="linkUrl('jyr')">经营人管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('jyrUser')">经营人人员管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('glzd')">管理制度信息</a><br>
+&emsp;&emsp;<a href="#" onclick="linkUrl('gksssb')">安全设施设备信息</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('dict')">字典管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('xzqh')">行政区划管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('param')">参数管理</a><br>

gkaqv2/trunk/modules/web/src/main/webapp/static/js/ajaxfileupload.js

@@ -0,0 +1,236 @@
+
+jQuery.extend({
+
+
+    createUploadIframe: function(id, uri)
+    {
+        //create frame
+        var frameId = 'jUploadFrame' + id;
+
+        if(window.ActiveXObject) {
+            var io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
+            if(typeof uri== 'boolean'){
+                io.src = 'javascript:false';
+            }
+            else if(typeof uri== 'string'){
+                io.src = uri;
+            }
+        }
+        else {
+            var io = document.createElement('iframe');
+            io.id = frameId;
+            io.name = frameId;
+        }
+        io.style.position = 'absolute';
+        io.style.top = '-1000px';
+        io.style.left = '-1000px';
+
+        document.body.appendChild(io);
+
+        return io
+    },
+    createUploadForm: function(id, fileElementId)
+    {
+        //create form
+        var formId = 'jUploadForm' + id;
+        var fileId = 'jUploadFile' + id;
+        var form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
+        var oldElement = $('#' + fileElementId);
+        var newElement = $(oldElement).clone();
+        $(oldElement).attr('id', fileId);
+        $(oldElement).before(newElement);
+        $(oldElement).appendTo(form);
+        //set attributes
+        $(form).css('position', 'absolute');
+        $(form).css('top', '-1200px');
+        $(form).css('left', '-1200px');
+        $(form).appendTo('body');
+        return form;
+    },
+    addOtherRequestsToForm: function(form,data)
+    {
+        // add extra parameter
+        var originalElement = $('<input type="hidden" name="" value="">');
+        for (var key in data) {
+            name = key;
+            value = data[key];
+            var cloneElement = originalElement.clone();
+            cloneElement.attr({'name':name,'value':value});
+            $(cloneElement).appendTo(form);
+        }
+        return form;
+    },
+
+    ajaxFileUpload: function(s) {
+        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout
+        s = jQuery.extend({}, jQuery.ajaxSettings, s);
+        var id = new Date().getTime()
+        var form = jQuery.createUploadForm(id, s.fileElementId);
+        if ( s.data ) form = jQuery.addOtherRequestsToForm(form,s.data);
+        var io = jQuery.createUploadIframe(id, s.secureuri);
+        var frameId = 'jUploadFrame' + id;
+        var formId = 'jUploadForm' + id;
+        // Watch for a new set of requests
+        if ( s.global && ! jQuery.active++ )
+        {
+            jQuery.event.trigger( "ajaxStart" );
+        }
+        var requestDone = false;
+        // Create the request object
+        var xml = {}
+        if ( s.global )
+            jQuery.event.trigger("ajaxSend", [xml, s]);
+        // Wait for a response to come back
+        var uploadCallback = function(isTimeout)
+        {
+            var io = document.getElementById(frameId);
+            try
+            {
+                if(io.contentWindow)
+                {
+                    xml.responseText = io.contentWindow.document.body?io.contentWindow.document.body.innerHTML:null;
+                    xml.responseXML = io.contentWindow.document.XMLDocument?io.contentWindow.document.XMLDocument:io.contentWindow.document;
+
+                }else if(io.contentDocument)
+                {
+                    xml.responseText = io.contentDocument.document.body?io.contentDocument.document.body.innerHTML:null;
+                    xml.responseXML = io.contentDocument.document.XMLDocument?io.contentDocument.document.XMLDocument:io.contentDocument.document;
+                }
+            }catch(e)
+            {
+                jQuery.handleError(s, xml, null, e);
+            }
+            if ( xml || isTimeout == "timeout")
+            {
+                requestDone = true;
+                var status;
+                try {
+                    status = isTimeout != "timeout" ? "success" : "error";
+                    // Make sure that the request was successful or notmodified
+                    if ( status != "error" )
+                    {
+                        // process the data (runs the xml through httpData regardless of callback)
+                        var data = jQuery.uploadHttpData( xml, s.dataType );
+                        // If a local callback was specified, fire it and pass it the data
+                        if ( s.success )
+                            s.success( data, status );
+
+                        // Fire the global callback
+                        if( s.global )
+                            jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+                    } else
+                        jQuery.handleError(s, xml, status);
+                } catch(e)
+                {
+                    status = "error";
+                    jQuery.handleError(s, xml, status, e);
+                }
+
+                // The request was completed
+                if( s.global )
+                    jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+                // Handle the global AJAX counter
+                if ( s.global && ! --jQuery.active )
+                    jQuery.event.trigger( "ajaxStop" );
+
+                // Process result
+                if ( s.complete )
+                    s.complete(xml, status);
+
+                jQuery(io).unbind()
+
+                setTimeout(function()
+                {	try
+                    {
+                        $(io).remove();
+                        $(form).remove();
+
+                    } catch(e)
+                    {
+                        jQuery.handleError(s, xml, null, e);
+                    }
+
+                }, 100)
+
+                xml = null
+
+            }
+        }
+        // Timeout checker
+        if ( s.timeout > 0 )
+        {
+            setTimeout(function(){
+                // Check to see if the request is still happening
+                if( !requestDone ) uploadCallback( "timeout" );
+            }, s.timeout);
+        }
+        try
+        {
+            // var io = $('#' + frameId);
+            var form = $('#' + formId);
+            $(form).attr('action', s.url);
+            $(form).attr('method', 'POST');
+            $(form).attr('target', frameId);
+            if(form.encoding)
+            {
+                form.encoding = 'multipart/form-data';
+            }
+            else
+            {
+                form.enctype = 'multipart/form-data';
+            }
+            $(form).submit();
+
+        } catch(e)
+        {
+            jQuery.handleError(s, xml, null, e);
+        }
+        if(window.attachEvent){
+            document.getElementById(frameId).attachEvent('onload', uploadCallback);
+        }
+        else{
+            document.getElementById(frameId).addEventListener('load', uploadCallback, false);
+        }
+        return {abort: function () {}};
+
+    },
+
+    uploadHttpData: function( r, type ) {
+        var data = !type;
+        data = type == "xml" || data ? r.responseXML : r.responseText;
+        // If the type is "script", eval it in global context
+        if ( type == "script" )
+            jQuery.globalEval( data );
+        // Get the JavaScript object, if JSON is used.
+        if ( type == "json" )
+        {
+            // If you add mimetype in your response,
+            // you have to delete the '<pre></pre>' tag.
+            // The pre tag in Chrome has attribute, so have to use regex to remove
+            var data = r.responseText;
+            var rx = new RegExp("<pre.*?>(.*?)</pre>","i");
+            var am = rx.exec(data);
+            //this is the desired data extracted
+            var data = (am) ? am[1] : "";    //the only submatch or empty
+            eval( "data = " + data );
+        }
+        // evaluate scripts within html
+        if ( type == "html" )
+            jQuery("<div>").html(data).evalScripts();
+        //alert($('param', data).each(function(){alert($(this).attr('value'));}));
+        return data;
+    },
+    handleError: function( s, xhr, status, e ) 		{
+    	// If a local callback was specified, fire it
+    			if ( s.error ) {
+    				s.error.call( s.context || s, xhr, status, e );
+    			}
+
+    			// Fire the global callback
+    			if ( s.global ) {
+    				(s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
+    			}
+    		}
+})
+

gkaqv2/trunk/modules/web/src/main/webapp/static/js/gksssb/GksssbInfo.js

@@ -0,0 +1,428 @@
+
+/**
+ * 初始化
+ */
+jQuery(function($) {
+	// 初始化Grid
+});
+/**
+ * 数据处理
+ * @param data
+ */
+function gksssbInfoInit (data) {
+	//加载所在地数据信息
+	getSzd(data.szd);
+	getInfo(data.szd,data.szgq);
+	getyjfl(data.yjfl);
+	getejfl(data.ejfl);
+	getJyrSelect(data.qymc,'');
+	
+	$("#id").val(data.id);
+	$("#jyrssmc").val(data.ssmc);
+	$("#tbr").val(data.tbr);
+	$("#lxdh").val(data.lxdh);
+	
+	$("#sl").val(data.sl);
+	$("#sldw").val(data.sldw);
+	$("#ssggxh").val(data.ggxh);
+	$("#yxq").datetimebox("setValue",formatterDateNotsfm(new Date(data.yxq)));
+	$("#sscfcs").val(data.cfcs);
+	$("#bz").val(data.bz);
+}
+/**
+ * 附件列表初始化
+ */
+function sssbZsInint (ssid,val) {
+	$('#zstbl').datagrid("loadData",{ total: 0, rows: [] });
+	$.ajax({
+		type:"POST",
+		url: basePath+"/gksssb/gksssbZsInit",
+		data:{"ssid":ssid},
+		success:function (data) {
+			console.log(data);
+			var del = "";
+			if (val == "1") {
+				del = "<a onclick='deletFile()'>删除</a>";
+			}
+			var ope = "<a onclick='fileDow()'>下载</a>";
+			for ( var i = 0; i < data.length; i++) {
+				gridData={del:del,
+      				  zs:data[i].wjm,
+      				  ope:ope,
+      				  wjdx:data[i].wjdx,
+      				  wjhzm:data[i].wjhzm,
+      				  filename:"",
+      				  ssid:data[i].ssid,
+      				  fjid:data[i].id,
+      				  zsnr:data[i].wjnr};
+				insertJyrZs(gridData);
+			}
+		}
+	})
+}
+
+/**
+ * 选择所在地时联动港口信息
+ */
+function getgq2 () {
+	var val = $("#jyrszd").val();
+	getInfo(val,'');
+	getJyrSelect('',val);
+}
+/**
+ * 加载所在地信息
+ */
+function getSzd (scouse) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/glzd/getszd",
+		success : function (data) {
+			$("#jyrszd").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>";
+		    	}
+		        
+		    });
+		    $("#jyrszd").append(optionStr);
+		}
+	});
+	
+}
+
+
+/**
+ * 加载港口数据
+ * @param val
+ */
+function getInfo (val,souce) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/gksssb/getGq",
+		data : {"szd": val},
+		success : function (data) {
+			$("#jyrssgq").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (souce == 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>";
+		    	}
+		    });
+		    $("#jyrssgq").append(optionStr);
+		}
+	});
+}
+
+
+/**
+ * 加载一级分类
+ * @param val
+ */
+function getyjfl(val) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/gksssb/getyjfl",
+		success : function (data) {
+			$("#yjfl").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (val == 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>";
+		    	}
+		    });
+		    $("#yjfl").append(optionStr);
+		}
+	});
+}
+/**
+ * 加载二级分类
+ * @param val
+ */
+function getejfl(val) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/gksssb/getejfl",
+		success : function (data) {
+			$("#ejfl").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (val == 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>";
+		    	}
+		    });
+		    $("#ejfl").append(optionStr);
+		}
+	});
+}
+/**
+ * 加载港口经营人信息
+ * @param val
+ */
+function getJyrSelect (val,szd) {
+	$.ajax({
+		type:"POST",
+		url:basePath+"/jyrUser/getJyr",
+		data:{"szd":szd},
+		success:function (data) {
+			$("#ssjyr").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (val == 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>";
+		    	}
+		    });
+		    $("#ssjyr").append(optionStr);
+		}
+	});
+}
+
+/**
+ * 保存修改
+ */
+function eidit () {
+	$.ajax({
+		type:"POST",
+		url:basePath + "/gksssb/save",
+		data:$('#gksssbInfoform').serialize(),
+		success:function (data){
+			// 成功删除后刷新页面
+            if (data && data.success == true) {
+            	var ssid = data.attrs.ssid;
+            	eiditGksssbFile(ssid);
+            	
+                layer.alert("数据已成功保存！");
+                $("#gksssbwin").window("close");
+                searchRecord();
+            } else {
+                layer.alert("数据保存失败！");
+            }
+		}
+	});
+}
+/**
+ * 上传文件的onchange事件
+ */
+function lefileChange(){
+	saveJyrZs();
+}
+/**
+ * 保存上传的文件到服务器
+ */
+function saveJyrZs () {
+	var file = document.getElementById('lefile').files[0];//取得上传文件对象
+	if (file != null ) {
+		var filename = file.name;
+		var start = file.name.lastIndexOf(".");
+		var type = file.name.substring(start);//截取上传文件的后缀名
+		var size = file.size;//获取上传文件的大小
+		var del = "<a onclick='deletFile()'>删除</a>";
+		$.ajaxFileUpload({    
+	         url:basePath+"/fileUtil/saveFile", 
+	         dataType:"json",
+	         secureuri:"false",
+	         fileElementId:'lefile',     
+	         success:function(data){
+	        	// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	        		gridData={del:del,
+	        				  zs:filename,
+	        				  ope:"",
+	        				  wjdx:size,
+	        				  wjhzm:type,
+	        				  filename:data.attrs.filename};
+	        		insertJyrZs(gridData);
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+	         }    
+	    });  
+	}
+	  
+}
+/**
+ * 管理制度附件保存到数据库中
+ */
+function eiditGksssbFile (ssid) {
+	var rows = $("#zstbl").datagrid("getRows");//获取当前所有行，返回对象数组
+	if (rows != null && rows.length>0) {
+		for ( var i = 0; i < rows.length; i++) {
+			var wjm = rows[i].zs;
+			var fjid = rows[i].fjid;
+			var wjdx = rows[i].wjdx;
+			var wjhzm = rows[i].wjhzm;
+			$.ajax({
+				type:"POST",
+				async: false,
+				url:basePath+"/blob/saveBlob",
+				data:{"fileName":rows[i].filename,"szd":$("#jyrszd").val(),"id":rows[i].zsnr},
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		            	var wjnr = data.attrs.zsnr
+		            	//判断文件内容id是否有值，若没有值，说明filename为空，数据在库中，不用操作数据库，则关联的表数据也不用操作
+		            	if (wjnr !=null && wjnr != ""){
+			            	var value = {"wjm":wjm,
+				            			"id":fjid,
+				            			"szd":$("#jyrszd").val(),
+				            			"wjnr":wjnr,
+				            			"wjdx":wjdx,
+				            			"wjhzm":wjhzm,
+				            			"ssid":ssid};
+			            	editFJInfo(value);
+		            	}
+		            } else {
+		            	zsnr = null;
+		                layer.alert("数据保存失败！");
+		            }
+				}
+			});
+		}
+	}
+}
+/**
+ * 保存证书信息到附件表
+ * @param data
+ */
+function editFJInfo (data) {
+		$.ajax({
+			type:"POST",
+			async: false,
+			url:basePath+"/gksssb/saveFjInfo",
+			data:data,
+			success:function (data) {
+				// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	                layer.alert("数据已成功保存！");
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+			}
+		});
+}
+/**
+ * 文件下载
+ */
+function fileDow () {
+	var row = $('#zstbl').datagrid('getSelected');//当前row
+	if (row != null && row != "") {
+		location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid
+	}
+	
+}
+/**
+ * 删除证书
+ */
+function deletFile  () {
+	var row = $('#zstbl').datagrid('getSelected');
+	if(row != null){
+		var fileName = row.filename;
+		var fjid = row.fjid;
+		if (fjid != null && fjid != ""&& (fileName ==null ||fileName =="")) {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/fjb/fileDel",
+				data:{"fjid":fjid},
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                //删除页面上的datagrid数据
+		            	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+		            } else {
+		                layer.alert("数据保存失败！");
+		                alert(data.message);
+		            }
+				}
+			});
+		} else {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/fileUtil/delFile",
+				data:{"filename":fileName},
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                //删除页面上的datagrid数据
+		            	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+		            } else {
+		                layer.alert("数据保存失败！");
+		                alert(data.message); 
+		            }
+				}
+			});
+		}
+	}
+}
+
+/**
+ * 增加附件人员证书
+ */
+function insertJyrZs (gridDate) {
+	if (gridData != "" && gridData != null) {
+		$("#zstbl").datagrid('insertRow',{
+			row:gridData
+		});
+	}
+}
+/**
+ * 管理制度附件上传
+ */
+function eiditZdFile () {
+	var rows = $("#zstbl").datagrid("getRows");//获取当前所有行，返回对象数组
+	if (rows != null && rows.length>0) {
+		for ( var i = 0; i < rows.length; i++) {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/jyrUser/save",
+				data:$('#jyrUserInfoform').serialize(),
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                layer.alert("数据已成功保存！");
+		                $("#jyrUserwin").window("close");
+		                searchRecord();
+		            } else {
+		                layer.alert("数据保存失败！");
+		            }
+				}
+			});
+		}
+		alert(rows);
+		console.log(rows);
+	}
+	
+}
+
+/**
+ * 删除证书
+ */
+function deleteUserFile () {
+	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+}
+
+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/gksssb/GksssbLook.js

@@ -0,0 +1,135 @@
+
+/**
+ * 初始化
+ */
+jQuery(function($) {
+	// 初始化Grid
+});
+/**
+ * 数据处理
+ * @param data
+ */
+function gksssbCkInfoInit (data) {
+	//加载所在地数据信息
+	getCkSzd(data.szd);
+	getCkInfo(data.szgq);
+	getCkJyrInfo(data.qymc);
+	
+	$("#cktbr").val(data.tbr);
+	$("#cklxdh").val(data.lxdh);
+	
+}
+/**
+ * 加载查看列表
+ * @param qymc
+ */
+function getLookInfo (qymc) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/gksssb/getLookInfo",
+		data:{"qymc":qymc},
+		success : function (data) {
+			for ( var i = 0; i < data.length; i++) {
+				gridData = {ssmc:data[i].ssmc,
+						ggxh:data[i].ggxh,
+						sl:data[i].sl,
+						yxq:data[i].yxq,
+						yjfl:data[i].yjfl,
+						ejfl:data[i].ejfl,
+						id:"<a href='getfile("+data[i].id+")'>查看附件</a>",
+						cfcs:data[i].cfcs,
+						bz:data[i].bz
+						}
+				$("#sssbList").datagrid('insertRow',{
+					row:gridData
+				});
+			}
+		}
+	});
+}
+/**
+ * 加载所在地信息
+ */
+function getCkSzd (scouse) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/glzd/getszd",
+		success : function (data) {
+			$("#ckszd").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>";
+		    	}
+		        
+		    });
+		    $("#ckszd").append(optionStr);
+		}
+	});
+	
+}
+
+
+/**
+ * 加载港口数据
+ * @param val
+ */
+function getCkInfo (souce) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/gksssb/getGq",
+		success : function (data) {
+			$("#ckgq").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (souce == 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>";
+		    	}
+		    });
+		    $("#ckgq").append(optionStr);
+		}
+	});
+}
+
+/**
+ * 加载港口经营人信息
+ * @param val
+ */
+function getCkJyrInfo (val) {
+	$.ajax({
+		type:"POST",
+		url:basePath+"/jyrUser/getJyr",
+		success:function (data) {
+			$("#ckjyr").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (val == 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>";
+		    	}
+		    });
+		    $("#ckjyr").append(optionStr);
+		}
+	});
+}
+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/gksssb/GksssbTjInfo.js

@@ -0,0 +1,217 @@
+/**
+ * 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 + '/gksssb/getTjInfo',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : ['地区/企业','安全设施设备分类','安全设施设备名称','数量','单位'],
+		colModel : [ {
+			name : 'szd',
+			index : 'szd',
+			editable : false,	
+			sortable : false
+		},{
+			name : 'yjfl',
+			index : 'yjfl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'ssmc',
+			index : 'ssmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'sl',
+			index : 'sl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'sldw',
+			index : 'sldw',
+			editable : false,
+			sortable : false
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : tj_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);
+			
+			jQuery(tj_grid_selector).setCell(1,1,$("#tjszd option:selected").text());
+			jQuery(tj_grid_selector).setCell(1,2,$("#tjyjfl option:selected").text());
+		},
+		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 gksssbTjSearch () {
+	var szd = $("#tjszd").val();
+	var tjyjfl = $("#tjyjfl").val();
+	var gq = $("#gq").val();
+	var qymc = $("#qymc").val();
+	jQuery(tj_grid_selector).jqGrid(
+								'setGridParam',
+								{postData :{"szd":szd,"yjfl":tjyjfl,"szgq":gq,"qymc":qymc}}
+	).trigger("reloadGrid", [{ page: 1 }]);
+	
+}
+/**
+ * 加载一级分类
+ * @param val
+ */
+function gettjyjfl() {
+	$.ajax({
+		type : "post",
+		url : basePath + "/gksssb/getyjfl",
+		success : function (data) {
+			$("#tjyjfl").empty();
+			var optionStr = "";
+		    $.each(data, function() {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#tjyjfl").append(optionStr);
+		}
+	});
+}
+/**
+ * 选择所在地时联动港口信息
+ */
+function gettjgq () {
+	var val = $("#tjszd").val();
+	gettjgqInfo(val);
+}
+/**
+ * 加载所在地信息
+ */
+function gettjSzd () {
+	$.ajax({
+		type : "post",
+		url : basePath + "/glzd/getszd",
+		success : function (data) {
+			$("#tjszd").empty();
+			var optionStr = "";
+		    $.each(data, function() {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#tjszd").append(optionStr);
+		}
+	});
+	
+}
+/**
+ * 请求港口数据
+ * @param val
+ */
+function gettjgqInfo (val) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/gksssb/getGq",
+		data : {"szd": val},
+		success : function (data) {
+			$("#gq").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		        optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#gq").append(optionStr);
+		}
+	});
+}
+function getqymcInfo() {
+	$.ajax({
+		type:"POST",
+		url:basePath+"/jyrUser/getJyr",
+		success:function (data) {
+			$("#qymc").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		        optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#qymc").append(optionStr);
+		}
+	});
+}
+
+function printJyrTjInfo () {
+//	location.href = basePath + '/tjcx/printJyrTjInfo';
+}
+/**
+ * 关闭当前窗口
+ */
+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/gksssb/index.js

@@ -0,0 +1,308 @@
+/**
+ * 
+ */
+var grid_selector = "#grid-table";
+var pager_selector = "#grid-pager";
+var gridData = "";
+jQuery(function($) {
+	// 初始化Grid
+	initGrid();
+	getgq();
+	getJyrInfo();
+});
+/**
+ * 初始化Grid
+ */
+function initGrid() {
+	resizePageGrid(grid_selector);
+	// 数据表格初始化
+	jQuery(grid_selector).jqGrid({
+		url : basePath + '/gksssb/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 : 'ssmc',
+			index : 'ssmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'ggxh',
+			index : 'ggxh',
+			editable : false,
+			sortable : false
+		},{
+			name : 'sl',
+			index : 'sl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'yxq',
+			index : 'yxq',
+			editable : false,
+			sortable : false,
+			formatter: function(value,row,index){
+				if (value != null && value != '') {
+					return formatterDateNotsfm(new Date(value));
+				} else {
+					return '';
+				}
+				
+			}
+		},{
+			name : 'gkjyr',
+			index : 'gkjyr',
+			editable : false,
+			sortable : false
+		},{
+			name : 'yjfl',
+			index : 'yjfl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'ejfl',
+			index : 'ejfl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'tbr',
+			index : 'tbr',
+			editable : false,
+			sortable : false
+		},{
+			name : 'lxdh',
+			index : 'lxdh',
+			editable : false,
+			sortable : false
+		},{
+			name : 'cfcs',
+			index : 'cfcs',
+			editable : false,
+			sortable : false
+		},{
+			name : 'szd',
+			index : 'szd',
+			editable : false,
+			sortable : false
+		},{
+			name : 'gqmc',
+			index : 'gqmc',
+			editable : false,
+			sortable : false
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : pager_selector, //定义翻页用的导航栏
+		page : 1, //设置初始的页码,初始为1
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
+		altRows : true, //设置为交替行表格,默认为false
+		multiselect : true, //可以多选://控制是否有chechbox选择框
+		multiboxonly : true, //只有选择checkbox才会起作用 
+		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 () {
+            comGridComplete("grid-table", "editRecord");
+        },
+		onPaging: function(){
+			comGridPage("grid-table");
+		},
+		ondblClickRow : function (id,row,cel,eve) {
+			$.ajax({
+				type : 'POST',
+				dataType : "json",
+				data : {"id":id},
+				url : basePath + '/gksssb/initEdit',//请求的路径				
+				success : function(data) {
+					$("#gksssbLookwin").window({title:"查看"});
+					$("#gksssbLookwin").window("open");
+					
+					$("#gksssbLookform").form("reset");//重置表单数据
+					gksssbCkInfoInit(data);
+					$("#gksssbLookform").find("input").attr("disabled","true");//禁用表单元素input
+					$("#gksssbLookform").find("select").attr("disabled","true");//禁用表单元素select
+					$("#gksssbLookform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+					$("#gksssbLookform").find("textarea").attr("disabled","true");//禁用表单元素select
+					getLookInfo (data.qymc);
+					
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+					alert("error");
+		        }
+			});
+		}
+	});
+	// 调整jqgrid
+	ajustJqGrid(grid_selector, pager_selector);
+};
+
+/**
+ * 选择所在地时联动港口信息
+ */
+function getgq () {
+	var val = $("#szd").val();
+	getgqInfo(val);
+}
+
+/**
+ * 请求港口数据
+ * @param val
+ */
+function getgqInfo (val) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/gksssb/getGq",
+		data : {"szd": val},
+		success : function (data) {
+			$("#ssgq").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		        optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#ssgq").append(optionStr);
+		}
+	});
+}
+function getJyrInfo() {
+	$.ajax({
+		type:"POST",
+		url:basePath+"/jyrUser/getJyr",
+		success:function (data) {
+			$("#jyr").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		        optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#jyr").append(optionStr);
+		}
+	});
+}
+/**
+ * 查询
+ */
+function searchRecord () {
+	var szd = $("#szd").val();
+	var ssgq = $("#ssgq").val();
+	var jyr = $("#jyr").val();
+	
+	var ssmc = $("#ssmc").val();
+	var ggxh = $("#ggxh").val();
+	var cfcs = $("#cfcs").val();
+	
+	jQuery(grid_selector).jqGrid('setGridParam',
+								{postData :{"szd":szd,"gqmc":ssgq,"gkjyr":jyr,"ssmc":ssmc,"ggxh":ggxh,"cfcs":cfcs
+														}}).trigger("reloadGrid", [{ page: 1 }]);
+}
+
+
+/**
+ * 编辑信息
+ */
+function editInfo() {
+	// 获取选择行
+	var ids = getMultiData(grid_selector);
+	if(isNull(ids) || ids.indexOf(",")!=-1) {
+		layer.alert("请选择且只选择一条记录");
+	} else {
+	    $.ajax({
+			type : 'POST',
+			dataType : "json",
+			data : {"id":ids},
+			url : basePath + '/gksssb/initEdit',//请求的路径				
+			success : function(data) {
+				$("#gksssbwin").window({title:"编辑"});
+				$("#gksssbwin").window("open");
+				$("#gksssbInfoform").form("reset");//重置表单数据
+				gksssbInfoInit(data);
+				sssbZsInint(data.id,"1");
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+	        }
+		});
+	}
+}; 
+
+/**
+ * 添加经营管理制度信息
+ */
+function addJyrUserInfo () {
+	$("#gksssbwin").window({title:"新增"});
+	$("#gksssbwin").window("open");
+	comClearFormData("#gksssbInfoform");
+	getSzd('');
+	getInfo('','');
+	getyjfl('');
+	getejfl('');
+	getJyrSelect('','');
+}
+/**
+ * 删除经营管理制度信息
+ */
+function delInfo () {
+	// 获取选择行
+	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 + '/gksssb/delglzdInfo',//请求的路径				
+				success : function(data) {
+					layer.close(index);
+					searchRecord();
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+					layer.close(index);
+		        }
+			});
+		});
+	} else {
+		layer.alert("请选择记录");
+	}
+}
+function gksssbTj() {
+	$("#gksssbTjwin").window("open");
+	gettjyjfl();
+	getqymcInfo();
+	gettjgqInfo('');
+	gettjSzd();
+	tj_initGrid();
+}
+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/glzd/GlzdInfo.js

@@ -4,10 +4,6 @@
  */
 jQuery(function($) {
 	// 初始化Grid
-	$('input[id=lefile]').change(function() {
-		 var file = document.getElementById('lefile').files[0];
-		$('#zsfile').val(file.name);
-	});
 });
 /**
  * 数据处理
@@ -17,7 +13,7 @@ function JyrGlzdInfoInit (data) {
 	//加载所在地数据信息
 	getSzd(data.szd);
 	getInfo(data.szd,data.szgq);
-	getzdfl(data.zdfl);
+	getjyrzdfl(data.zdfl);
 	getJyrSelect(data.qymc);
 	
 	$("#id").val(data.id);
@@ -33,6 +29,44 @@ function JyrGlzdInfoInit (data) {
 }
 
 /**
+ * 附件列表初始化
+ */
+function glzdZsInint (ssid,val) {
+	$('#zstbl').datagrid("loadData",{ total: 0, rows: [] });
+	$.ajax({
+		type:"POST",
+		url: basePath+"/glzd/glzsZsInit",
+		data:{"ssid":ssid},
+		success:function (data) {
+			console.log(data);
+			var del = "";
+			if (val == "1") {
+				del = "<a onclick='deletFile()'>删除</a>";
+			}
+			var ope = "<a onclick='fileDow()'>下载</a>";
+			for ( var i = 0; i < data.length; i++) {
+				gridData={del:del,
+      				  zs:data[i].wjm,
+      				  ope:ope,
+      				  wjdx:data[i].wjdx,
+      				  wjhzm:data[i].wjhzm,
+      				  filename:"",
+      				  ssid:data[i].ssid,
+      				  fjid:data[i].id,
+      				  zsnr:data[i].wjnr};
+				insertJyrZs(gridData);
+			}
+		}
+	})
+}
+/**
+ * 选择所在地时联动港口信息
+ */
+function getgq () {
+	var val = $("#jyrszd").val();
+	getInfo(val,'');
+}
+/**
  * 加载所在地信息
  */
 function getSzd (scouse) {
@@ -86,7 +120,7 @@ function getInfo (val,souce) {
  * 加载制度分类
  * @param val
  */
-function getzdfl(val) {
+function getjyrzdfl(val) {
 	$.ajax({
 		type : "post",
 		url : basePath + "/glzd/getzdfl",
@@ -132,62 +166,191 @@ function getJyrSelect (val) {
  * 保存修改
  */
 function eidit () {
-	var data = $('#jyrGlzdInfoform').serialize();
-	console.log(data);
-	
-//	$.ajax({
-//		type:"POST",
-//		url:basePath+"/glzd/save",
-//		data:$('#jyrGlzdInfoform').serialize(),
-//		success:function (data){
-//			// 成功删除后刷新页面
-//            if (data && data.success == true) {
-//                layer.alert("数据已成功保存！");
-//                $("#jyrGlzdwin").window("close");
-//                searchRecord();
-//            } else {
-//                layer.alert("数据保存失败！");
-//            }
-//		}
-//	});
-//	eiditZdFile ();
+	$.ajax({
+		type:"POST",
+		url:basePath + "/glzd/save",
+		data:$('#jyrGlzdInfoform').serialize(),
+		success:function (data){
+			// 成功删除后刷新页面
+            if (data && data.success == true) {
+            	var ssid = data.attrs.ssid;
+            	eiditZdFile(ssid);
+            	
+                layer.alert("数据已成功保存！");
+                $("#jyrGlzdwin").window("close");
+                searchRecord();
+            } else {
+                layer.alert("数据保存失败！");
+            }
+		}
+	});
+}
+/**
+ * 上传文件的onchange事件
+ */
+function lefileChange(){
+	saveJyrZs();
+}
+/**
+ * 保存上传的文件到服务器
+ */
+function saveJyrZs () {
+	var file = document.getElementById('lefile').files[0];//取得上传文件对象
+	if (file != null ) {
+		var filename = file.name;
+		var start = file.name.lastIndexOf(".");
+		var type = file.name.substring(start);//截取上传文件的后缀名
+		var size = file.size;//获取上传文件的大小
+		var del = "<a onclick='deletFile()'>删除</a>";
+		$.ajaxFileUpload({    
+	         url:basePath+"/fileUtil/saveFile", 
+	         dataType:"json",
+	         secureuri:"false",
+	         fileElementId:'lefile',     
+	         success:function(data){
+	        	// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	        		gridData={del:del,
+	        				  zs:filename,
+	        				  ope:"",
+	        				  wjdx:size,
+	        				  wjhzm:type,
+	        				  filename:data.attrs.filename};
+	        		insertJyrZs(gridData);
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+	         }    
+	    });  
+	}
+	  
 }
 /**
- * 管理制度附件上传
+ * 管理制度附件保存到数据库中
  */
-function eiditZdFile () {
+function eiditZdFile (ssid) {
 	var rows = $("#zstbl").datagrid("getRows");//获取当前所有行，返回对象数组
 	if (rows != null && rows.length>0) {
 		for ( var i = 0; i < rows.length; i++) {
+			var wjm = rows[i].zs;
+			var fjid = rows[i].fjid;
+			var wjdx = rows[i].wjdx;
+			var wjhzm = rows[i].wjhzm;
 			$.ajax({
 				type:"POST",
-				url:basePath+"/jyrUser/save",
-				data:$('#jyrUserInfoform').serialize(),
+				async: false,
+				url:basePath+"/blob/saveBlob",
+				data:{"fileName":rows[i].filename,"szd":$("#jyrszd").val(),"id":rows[i].zsnr},
 				success:function (data){
 					// 成功删除后刷新页面
 		            if (data && data.success == true) {
-		                layer.alert("数据已成功保存！");
-		                $("#jyrUserwin").window("close");
-		                searchRecord();
+		            	var wjnr = data.attrs.zsnr
+		            	//判断文件内容id是否有值，若没有值，说明filename为空，数据在库中，不用操作数据库，则关联的表数据也不用操作
+		            	if (wjnr !=null && wjnr != ""){
+			            	var value = {"wjm":wjm,
+				            			"id":fjid,
+				            			"szd":$("#jyrszd").val(),
+				            			"wjnr":wjnr,
+				            			"wjdx":wjdx,
+				            			"wjhzm":wjhzm,
+				            			"ssid":ssid};
+			            	editFJInfo(value);
+		            	}
 		            } else {
+		            	zsnr = null;
 		                layer.alert("数据保存失败！");
 		            }
 				}
 			});
 		}
-		alert(rows);
-		console.log(rows);
+	}
+}
+/**
+ * 保存证书信息到附件表
+ * @param data
+ */
+function editFJInfo (data) {
+		$.ajax({
+			type:"POST",
+			async: false,
+			url:basePath+"/glzd/saveFjInfo",
+			data:data,
+			success:function (data) {
+				// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	                layer.alert("数据已成功保存！");
+	                $("#jyrwin").window("close");
+	                window.parent.searchRecord();
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+			}
+		});
+}
+/**
+ * 文件下载
+ */
+function fileDow () {
+	var row = $('#zstbl').datagrid('getSelected');//当前row
+	if (row != null && row != "") {
+		location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid
 	}
 	
 }
-
 /**
  * 删除证书
  */
-function deleteUserFile () {
-	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+function deletFile  () {
+	var row = $('#zstbl').datagrid('getSelected');
+	if(row != null){
+		var fileName = row.filename;
+		var fjid = row.fjid;
+		if (fjid != null && fjid != ""&& (fileName ==null ||fileName =="")) {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/fjb/fileDel",
+				data:{"fjid":fjid},
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                //删除页面上的datagrid数据
+		            	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+		            } else {
+		                layer.alert("数据保存失败！");
+		                alert(data.message);
+		            }
+				}
+			});
+		} else {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/fileUtil/delFile",
+				data:{"filename":fileName},
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                //删除页面上的datagrid数据
+		            	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+		            } else {
+		                layer.alert("数据保存失败！");
+		                alert(data.message); 
+		            }
+				}
+			});
+		}
+	}
 }
 
+/**
+ * 增加附件人员证书
+ */
+function insertJyrZs (gridDate) {
+	if (gridData != "" && gridData != null) {
+		$("#zstbl").datagrid('insertRow',{
+			row:gridData
+		});
+	}
+}
 formatterDate = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
 	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"

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

@@ -55,7 +55,12 @@ function initGrid() {
 			editable : false,
 			sortable : false,
 			formatter: function(value,row,index){
-				return formatDate(new Date(value));
+				if (value != null && value != '') {
+					return formatDate(new Date(value));
+				} else {
+					return '';
+				}
+				
 			}
 		},{
 			name : 'xdrq',
@@ -63,7 +68,11 @@ function initGrid() {
 			editable : false,
 			sortable : false,
 			formatter: function(value,row,index){
-				return formatDate(new Date(value));
+				if (value != null && value != '') {
+					return formatDate(new Date(value));
+				} else {
+					return '';
+				}
 			}
 		},{
 			name : 'lxr',
@@ -124,33 +133,28 @@ function initGrid() {
 		},
 		ondblClickRow : function (id,row,cel,eve) {
 			
-//			$.ajax({
-//				type : 'POST',
-//				dataType : "json",
-//				data : {"id":id},
-//				url : basePath + '/jyr/initEdit',//请求的路径				
-//				success : function(data) {
-//					$("#jyrwin").window({title:"查看"});
-//					$("#jyrwin").window("open");
-//					$("#jyrInfoform").form("reset");//重置表单数据
-//					$("#jyrInfoform").find("input").attr("disabled","true");//禁用表单元素input
-//					$("#jyrInfoform").find("select").attr("disabled","true");//禁用表单元素select
-//					$("#jyrInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
-//					$("#jyrInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
-//					
-//					$("#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");
-//		        }
-//			});
+			$.ajax({
+				type : 'POST',
+				dataType : "json",
+				data : {"id":id},
+				url : basePath + '/glzd/initEdit',//请求的路径				
+				success : function(data) {
+					$("#jyrGlzdwin").window({title:"查看"});
+					$("#jyrGlzdwin").window("open");
+					$("#jyrGlzdInfoform").form("reset");//重置表单数据
+					$("#jyrGlzdInfoform").find("input").attr("disabled","true");//禁用表单元素input
+					$("#jyrGlzdInfoform").find("select").attr("disabled","true");//禁用表单元素select
+					$("#jyrGlzdInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+					$("#jyrGlzdInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
+					
+					$("#tab-tools").attr("hidden",true);
+					JyrGlzdInfoInit(data);
+					glzdZsInint(data.id,"2");//参数说明：data.id:指附件表中的ssid，“2”指是查看状态，“1”指是编辑状态
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+					alert("error");
+		        }
+			});
 			
 		}
 	});
@@ -164,7 +168,6 @@ function initGrid() {
 function getgq () {
 	var val = $("#szd").val();
 	getgqInfo(val);
-	
 }
 
 /**
@@ -238,6 +241,7 @@ function editInfo() {
 				$("#jyrGlzdwin").window("open");
 				$("#jyrGlzdInfoform").form("reset");//重置表单数据
 				JyrGlzdInfoInit(data);
+				glzdZsInint(data.id,"1");
 			},
 			error: function (XMLHttpRequest, textStatus, errorThrown) {
 	        }
@@ -245,15 +249,19 @@ function editInfo() {
 	}
 }; 
 /**
- * 添加经营人人员信息
+ * 添加经营管理制度信息
  */
 function addJyrUserInfo () {
-	$("#jyrUserwin").window({title:"新增"});
-	$("#jyrUserwin").window("open");
-	comClearFormData("#jyrUserInfoform");
+	$("#jyrGlzdwin").window({title:"新增"});
+	$("#jyrGlzdwin").window("open");
+	comClearFormData("#jyrGlzdInfoform");
+	getSzd('');
+	getInfo('','');
+	getjyrzdfl('');
+	getJyrSelect('');
 }
 /**
- * 删除经营人人员信息
+ * 删除经营管理制度信息
  */
 function delInfo () {
 	// 获取选择行
@@ -264,7 +272,7 @@ function delInfo () {
 				type : 'POST',
 				dataType : "json",
 				data : {"ids":ids},
-				url : basePath + '/jyrUser/delJyrUserInfo',//请求的路径				
+				url : basePath + '/glzd/delglzdInfo',//请求的路径				
 				success : function(data) {
 					layer.close(index);
 					searchRecord();

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

@@ -242,12 +242,10 @@ function getleibie(value) {
 				} else {
 					$("#cangku").find("input:eq("+(i-5)+")").removeAttr("checked");
 				} 
-				
 			}
 		}
 		checkInfo();
 	}
-	
 }
 /**
  * 根据选中的类别控制子类别是否显示
@@ -289,7 +287,6 @@ function getqylb () {
 		} else {
 			qylb += "N";
 			byzd1=byzd1.replace(a[i].value + ",",""); 
-			
 		}
 	}
 	var b = $("#matou").find("input");
@@ -301,7 +298,6 @@ function getqylb () {
 			qylb += "N";
 			byzd1=byzd1.replace(","+b[i].value,"");
 		}
-		
 	}
 	var c = $("#cangku").find("input");
 	for (var i = 0; i<c.length; i++) {
@@ -312,7 +308,6 @@ function getqylb () {
 			qylb += "N";
 			byzd1=byzd1.replace(","+c[i].value,"");
 		}
-		
 	}
 	if (byzd1 != "") {
 		byzd1 = byzd1.substring(0, byzd1.length-1);
@@ -350,7 +345,6 @@ function getshenpi () {
  * 保存数据
  */
 function editJyr () {
-//	alert($('#jyrInfoform').serialize());
 	//生成企业类别qylb
 	var szd = $("#szd2").val();
 	$("#jyrszd").val(szd);
@@ -362,7 +356,6 @@ function editJyr () {
 	$("#rq").val(time);
 	var time2 = $("#bafzrq").datetimebox('getValue');
 	$("#rq2").val(time2);
-	
 	$.ajax({
 		type : "post",
 		url : basePath + "/jyr/save",
@@ -370,9 +363,8 @@ function editJyr () {
 		success : function(data) {
             // 成功删除后刷新页面
             if (data && data.success == true) {
-                layer.alert("数据已成功保存！");
-                closeWin();
-                searchRecord();
+            	var ssid = data.attrs.ssid;
+            	eiditRyzs(ssid);//将文件保存到数据库中
             } else {
                 layer.alert("数据保存失败！");
             }
@@ -381,21 +373,72 @@ function editJyr () {
 	
 }
 
-function clickfile() {
-	$("#fileUp").window('open');//打开弹窗
+/**
+ * 上传人员的证书到数据库中(BLOB)
+ */
+function eiditRyzs (ssid) {
+	var rows = $("#zstbl").datagrid("getRows");//获取当前所有行，返回对象数组
+	if (rows != null && rows.length>0) {
+		for ( var i = 0; i < rows.length; i++) {
+			var wjm = rows[i].zs;
+			var fjid = rows[i].fjid;
+			var wjdx = rows[i].wjdx;
+			var wjhzm = rows[i].wjhzm;
+			$.ajax({
+				type:"POST",
+				async: false,
+				url:basePath+"/blob/saveBlob",
+				data:{"fileName":rows[i].filename,"szd":$("#jyrszd").val(),"id":rows[i].zsnr},
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		            	var wjnr = data.attrs.zsnr
+		            	//判断文件内容id是否有值，若没有值，说明filename为空，数据在库中，不用操作数据库，则关联的表数据也不用操作
+		            	if (wjnr !=null && wjnr != ""){
+			            	var value = {"wjm":wjm,
+				            			"id":fjid,
+				            			"szd":$("#jyrszd").val(),
+				            			"wjnr":wjnr,
+				            			"wjdx":wjdx,
+				            			"wjhzm":wjhzm,
+				            			"ssid":ssid};
+			            	editFJInfo(value);
+		            	}
+		            } else {
+		            	zsnr = null;
+		                layer.alert("数据保存失败！");
+		            }
+				}
+			});
+		}
+	}
 }
-
-function addRow()
-{
- var tr = document.getElementById("myTr");
- var con = tr.cloneNode(true);  
- con.removeAttribute("style"); 
- tr.parentNode.insertAdjacentElement("beforeEnd",con);  
+/**
+ * 保存证书信息到附件表
+ * @param data
+ */
+function editFJInfo (data) {
+		$.ajax({
+			type:"POST",
+			async: false,
+			url:basePath+"/jyr/saveFjInfo",
+			data:data,
+			success:function (data) {
+				// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	                layer.alert("数据已成功保存！");
+	                $("#jyrwin").window("close");
+	                window.parent.searchRecord();
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+			}
+		});
 }
-function delRow(obj)
-{
- var tr=obj.parentNode.parentNode;    
- tr.parentNode.removeChild(tr); 
+function clickfile() {
+	$("#fileUp").window('open');//打开弹窗
+	
+	zsInint($("#id").val(),"1");
 }
 
 

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

@@ -0,0 +1,145 @@
+
+var gridData="";
+
+/**
+ * 初始化
+ */
+jQuery(function($) {
+	// 初始化Grid
+});
+/**
+ * 附件列表初始化
+ */
+function zsInint (ssid,val) {
+	$('#zstbl').datagrid("loadData",{ total: 0, rows: [] });
+	$.ajax({
+		type:"POST",
+		url: basePath+"/jyr/jyrZsInit",
+		data:{"ssid":ssid},
+		success:function (data) {
+			console.log(data);
+			var del = "";
+			if (val == "1") {
+				del = "<a onclick='deletFile()'>删除</a>";
+			}
+			var ope = "<a onclick='fileDow()'>下载</a>";
+			for ( var i = 0; i < data.length; i++) {
+				gridData={del:del,
+      				  zs:data[i].wjm,
+      				  ope:ope,
+      				  wjdx:data[i].wjdx,
+      				  wjhzm:data[i].wjhzm,
+      				  filename:"",
+      				  ssid:data[i].ssid,
+      				  fjid:data[i].id,
+      				  zsnr:data[i].wjnr};
+				insertJyrZs(gridData);
+			}
+		}
+	})
+}
+/**
+ * 上传文件的onchange事件
+ */
+function lefileChange(){
+	saveJyrZs();
+}
+/**
+ * 删除要上传的文件
+ */
+function deletFile () {
+	var row = $('#zstbl').datagrid('getSelected');
+	if(row != null){
+		var fileName = row.filename;
+		var fjid = row.fjid;
+		if (fjid != null && fjid != ""&& (fileName ==null ||fileName =="")) {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/fjb/fileDel",
+				data:{"fjid":fjid},
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                //删除页面上的datagrid数据
+		            	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+		            } else {
+		                layer.alert("数据保存失败！");
+		                alert(data.message);
+		            }
+				}
+			});
+		} else {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/fileUtil/delFile",
+				data:{"filename":fileName},
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                //删除页面上的datagrid数据
+		            	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+		            } else {
+		                layer.alert("数据保存失败！");
+		                alert(data.message); 
+		            }
+				}
+			});
+		}
+	}
+}
+/**
+ * 文件下载
+ */
+function fileDow () {
+	var row = $('#zstbl').datagrid('getSelected');//当前row
+	if (row != null && row != "") {
+		location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid
+	}
+	
+}
+/**
+ * 保存上传的文件到服务器
+ */
+function saveJyrZs () {
+	var file = document.getElementById('lefile').files[0];//取得上传文件对象
+	if (file != null ) {
+		var filename = file.name;
+		var start = file.name.lastIndexOf(".");
+		var type = file.name.substring(start);//截取上传文件的后缀名
+		var size = file.size;//获取上传文件的大小
+		var del = "<a onclick='deletFile()'>删除</a>";
+		$.ajaxFileUpload({    
+	         url:basePath+"/fileUtil/saveFile", 
+	         dataType:"json",
+	         secureuri:"false",
+	         fileElementId:'lefile',     
+	         success:function(data){
+	        	// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	        		gridData={del:del,
+	        				  zs:filename,
+	        				  ope:"",
+	        				  wjdx:size,
+	        				  wjhzm:type,
+	        				  filename:data.attrs.filename};
+	        		insertJyrZs(gridData);
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+	         }    
+	    });  
+	}
+	  
+}
+/**
+ * 增加附件人员证书
+ */
+function insertJyrZs (gridDate) {
+	if (gridData != "" && gridData != null) {
+		$("#zstbl").datagrid('insertRow',{
+			row:gridData
+		});
+	}
+}
+
+

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/JyrUserInfo.js

@@ -24,7 +24,29 @@ function JyrUserInfoInit (data) {
 	$("#userzwhzc").val(data.zwhzc);
 	$("#lxdh").val(data.lxdh);
 	$("#bz").val(data.bz);
-	loadZsData();
+	$('#zstbl').datagrid('loadData',{total:0,rows:[]}); 
+}
+/**
+ * 上传文件列表的数据初始化加载
+ * @param data
+ */
+function ryzsbInfoInit (data) {
+	for ( var i = 0; i < data.length; i++) {
+		var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;<a onclick="deleteUserFile()">删除</a>&nbsp;&nbsp;<a onclick="fileDow()">下载</a>';
+		gridData = {zsid:data[i].id,
+					zsmc:data[i].zsmc,
+					zszl:data[i].zszl,
+					zsbh:data[i].zsbh, 
+					yxq:formatterDateNotsfm(new Date(data[i].yxq)),
+					zs:data[i].wjm,
+					fjid:data[i].fjid,
+					manage:manage,
+					zsnr:data[i].zsnr,
+					index:i,
+					filename:''
+					};
+		insertJyrUserZs();
+	}
 }
 /**
  * 下拉框绑定
@@ -43,7 +65,6 @@ function getselectedInfo (souce,url,parama,select) {
 		    	} else {
 		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
 		    	}
-		        
 		    });
 		    $(select).append(optionStr);
 		}
@@ -65,15 +86,11 @@ function getSzd (scouse) {
 		    	} else {
 		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
 		    	}
-		        
 		    });
 		    $("#jyrszd").append(optionStr);
 		}
 	});
-	
 }
-
-
 /**
  * 加载港口数据
  * @param val
@@ -97,8 +114,6 @@ function getInfo (val,souce) {
 		}
 	});
 }
-
-
 /**
  * 加载证件类型
  * @param val
@@ -170,47 +185,117 @@ function getJyrSelect (val) {
  * 保存修改
  */
 function eidit () {
-	/*$.ajax({
+	//请求保存经营人人员的基本信息
+	$.ajax({
 		type:"POST",
 		url:basePath+"/jyrUser/save",
 		data:$('#jyrUserInfoform').serialize(),
 		success:function (data){
 			// 成功删除后刷新页面
             if (data && data.success == true) {
-                layer.alert("数据已成功保存！");
-                $("#jyrUserwin").window("close");
-                searchRecord();
+            	//请求保存经营人人员的证书
+            	eiditRyzs ();
             } else {
                 layer.alert("数据保存失败！");
             }
 		}
-	});*/
-	eiditRyzs ();
+	});
+	
 }
+var zsnr;
+/**
+ * 上传经营人人员的证书到数据库中(BLOB)
+ */
 function eiditRyzs () {
 	var rows = $("#zstbl").datagrid("getRows");//获取当前所有行，返回对象数组
 	if (rows != null && rows.length>0) {
 		for ( var i = 0; i < rows.length; i++) {
+			var zsmc = rows[i].zsmc;
+			var zszl = rows[i].zszl;
+			var zsbh = rows[i].zsbh;
+			var yxq = rows[i].yxq;
+			var id = rows[i].zsid;
+			var fileName = rows[i].filename;
+			//附件表的参数
+			var wjm = rows[i].zs;
+			var fjid = rows[i].fjid;
+			var wjdx = rows[i].wjdx;
+			var wjhzm = rows[i].wjhzm;
 			$.ajax({
 				type:"POST",
-				url:basePath+"/jyrUser/save",
-				data:$('#jyrUserInfoform').serialize(),
+				async: false,
+				url:basePath+"/blob/saveBlob",
+				data:{"fileName":fileName,"szd":$("#jyrszd").val(),"id":rows[i].zsnr},
 				success:function (data){
 					// 成功删除后刷新页面
 		            if (data && data.success == true) {
-		                layer.alert("数据已成功保存！");
-		                $("#jyrUserwin").window("close");
-		                searchRecord();
+		            	//此判断用于上传的文件是否修改过
+		            	if (fileName != null && fileName!= '') {
+		            		zsnr = data.attrs.zsnr;
+		            	} else {
+		            		zsnr = rows[i].zsnr;
+		            	}
+		            	//还差文件大小和后缀名
+						var fjb = {"wjm":wjm,"id":fjid,"szd":$("#jyrszd").val(),"wjnr":zsnr,"wjdx":wjdx,"wjhzm":wjhzm,"ssid":id,"filename":fileName};
+						var ryzsData = {"ryid":$("#userzjhm").val(),"zsmc":zsmc,"zszl":zszl,"zsbh":zsbh,"yxq":yxq,"zsnr":zsnr,"szd":$("#jyrszd").val(),"id":id};
+						editRyzsInfo(ryzsData,fjb);
 		            } else {
+		            	zsnr = null;
 		                layer.alert("数据保存失败！");
 		            }
 				}
 			});
 		}
-		alert(rows);
-		console.log(rows);
 	}
-	
+}
+/**
+ * 保存人员证书信息(RYZSB)
+ * @param zsnr
+ */
+function editRyzsInfo (souce,fjb) {
+		$.ajax({
+			type:"POST",
+			async: false,
+			url:basePath+"/jyrUser/saveRyzsInfo",
+			data:souce,
+			success:function (data) {
+				// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	            	fjb.ssid=data.attrs.ssid;
+	            	if (fjb.filename != null && fjb.filename != "") {
+	            		editFJInfo(fjb);	
+	            	} else {
+	            		 layer.alert("数据已成功保存！");
+	 	                $("#jyrUserwin").window("close");
+	 	                searchRecord();
+	            	}
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+			}
+		});
+}
+/**
+ * 保存证书信息到附件表
+ * @param zsnr
+ */
+function editFJInfo (data) {
+		$.ajax({
+			type:"POST",
+			async: false,
+			url:basePath+"/jyrUser/saveFjInfo",
+			data:data,
+			success:function (data) {
+				// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	                layer.alert("数据已成功保存！");
+	                $("#jyrUserwin").window("close");
+	                searchRecord();
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+			}
+		});
 }
 /**
  * 加载经营人人员证书
@@ -228,6 +313,7 @@ function loadZsData () {
 function addJyrUserZS () {
 	$("#jyrUserZsinfo").window("open");
 	$("#jyrUserZsInfoform").form("reset");
+	
 }
 /**
  * 增加经营人证书
@@ -245,7 +331,6 @@ function insertJyrUserZs () {
 function eiditUserFile () {
 	var row = $('#zstbl').datagrid('getSelected');
 	var index = $("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected'));
-	alert(index);
 	if (row != null) {
 		$("#jyrUserZsinfo").window("open");
 		$("#jyrUserZsInfoform").form("reset");
@@ -254,9 +339,15 @@ function eiditUserFile () {
 		$("#zsbh").val(row.zsbh);
 		$("#yxq").datetimebox("setValue",row.yxq);
 		$("#zsfile").val(row.zs);
+		$("#zsnr").val(row.zsnr);
+		$("#zsid").val(row.zsid);
+		$("#fjbid").val(row.fjid);
 		$("#index").val(index);
 	}
 }
+/**
+ * 修改人员证书
+ */
 function eiditJyrUserZs () {
 	if (gridData != "" && gridData != null) {
 		$("#zstbl").datagrid('updateRow',{
@@ -269,9 +360,58 @@ function eiditJyrUserZs () {
  * 删除证书
  */
 function deleteUserFile () {
-	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+	//删除数据库中的数据
+	var row = $('#zstbl').datagrid('getSelected');//当前要删的数据
+	if(row != null){
+		var fileName = row.filename;
+		var id = row.zsid;
+		var fjid = row.fjid;
+		if ((fileName == null || fileName == "")&&id != null && id != "" && fjid != null && fjid != "") {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/jyrUser/fileDel",
+				data:{"id":row.zsid,"fjid":row.fjid},
+				success:function (data){
+					console.log(data);
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                //删除页面上的datagrid数据
+		            	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+		            } else {
+		                layer.alert("数据保存失败！");
+		                alert(data.message);
+		            }
+				}
+			});
+		} else {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/fileUtil/delFile",
+				data:{"filename":fileName},
+				success:function (data){
+					console.log(data);
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                //删除页面上的datagrid数据
+		            	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+		            } else {
+		                layer.alert("数据保存失败！");
+		                alert(data.message);
+		            }
+				}
+			});
+		}
+	}
+	
+	
+}
+/**
+ * 文件下载
+ */
+function fileDow () {
+	var row = $('#zstbl').datagrid('getSelected');//当前row
+	location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid
 }
-
 formatterDate = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
 	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/JyrUserTjInfo.js

@@ -0,0 +1,166 @@
+/**
+ * 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 + '/jyrUser/selectTJByInfo',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : ['地区/企业','人员类型','人数'],
+		colModel : [ {
+			name : 'qymc',
+			index : 'qymc',
+			editable : false,	
+			sortable : false
+		},{
+			name : 'rylx',
+			index : 'rylx',
+			editable : false,
+			sortable : false
+		},{
+			name : 'rs',
+			index : 'rs',
+			editable : false,
+			sortable : false
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : tj_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"
+        },
+		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 jyrUserTjSearch () {
+	var szd = $("#tjszd").val();
+	var rylx = $("#tjrylx").val();
+	var byzd1 = $("#addtime").val();
+	jQuery(tj_grid_selector).jqGrid(
+								'setGridParam',
+								{postData :{"szd":szd,"rylx":rylx,"byzd1":byzd1}}
+	).trigger("reloadGrid", [{ page: 1 }]);
+	
+}
+
+/**
+ * 加载所在地信息
+ */
+function getTjSzd() {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyrUser/getszd",
+		success : function (data) {
+			$("#tjszd").empty();
+			var optionStr = "";
+		    $.each(data, function() {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#tjszd").append(optionStr);
+		}
+	});
+	
+}
+
+/**
+ * 加载人员类型信息
+ */
+function getjyrUserTjRylx() {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyrUser/getRylx",
+		success : function (data) {
+			$("#tjrylx").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#tjrylx").append(optionStr);
+		}
+	});
+	
+}
+
+function printJyrTjInfo () {
+//	location.href = basePath + '/tjcx/printJyrTjInfo';
+}
+/**
+ * 关闭当前窗口
+ */
+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/jyrUser/JyrUserZsInfo.js

@@ -4,14 +4,15 @@
  */
 jQuery(function($) {
 	// 初始化Grid
-	
-	$('input[id=lefile]').change(function() {
-		 var file = document.getElementById('lefile').files[0];
-		$('#zsfile').val(file.name);
-	});
-	
 });
 /**
+ * 上传文件的onchange事件
+ */
+function lefileChange(){
+	var file = document.getElementById('lefile').files[0];
+	$('#zsfile').val(file.name);
+}
+/**
  * 删除要上传的文件
  */
 function deletFile () {
@@ -22,41 +23,62 @@ function deletFile () {
  * 保存要上传的文件
  */
 function saveUserZs () {
-	$.ajax({
-		type:"POST",
-		url:basePath+"/jyrUser/saveBlob",
-		data:$('#jyrUserZsInfoform').serialize(),
-		success:function (data){
-			// 成功删除后刷新页面
-            if (data && data.success == true) {
-                layer.alert("数据已成功保存！");
-            } else {
-                layer.alert("数据保存失败！");
-            }
-		}
-	});
-	
-//	var file = document.getElementById('lefile').value;
-//	console.log(file);
-//	var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;<a onclick="deleteUserFile()">删除</a>';
-//	var index = $("#index").val();
-//	gridData = {id:$("#id").val(),
-//				zsmc:$("#zsmc").val(),
-//				zszl:$("#zszl").val(),
-//				zsbh:$("#zsbh").val(),
-//				yxq:$("#yxq").datetimebox("getValue"),
-//				zs:$("#zsfile").val(),
-//				manage:manage,
-//				index:$("#index").val()
-//				};
-//	if (index != "" && index != null) {
-//		window.parent.eiditJyrUserZs();
-//	} else {
-//		window.parent.insertJyrUserZs();
-//	}
-//	$("#jyrUserZsinfo").window("close");
+	var file = document.getElementById('lefile').files[0];//取得上传文件对象
+	if (file != null ) {
+		var start = file.name.lastIndexOf(".");
+		var type = file.name.substring(start);//截取上传文件的后缀名
+		var size = file.size;//获取上传文件的大小
+		//这个请求是将文件上传到服务器上
+		 $.ajaxFileUpload({    
+	         url:basePath+"/fileUtil/saveFile", 
+	         dataType:"json",
+	         secureuri:"false",
+	         fileElementId:'lefile',     
+	         success:function(data){  
+	        	// 成功删除后刷新页面
+	            if (data && data.success == true) {
+	            	var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;<a onclick="deleteUserFile()">删除</a>&nbsp;&nbsp;<a onclick="fileDow()">下载</a>';
+	        		var index = $("#index").val();
+	        		gridData = {id:$("#zsid").val(),
+	        					zsmc:$("#zsmc").val(),
+	        					zszl:$("#zszl").val(),
+	        					zsbh:$("#zsbh").val(),
+	        					yxq:$("#yxq").datetimebox("getValue"),
+	        					zs:$("#zsfile").val(),
+	        					manage:manage,
+	        					zsnr:$("#zsnr").val(),
+	        					fjbid:$("#fjbid").val(),
+	        					index:index,
+	        					filename:data.attrs.filename,
+	        					wjdx:size,
+	        					wjhzm:type
+	        					};
+	        		window.parent.insertJyrUserZs();
+	        		$("#jyrUserZsinfo").window("close");
+	            } else {
+	                layer.alert("数据保存失败！");
+	            }
+	         }    
+	     });  
+	} else {
+		var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;<a onclick="deleteUserFile()">删除</a>&nbsp;&nbsp;<a onclick="fileDow()">下载</a>';
+		var index = $("#index").val();
+		gridData = {id:$("#zsid").val(),
+					zsmc:$("#zsmc").val(),
+					zszl:$("#zszl").val(),
+					zsbh:$("#zsbh").val(),
+					yxq:$("#yxq").datetimebox("getValue"),
+					zs:$("#zsfile").val(),
+					manage:manage,
+					zsnr:$("#zsnr").val(),
+					fjbid:$("#fjbid").val(),
+					index:index,
+					};
+		window.parent.eiditJyrUserZs();
+		$("#jyrUserZsinfo").window("close");
+	}
+	  
 }
-
 /**
  * 关闭
  */

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

@@ -131,33 +131,27 @@ function initGrid() {
 		},
 		ondblClickRow : function (id,row,cel,eve) {
 			
-//			$.ajax({
-//				type : 'POST',
-//				dataType : "json",
-//				data : {"id":id},
-//				url : basePath + '/jyr/initEdit',//请求的路径				
-//				success : function(data) {
-//					$("#jyrwin").window({title:"查看"});
-//					$("#jyrwin").window("open");
-//					$("#jyrInfoform").form("reset");//重置表单数据
-//					$("#jyrInfoform").find("input").attr("disabled","true");//禁用表单元素input
-//					$("#jyrInfoform").find("select").attr("disabled","true");//禁用表单元素select
-//					$("#jyrInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
-//					$("#jyrInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
-//					
-//					$("#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");
-//		        }
-//			});
+			$.ajax({
+				type : 'POST',
+				dataType : "json",
+				data : {"id":id},
+				url : basePath + '/jyrUser/initEdit',//请求的路径				
+				success : function(data) {
+					$("#jyrUserwin").window({title:"查看"});
+					$("#jyrUserwin").window("open");
+					$("#jyrUserInfoform").form("reset");//重置表单数据
+					$("#jyrUserInfoform").find("input").attr("disabled","true");//禁用表单元素input
+					$("#jyrUserInfoform").find("select").attr("disabled","true");//禁用表单元素select
+					$("#jyrUserInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+					$("#jyrUserInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
+					
+					$("#tab-tools").attr("hidden",true);
+					JyrUserInfoInit(data);
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+					alert("error");
+		        }
+			});
 			
 		}
 	});
@@ -262,16 +256,32 @@ function editInfo() {
 			data : {"id":ids},
 			url : basePath + '/jyrUser/initEdit',//请求的路径				
 			success : function(data) {
-				$("#jyrUserwin").window({title:"编辑"});
-				$("#jyrUserwin").window("open");
-				$("#jyrUserInfoform").form("reset");//重置表单数据
-				JyrUserInfoInit(data);
+				initRyzsbEdit(data.sfzh,data);
+				
 			},
 			error: function (XMLHttpRequest, textStatus, errorThrown) {
 	        }
 		});
 	}
 }; 
+
+function initRyzsbEdit (id,souces) {
+	$.ajax({
+		type : 'POST',
+		dataType : "json",
+		data : {"id":id},
+		url : basePath + '/jyrUser/initRyzsbEdit',//请求的路径				
+		success : function(data) {
+			$("#jyrUserwin").window({title:"编辑"});
+			$("#jyrUserwin").window("open");
+			$("#jyrUserInfoform").form("reset");//重置表单数据
+			JyrUserInfoInit(souces);
+			ryzsbInfoInit(data);
+		},
+		error: function (XMLHttpRequest, textStatus, errorThrown) {
+        }
+	});
+}
 /**
  * 添加经营人人员信息
  */
@@ -305,4 +315,11 @@ function delInfo () {
 	} else {
 		layer.alert("请选择记录");
 	}
+}
+
+function jyrUserTj() {
+	$("#jyrUserTjwin").window("open");
+	getTjSzd();
+	getjyrUserTjRylx();
+	tj_initGrid();
 }

gkaqv2/trunk/modules/web/src/main/webapp/uplod/836ED77540024077859F7B732B75452420161216114005.txt

@@ -0,0 +1,34 @@
+	// 创建一个通用的多部分解析器
+    	CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(request.getSession()
+    	        .getServletContext());
+    	// 判断 request 是否有文件上传,即多部分请求
+    	if (multipartResolver.isMultipart(request)) {
+    		// 转换成多部分request
+    	    MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
+    	    // 取得request中的所有文件名
+            Iterator<String> iter = multiRequest.getFileNames();  
+            while(iter.hasNext()){  
+                //记录上传过程起始时的时间，用来计算上传时间  
+                int pre = (int) System.currentTimeMillis();  
+                //取得上传文件  
+                MultipartFile file = multiRequest.getFile(iter.next());  
+                if(file != null){  
+                    //取得当前上传文件的文件名称  
+                    String myFileName = file.getOriginalFilename();  
+                    //如果名称不为“”,说明该文件存在，否则说明该文件不存在  
+                    if(myFileName.trim() !=""){  
+                        System.out.println(myFileName);  
+                        //重命名上传后的文件名  
+                        String fileName = "demoUpload" + file.getOriginalFilename();  
+                        //定义上传路径  
+                        String path = webpath + "/" + fileName;  
+                        File localFile = new File(path);  
+                        file.transferTo(localFile);  
+                    }  
+                }  
+                //记录上传该文件后的时间  
+                int finaltime = (int) System.currentTimeMillis();  
+                System.out.println(finaltime - pre);  
+            }  
+              
+        }