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

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

@@ -6,21 +6,20 @@ import java.util.List;
 
 import org.apache.poi.ss.formula.functions.T;
 
-import jxl.Sheet;
-import jxl.Workbook;
+
 
 public class ImporExcel {
 	 public static List<T> getAllByExcel(String file){
 	        List<T> list=new ArrayList<T>();
-	        try {
-	            Workbook rwb=Workbook.getWorkbook(new File(file));
-	            Sheet rs=rwb.getSheet("Test Shee 1");//或者rwb.getSheet(0)
-	            int clos=rs.getColumns();//得到所有的列
-	            int rows=rs.getRows();//得到所有的行
-	            
-	            System.out.println(clos+" rows:"+rows);
-	            for (int i = 1; i < rows; i++) {
-	                for (int j = 0; j < clos; j++) {
+//	        try {
+//	            Workbook rwb=Workbook.getWorkbook(new File(file));
+//	            Sheet rs=rwb.getSheet("Test Shee 1");//或者rwb.getSheet(0)
+//	            int clos=rs.getColumns();//得到所有的列
+//	            int rows=rs.getRows();//得到所有的行
+//	            
+//	            System.out.println(clos+" rows:"+rows);
+//	            for (int i = 1; i < rows; i++) {
+//	                for (int j = 0; j < clos; j++) {
 //	                    //第一个是列数，第二个是行数
 //	                    String id=rs.getCell(j++, i).getContents();//默认最左边编号也算一列 所以这里得j++
 //	                    String name=rs.getCell(j++, i).getContents();
@@ -29,12 +28,12 @@ public class ImporExcel {
 //	                    
 //	                    System.out.println("id:"+id+" name:"+name+" sex:"+sex+" num:"+num);
 //	                    list.add(new StuEntity(Integer.parseInt(id), name, sex, Integer.parseInt(num)));
-	                }
-	            }
-	        } catch (Exception e) {
-	            // TODO Auto-generated catch block
-	            e.printStackTrace();
-	        } 
+//	                }
+//	            }
+//	        } catch (Exception e) {
+//	            // TODO Auto-generated catch block
+//	            e.printStackTrace();
+//	        } 
 	        return list;
 	        
 	    }

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

@@ -18,7 +18,11 @@ import com.xt.js.gkaq.web.model.BloBModel;
 import com.xt.js.gkaq.web.service.BloBService;
 import com.xt.js.gkaq.web.vo.BloBVo;
 import com.yuanxd.tools.utils.WebJsonResult;
-
+/**
+ * ´ó×ֶαí¿ØÖƲã
+ * @author ÀîС»¢
+ *
+ */
 @Controller
 @RequestMapping(value = "/blob", produces = "application/json; charset=utf-8")
 public class BlobCtl extends BaseCtl {

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

@@ -18,7 +18,11 @@ import com.xt.js.gkaq.web.service.BloBService;
 import com.xt.js.gkaq.web.service.FjbService;
 import com.xt.js.gkaq.web.vo.BloBVo;
 import com.yuanxd.tools.utils.WebJsonResult;
-
+/**
+ * 文件上传下载删除控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/fileUtil", produces = "application/json; charset=utf-8")
 public class FileUtilCtl extends BaseCtl {

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

@@ -9,16 +9,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.web.model.FjbModel;
 import com.xt.js.gkaq.web.service.FjbService;
-import com.xt.js.gkaq.web.service.RyzsbService;
 import com.yuanxd.tools.utils.WebJsonResult;
-
+/**
+ * 附件表控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/fjb", produces = "application/json; charset=utf-8")
 public class FjbCtl extends BaseCtl {
     @Autowired
     private FjbService fjbService;
-    @Autowired
-    private RyzsbService ryzsbService;
     /**
      * 附件删除
      * @param id

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

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.util.List;
 
@@ -9,21 +9,22 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
-import com.xt.js.gkaq.frame.service.CodeService;
-import com.xt.js.gkaq.web.model.BwInfoModel;
-import com.xt.js.gkaq.web.model.BwModel;
-import com.xt.js.gkaq.web.service.BwService;
+import com.xt.js.gkaq.dwxx.model.BwInfoModel;
+import com.xt.js.gkaq.dwxx.model.BwModel;
+import com.xt.js.gkaq.dwxx.service.BwService;
 import com.xt.js.gkaq.web.vo.BwVo;
 import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
-
+/**
+ * 泊位信息控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/bw", produces = "application/json; charset=utf-8")
 public class BwCtl extends BaseCtl {
     @Autowired
     private BwService bwService;
-    @Autowired
-    private CodeService codeService;
     
     /**
      * 数据表格

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

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.util.List;
 
@@ -9,20 +9,21 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
-import com.xt.js.gkaq.frame.service.CodeService;
-import com.xt.js.gkaq.web.model.CkModel;
-import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.dwxx.model.CkModel;
+import com.xt.js.gkaq.dwxx.service.CkService;
 import com.xt.js.gkaq.web.vo.CkVo;
 import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
-
+/**
+ * 仓库信息控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/ck", produces = "application/json; charset=utf-8")
 public class CkCtl extends BaseCtl {
     @Autowired
     private CkService ckService;
-    @Autowired
-    private CodeService codeService;
     
     /**
      * 数据表格

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

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.util.List;
 
@@ -9,20 +9,21 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
-import com.xt.js.gkaq.frame.service.CodeService;
-import com.xt.js.gkaq.web.model.DcModel;
-import com.xt.js.gkaq.web.service.DcService;
+import com.xt.js.gkaq.dwxx.model.DcModel;
+import com.xt.js.gkaq.dwxx.service.DcService;
 import com.xt.js.gkaq.web.vo.DcVo;
 import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
-
+/**
+ * 堆场信息控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/dc", produces = "application/json; charset=utf-8")
 public class DcCtl extends BaseCtl {
     @Autowired
     private DcService dcService;
-    @Autowired
-    private CodeService codeService;
     
     /**
      * 数据表格

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/GksssbCtl.java → gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/dwxx/jyrjcxx/GksssbCtl.java

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -14,16 +14,16 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.alibaba.fastjson.JSONArray;
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.dwxx.model.GksssbListModel;
+import com.xt.js.gkaq.dwxx.model.GksssbModel;
+import com.xt.js.gkaq.dwxx.model.GksssbTjModel;
+import com.xt.js.gkaq.dwxx.service.GksssbService;
 import com.xt.js.gkaq.frame.model.CodeModelDto;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.service.CodeService;
 import com.xt.js.gkaq.web.model.FjbModel;
-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.model.GqModel;
 import com.xt.js.gkaq.web.service.FjbService;
-import com.xt.js.gkaq.web.service.GksssbService;
 import com.xt.js.gkaq.web.service.GqService;
 import com.xt.js.gkaq.web.service.RyzsbService;
 import com.xt.js.gkaq.web.vo.FjbVo;
@@ -34,7 +34,11 @@ import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
 import com.yuanxd.tools.utils.WebJsonResult;
 import com.yuanxd.tools.utils.string.StringUtils;
-
+/**
+ * ¸Û¿ÚÉèÊ©É豸
+ * @author ÀîС»¢
+ *
+ */
 @Controller
 @RequestMapping(value = "/gksssb", produces = "application/json; charset=utf-8")
 public class GksssbCtl extends BaseCtl {

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

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,17 +14,16 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.ExportExcel;
-import com.xt.js.gkaq.dwxx.model.JyrInfoExcelModel;
-import com.xt.js.gkaq.frame.service.CodeService;
-import com.xt.js.gkaq.web.model.CkModel;
-import com.xt.js.gkaq.web.model.TjcxModel;
-import com.xt.js.gkaq.web.service.CkService;
-import com.xt.js.gkaq.web.service.JyrTjcxService;
-import com.xt.js.gkaq.web.vo.CkVo;
+import com.xt.js.gkaq.dwxx.model.TjcxModel;
+import com.xt.js.gkaq.dwxx.service.JyrTjcxService;
 import com.xt.js.gkaq.web.vo.TjcxVo;
 import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
-
+/**
+ * 经营人统计查询控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/tjcx", produces = "application/json; charset=utf-8")
 public class JyrTjcxCtl extends BaseCtl {
@@ -47,7 +46,12 @@ public class JyrTjcxCtl extends BaseCtl {
 		PageInfo<TjcxModel> pageResult = new PageInfo<>(list);
 		return pageResult;
     }
-    
+    /**
+     * 打印
+     * @param model
+     * @param response
+     * @param request
+     */
     @RequestMapping("printJyrTjInfo")
     @ResponseBody
     public void printJyrTjInfo (TjcxModel model, HttpServletResponse response,HttpServletRequest request) {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrUserCtl.java → gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/dwxx/jyrjcxx/JyrUserCtl.java

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -42,7 +42,11 @@ import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.BaseUUIDModel;
 import com.xt.js.gkaq.common.Constants;
 import com.xt.js.gkaq.common.util.FileUtil;
+import com.xt.js.gkaq.dwxx.model.JyrUserListModel;
+import com.xt.js.gkaq.dwxx.model.JyrUserModel;
+import com.xt.js.gkaq.dwxx.model.JyrUserTJModel;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
+import com.xt.js.gkaq.dwxx.service.JyrUserService;
 import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
 import com.xt.js.gkaq.frame.model.CodeModel;
 import com.xt.js.gkaq.frame.model.CodeModelDto;
@@ -52,15 +56,11 @@ import com.xt.js.gkaq.frame.service.CodeService;
 import com.xt.js.gkaq.web.model.BloBModel;
 import com.xt.js.gkaq.web.model.FjbModel;
 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.model.RyzsbInfoModel;
 import com.xt.js.gkaq.web.model.RyzsbModel;
 import com.xt.js.gkaq.web.service.BloBService;
 import com.xt.js.gkaq.web.service.FjbService;
 import com.xt.js.gkaq.web.service.GqService;
-import com.xt.js.gkaq.web.service.JyrUserService;
 import com.xt.js.gkaq.web.service.RyzsbService;
 import com.xt.js.gkaq.web.vo.BloBVo;
 import com.xt.js.gkaq.web.vo.FjbVo;
@@ -70,7 +70,11 @@ import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
 import com.yuanxd.tools.utils.WebJsonResult;
 import com.yuanxd.tools.utils.string.StringUtils;
-
+/**
+ * 经营人人员信息控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/jyrUser", produces = "application/json; charset=utf-8")
 public class JyrUserCtl extends BaseCtl {

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

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.util.List;
 
@@ -13,19 +13,16 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.ExportExcel;
-import com.xt.js.gkaq.frame.service.CodeService;
-import com.xt.js.gkaq.web.model.CkModel;
-import com.xt.js.gkaq.web.model.TjcxModel;
-import com.xt.js.gkaq.web.model.WxhwtjcxModel;
-import com.xt.js.gkaq.web.service.CkService;
-import com.xt.js.gkaq.web.service.JyrTjcxService;
-import com.xt.js.gkaq.web.service.JyrWxhwtjcxService;
-import com.xt.js.gkaq.web.vo.CkVo;
-import com.xt.js.gkaq.web.vo.TjcxVo;
+import com.xt.js.gkaq.dwxx.model.WxhwtjcxModel;
+import com.xt.js.gkaq.dwxx.service.JyrWxhwtjcxService;
 import com.xt.js.gkaq.web.vo.WxhwtjcxVo;
 import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
-
+/**
+ * 经营人危险货物统计控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/jyrwxhw", produces = "application/json; charset=utf-8")
 public class JyrWxhwtjcxCtl extends BaseCtl {

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

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -35,7 +35,11 @@ import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
 import com.yuanxd.tools.utils.WebJsonResult;
 import com.yuanxd.tools.utils.string.StringUtils;
-
+/**
+ * 经营人信息控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/jyr", produces = "application/json; charset=utf-8")
 public class JyrjcxxCtl extends BaseCtl {
@@ -49,8 +53,6 @@ public class JyrjcxxCtl extends BaseCtl {
     private FjbService fjbService;
     @Autowired
     private RyzsbService ryzsbService;
-    @Autowired
-    private BloBService bloBService;
 
     //    @RequiresPermissions("jyr:main")
     @RequestMapping("")

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/WxcgtjcxCtl.java → gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/dwxx/jyrjcxx/WxcgtjcxCtl.java

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,22 +14,16 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.ExportExcel;
-import com.xt.js.gkaq.frame.service.CodeService;
-import com.xt.js.gkaq.web.model.CkModel;
-import com.xt.js.gkaq.web.model.TjcxModel;
-import com.xt.js.gkaq.web.model.WxcgtjcxModel;
-import com.xt.js.gkaq.web.model.WxhwtjcxModel;
-import com.xt.js.gkaq.web.service.CkService;
-import com.xt.js.gkaq.web.service.JyrTjcxService;
-import com.xt.js.gkaq.web.service.JyrWxhwtjcxService;
-import com.xt.js.gkaq.web.service.WxcgtjcxService;
-import com.xt.js.gkaq.web.vo.CkVo;
-import com.xt.js.gkaq.web.vo.TjcxVo;
+import com.xt.js.gkaq.dwxx.model.WxcgtjcxModel;
+import com.xt.js.gkaq.dwxx.service.WxcgtjcxService;
 import com.xt.js.gkaq.web.vo.WxcgtjcxVo;
-import com.xt.js.gkaq.web.vo.WxhwtjcxVo;
 import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
-
+/**
+ * 危险储罐统计信息控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/wxcg", produces = "application/json; charset=utf-8")
 public class WxcgtjcxCtl extends BaseCtl {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/WxhwCtl.java → gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/dwxx/jyrjcxx/WxhwCtl.java

@@ -1,27 +1,26 @@
-package com.xt.js.gkaq.web.ctl;
-
-
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
-import com.xt.js.gkaq.web.model.WxhwModel;
-import com.xt.js.gkaq.web.service.WxhwService;
+import com.xt.js.gkaq.dwxx.model.WxhwModel;
+import com.xt.js.gkaq.dwxx.service.WxhwService;
 import com.xt.js.gkaq.web.vo.WxhwVo;
 import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
-
+/**
+ * ΣÏÕ»õÎïÎïÆ·Ãû³Æ¿ØÖƲã
+ * @author ÀîС»¢
+ *
+ */
 @Controller
 @RequestMapping(value = "/wxhw", produces = "application/json; charset=utf-8")
 public class WxhwCtl extends BaseCtl {
-	
 	@Autowired
 	private WxhwService service;
 	

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/ZdhqdCtl.java → gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/dwxx/jyrjcxx/ZdhqdCtl.java

@@ -1,4 +1,4 @@
-package com.xt.js.gkaq.web.ctl;
+package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -14,18 +14,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.alibaba.fastjson.JSONArray;
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.BaseUUIDModel;
-import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
+import com.xt.js.gkaq.dwxx.model.zdhqdExtendModel;
+import com.xt.js.gkaq.dwxx.model.zdhqdModel;
+import com.xt.js.gkaq.dwxx.service.ZdhqdService;
 import com.xt.js.gkaq.frame.model.CodeModelDto;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.service.CodeService;
 import com.xt.js.gkaq.web.model.FjbModel;
 import com.xt.js.gkaq.web.model.GqModel;
-import com.xt.js.gkaq.web.model.zdhqdExtendModel;
-import com.xt.js.gkaq.web.model.zdhqdModel;
 import com.xt.js.gkaq.web.service.FjbService;
 import com.xt.js.gkaq.web.service.GqService;
 import com.xt.js.gkaq.web.service.RyzsbService;
-import com.xt.js.gkaq.web.service.ZdhqdService;
 import com.xt.js.gkaq.web.vo.FjbVo;
 import com.xt.js.gkaq.web.vo.ZdhqdExtendVo;
 import com.xt.js.gkaq.web.vo.ZdhqdVo;
@@ -33,21 +32,25 @@ import com.yuanxd.tools.pagehelper.PageHelper;
 import com.yuanxd.tools.pagehelper.PageInfo;
 import com.yuanxd.tools.utils.WebJsonResult;
 import com.yuanxd.tools.utils.string.StringUtils;
-
+/**
+ * 管理制度信息控制层
+ * @author 李小虎
+ *
+ */
 @Controller
 @RequestMapping(value = "/glzd", produces = "application/json; charset=utf-8")
 public class ZdhqdCtl extends BaseCtl {
     @Autowired
-    private ZdhqdService zdhqdService;
+    private ZdhqdService zdhqdService;//制度service层
     @Autowired
-    private CodeService codeService;
+    private CodeService codeService;//字典service层
     @Autowired
-    private GqService gqService;
+    private GqService gqService;//港区service层
     
     @Autowired
-    private FjbService fjbService;
+    private FjbService fjbService;//附件表service层
     @Autowired
-    private RyzsbService ryzsbService;
+    private RyzsbService ryzsbService;//人员证书表service层
 
     @RequestMapping("")
     public String main(HttpServletRequest request) {

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

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

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

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

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

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

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

@@ -1,13 +0,0 @@
-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/JyrTjcxMapper.java

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

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

@@ -1,15 +0,0 @@
-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/JyrWxhwtjcxMapper.java

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

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

@@ -1,10 +0,0 @@
-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.WxcgtjcxModel;
-
-public interface WxcgtjcxMapper extends BaseMapper<WxcgtjcxModel> {
-	public List<WxcgtjcxModel> selectByInfo(WxcgtjcxModel model);
-}

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

@@ -1,10 +0,0 @@
-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.WxhwModel;
-
-public interface WxhwModelMapper extends BaseMapper<WxhwModel> {
-	public List<WxhwModel> selectAll(WxhwModel model);
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,108 +0,0 @@
-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

@@ -1,196 +0,0 @@
-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

@@ -1,60 +0,0 @@
-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/GqModel.java

@@ -7,7 +7,6 @@ public class GqModel extends BaseUUIDModel {
 	 * 
 	 */
 	private static final long serialVersionUID = -4635108369387619903L;
-	private Long uuid;
 	private String szd;//垀婓華
 	private Long ssgk;//垀扽誠諳
 	private String gqmc;//誠諳靡備
@@ -239,11 +238,4 @@ public class GqModel extends BaseUUIDModel {
 	public void setGisid(String gisid) {
 		this.gisid = gisid;
 	}
-	public Long getUuid() {
-		return uuid;
-	}
-	public void setUuid(Long uuid) {
-		this.uuid = uuid;
-	}
-	
 }

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

@@ -1,135 +0,0 @@
-package com.xt.js.gkaq.web.model;
-
-import java.util.Date;
-
-import com.xt.js.gkaq.common.BaseUUIDModel;
-/**
- * 经营人人员基本信息扩展Model
- * @author 李小虎
- *
- */
-public class JyrUserListModel{
-	
-	private String id;
-	private String xm;
-	private String zwhzc;
-	private Long fzzyid;
-	private String zsmc;
-	private String zsbh;
-	private Date yxq;
-	private Long zszl;
-	private Long ssgq;
-	private String gqmc;
-	private String bz;
-	private String ssjyr;
-	private String jyrmc;
-	private String szd;
-	private String szdmc;
-	private String rylx;
-	private String rylxmc;
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getXm() {
-		return xm;
-	}
-	public void setXm(String xm) {
-		this.xm = xm;
-	}
-	public String getZwhzc() {
-		return zwhzc;
-	}
-	public void setZwhzc(String zwhzc) {
-		this.zwhzc = zwhzc;
-	}
-	public Long getFzzyid() {
-		return fzzyid;
-	}
-	public void setFzzyid(Long fzzyid) {
-		this.fzzyid = fzzyid;
-	}
-	public String getZsmc() {
-		return zsmc;
-	}
-	public void setZsmc(String zsmc) {
-		this.zsmc = zsmc;
-	}
-	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 Long getZszl() {
-		return zszl;
-	}
-	public void setZszl(Long zszl) {
-		this.zszl = zszl;
-	}
-	public Long getSsgq() {
-		return ssgq;
-	}
-	public void setSsgq(Long ssgq) {
-		this.ssgq = ssgq;
-	}
-	public String getGqmc() {
-		return gqmc;
-	}
-	public void setGqmc(String gqmc) {
-		this.gqmc = gqmc;
-	}
-	public String getBz() {
-		return bz;
-	}
-	public void setBz(String bz) {
-		this.bz = bz;
-	}
-	public String getSsjyr() {
-		return ssjyr;
-	}
-	public void setSsjyr(String ssjyr) {
-		this.ssjyr = ssjyr;
-	}
-	public String getJyrmc() {
-		return jyrmc;
-	}
-	public void setJyrmc(String jyrmc) {
-		this.jyrmc = jyrmc;
-	}
-	public String getSzd() {
-		return szd;
-	}
-	public void setSzd(String szd) {
-		this.szd = szd;
-	}
-	public String getSzdmc() {
-		return szdmc;
-	}
-	public void setSzdmc(String szdmc) {
-		this.szdmc = szdmc;
-	}
-	public String getRylx() {
-		return rylx;
-	}
-	public void setRylx(String rylx) {
-		this.rylx = rylx;
-	}
-	public String getRylxmc() {
-		return rylxmc;
-	}
-	public void setRylxmc(String rylxmc) {
-		this.rylxmc = rylxmc;
-	}
-	
-}
-
-

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

@@ -1,235 +0,0 @@
-package com.xt.js.gkaq.web.model;
-
-import java.util.Date;
-
-import com.xt.js.gkaq.common.BaseUUIDModel;
-/**
- * 经营人人员基本信息Model
- * @author 李小虎
- *
- */
-public class JyrUserModel extends BaseUUIDModel {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -2406484306898976457L;
-	private String xm;
-	private String xb;
-	private String zwhzc;
-	private String lxdh;
-	private String sjhm;
-	private Date csrq;
-	private String sfkdl;
-	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;
-	private Long fzzyid;
-	private String sfzh;
-	private String zsmc;
-	private String zsbh;
-	private String fzbm;
-	private Date yxq;
-	private Long zszl;
-	private Long ssgq;
-	private String bz;
-	private String ssjyr;
-	private String zjlx;
-	private String szd;
-	private String rylx;
-	public String getXm() {
-		return xm;
-	}
-	public void setXm(String xm) {
-		this.xm = xm;
-	}
-	public String getXb() {
-		return xb;
-	}
-	public void setXb(String xb) {
-		this.xb = xb;
-	}
-	public String getZwhzc() {
-		return zwhzc;
-	}
-	public void setZwhzc(String zwhzc) {
-		this.zwhzc = zwhzc;
-	}
-	public String getLxdh() {
-		return lxdh;
-	}
-	public void setLxdh(String lxdh) {
-		this.lxdh = lxdh;
-	}
-	public String getSjhm() {
-		return sjhm;
-	}
-	public void setSjhm(String sjhm) {
-		this.sjhm = sjhm;
-	}
-	public Date getCsrq() {
-		return csrq;
-	}
-	public void setCsrq(Date csrq) {
-		this.csrq = csrq;
-	}
-	public String getSfkdl() {
-		return sfkdl;
-	}
-	public void setSfkdl(String sfkdl) {
-		this.sfkdl = sfkdl;
-	}
-	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 Long getFzzyid() {
-		return fzzyid;
-	}
-	public void setFzzyid(Long fzzyid) {
-		this.fzzyid = fzzyid;
-	}
-	public String getSfzh() {
-		return sfzh;
-	}
-	public void setSfzh(String sfzh) {
-		this.sfzh = sfzh;
-	}
-	public String getZsmc() {
-		return zsmc;
-	}
-	public void setZsmc(String zsmc) {
-		this.zsmc = zsmc;
-	}
-	public String getZsbh() {
-		return zsbh;
-	}
-	public void setZsbh(String zsbh) {
-		this.zsbh = zsbh;
-	}
-	public String getFzbm() {
-		return fzbm;
-	}
-	public void setFzbm(String fzbm) {
-		this.fzbm = fzbm;
-	}
-	public Date getYxq() {
-		return yxq;
-	}
-	public void setYxq(Date yxq) {
-		this.yxq = yxq;
-	}
-	public Long getZszl() {
-		return zszl;
-	}
-	public void setZszl(Long zszl) {
-		this.zszl = zszl;
-	}
-	public Long getSsgq() {
-		return ssgq;
-	}
-	public void setSsgq(Long ssgq) {
-		this.ssgq = ssgq;
-	}
-	public String getBz() {
-		return bz;
-	}
-	public void setBz(String bz) {
-		this.bz = bz;
-	}
-	public String getSsjyr() {
-		return ssjyr;
-	}
-	public void setSsjyr(String ssjyr) {
-		this.ssjyr = ssjyr;
-	}
-	public String getZjlx() {
-		return zjlx;
-	}
-	public void setZjlx(String zjlx) {
-		this.zjlx = zjlx;
-	}
-	public String getSzd() {
-		return szd;
-	}
-	public void setSzd(String szd) {
-		this.szd = szd;
-	}
-	public String getRylx() {
-		return rylx;
-	}
-	public void setRylx(String rylx) {
-		this.rylx = rylx;
-	}
-	
-	
-}

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

@@ -1,34 +0,0 @@
-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/TjcxModel.java

@@ -1,131 +0,0 @@
-package com.xt.js.gkaq.web.model;
-
-import java.math.BigDecimal;
-
-import com.xt.js.gkaq.common.BaseUUIDModel;
-/**
- * ͳ¼Æ²éѯµÄModel
- * @author ÀîС»¢
- *
- */
-public class TjcxModel extends BaseUUIDModel {
-
-	private String gkjyr;
-	private String syhgmt;
-	private String wxhw;
-	private String ph;
-	private String jzx;
-	private String wd;
-	private String wdyx;
-	private String qd;
-	private String qdyx;
-	private String sl;
-	private String wxsl;
-	private BigDecimal rj;
-	
-	private String szd;
-	private String qylx;
-	private String qstime;
-	private String jstime;
-	
-	public String getSzd() {
-		return szd;
-	}
-	public void setSzd(String szd) {
-		this.szd = szd;
-	}
-	public String getQylx() {
-		return qylx;
-	}
-	public void setQylx(String qylx) {
-		this.qylx = qylx;
-	}
-	public String getQstime() {
-		return qstime;
-	}
-	public void setQstime(String qstime) {
-		this.qstime = qstime;
-	}
-	public String getJstime() {
-		return jstime;
-	}
-	public void setJstime(String jstime) {
-		this.jstime = jstime;
-	}
-	public String getGkjyr() {
-		return gkjyr;
-	}
-	public void setGkjyr(String gkjyr) {
-		this.gkjyr = gkjyr;
-	}
-	public String getSyhgmt() {
-		return syhgmt;
-	}
-	public void setSyhgmt(String syhgmt) {
-		this.syhgmt = syhgmt;
-	}
-	public String getWxhw() {
-		return wxhw;
-	}
-	public void setWxhw(String wxhw) {
-		this.wxhw = wxhw;
-	}
-	public String getPh() {
-		return ph;
-	}
-	public void setPh(String ph) {
-		this.ph = ph;
-	}
-	public String getJzx() {
-		return jzx;
-	}
-	public void setJzx(String jzx) {
-		this.jzx = jzx;
-	}
-	public String getWd() {
-		return wd;
-	}
-	public void setWd(String wd) {
-		this.wd = wd;
-	}
-	public String getWdyx() {
-		return wdyx;
-	}
-	public void setWdyx(String wdyx) {
-		this.wdyx = wdyx;
-	}
-	public String getQd() {
-		return qd;
-	}
-	public void setQd(String qd) {
-		this.qd = qd;
-	}
-	public String getQdyx() {
-		return qdyx;
-	}
-	public void setQdyx(String qdyx) {
-		this.qdyx = qdyx;
-	}
-	public String getSl() {
-		return sl;
-	}
-	public void setSl(String sl) {
-		this.sl = sl;
-	}
-	public String getWxsl() {
-		return wxsl;
-	}
-	public void setWxsl(String wxsl) {
-		this.wxsl = wxsl;
-	}
-	public BigDecimal getRj() {
-		return rj;
-	}
-	public void setRj(BigDecimal rj) {
-		this.rj = rj;
-	}
-	
-	
-	
-	
-}

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

@@ -1,83 +0,0 @@
-package com.xt.js.gkaq.web.model;
-
-import java.math.BigDecimal;
-
-import com.xt.js.gkaq.common.BaseUUIDModel;
-/**
- * 危险储罐统计查询的Model
- * @author 李小虎
- *
- */
-public class WxcgtjcxModel extends BaseUUIDModel {
-	private String bz;
-	private String gkjyr;
-	private String byzd1;
-	private String sl;
-	private BigDecimal rj;
-	private String xhgs;
-	private String wxsl;
-	private String hz;
-	private String qylx;
-	private String szd;
-	public String getBz() {
-		return bz;
-	}
-	public void setBz(String bz) {
-		this.bz = bz;
-	}
-	public String getGkjyr() {
-		return gkjyr;
-	}
-	public void setGkjyr(String gkjyr) {
-		this.gkjyr = gkjyr;
-	}
-	public String getByzd1() {
-		return byzd1;
-	}
-	public void setByzd1(String byzd1) {
-		this.byzd1 = byzd1;
-	}
-	public String getSl() {
-		return sl;
-	}
-	public void setSl(String sl) {
-		this.sl = sl;
-	}
-	public BigDecimal getRj() {
-		return rj;
-	}
-	public void setRj(BigDecimal rj) {
-		this.rj = rj;
-	}
-	public String getXhgs() {
-		return xhgs;
-	}
-	public void setXhgs(String xhgs) {
-		this.xhgs = xhgs;
-	}
-	public String getWxsl() {
-		return wxsl;
-	}
-	public void setWxsl(String wxsl) {
-		this.wxsl = wxsl;
-	}
-	public String getHz() {
-		return hz;
-	}
-	public void setHz(String hz) {
-		this.hz = hz;
-	}
-	public String getQylx() {
-		return qylx;
-	}
-	public void setQylx(String qylx) {
-		this.qylx = qylx;
-	}
-	public String getSzd() {
-		return szd;
-	}
-	public void setSzd(String szd) {
-		this.szd = szd;
-	}
-	
-}

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

@@ -1,169 +0,0 @@
-package com.xt.js.gkaq.web.model;
-
-import com.xt.js.gkaq.common.BaseUUIDModel;
-/**
- * 危险物品名称
- * @author 李小虎    2016-10-31 
- *
- */
-public class WxhwModel extends BaseUUIDModel {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3491478469803786235L;
-	private String bh;//编号
-	private String mchsm;//名称和说明
-	private String ywmc;//英文名称
-	private String lbhxb;//类别和项别
-	private String cywxx;//次要危险性
-	private String bzlb;//包装类别
-	private String bz;//备注
-	private String tbzt;//同步状态
-	private Long tbdyid;//同步对应id
-	private String qylb;//区域类别
-	private String ssqy;//所属区域
-	private String sftb;//是否同步
-	private String orgcode;
-	private String bhun;//编号(UN号)
-	private String lbbh;//类别编号
-	private String mchsmby;//名称和说明备用
-	private String lhxz;//理化性质
-	private String aqffcs;//防范措施
-	private String szd;//所在地
-	private String hzwxx;//火灾危险性
-	private String dxdj;//毒性等级
-	private String wrlb;//污染类别
-	public String getBh() {
-		return bh;
-	}
-	public void setBh(String bh) {
-		this.bh = bh;
-	}
-	public String getMchsm() {
-		return mchsm;
-	}
-	public void setMchsm(String mchsm) {
-		this.mchsm = mchsm;
-	}
-	public String getYwmc() {
-		return ywmc;
-	}
-	public void setYwmc(String ywmc) {
-		this.ywmc = ywmc;
-	}
-	public String getLbhxb() {
-		return lbhxb;
-	}
-	public void setLbhxb(String lbhxb) {
-		this.lbhxb = lbhxb;
-	}
-	public String getCywxx() {
-		return cywxx;
-	}
-	public void setCywxx(String cywxx) {
-		this.cywxx = cywxx;
-	}
-	public String getBzlb() {
-		return bzlb;
-	}
-	public void setBzlb(String bzlb) {
-		this.bzlb = bzlb;
-	}
-	public String getBz() {
-		return bz;
-	}
-	public void setBz(String bz) {
-		this.bz = bz;
-	}
-	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 String getSsqy() {
-		return ssqy;
-	}
-	public void setSsqy(String ssqy) {
-		this.ssqy = ssqy;
-	}
-	public String getSftb() {
-		return sftb;
-	}
-	public void setSftb(String sftb) {
-		this.sftb = sftb;
-	}
-	public String getOrgcode() {
-		return orgcode;
-	}
-	public void setOrgcode(String orgcode) {
-		this.orgcode = orgcode;
-	}
-	public String getBhun() {
-		return bhun;
-	}
-	public void setBhun(String bhun) {
-		this.bhun = bhun;
-	}
-	public String getLbbh() {
-		return lbbh;
-	}
-	public void setLbbh(String lbbh) {
-		this.lbbh = lbbh;
-	}
-	public String getMchsmby() {
-		return mchsmby;
-	}
-	public void setMchsmby(String mchsmby) {
-		this.mchsmby = mchsmby;
-	}
-	public String getLhxz() {
-		return lhxz;
-	}
-	public void setLhxz(String lhxz) {
-		this.lhxz = lhxz;
-	}
-	public String getAqffcs() {
-		return aqffcs;
-	}
-	public void setAqffcs(String aqffcs) {
-		this.aqffcs = aqffcs;
-	}
-	public String getSzd() {
-		return szd;
-	}
-	public void setSzd(String szd) {
-		this.szd = szd;
-	}
-	public String getHzwxx() {
-		return hzwxx;
-	}
-	public void setHzwxx(String hzwxx) {
-		this.hzwxx = hzwxx;
-	}
-	public String getDxdj() {
-		return dxdj;
-	}
-	public void setDxdj(String dxdj) {
-		this.dxdj = dxdj;
-	}
-	public String getWrlb() {
-		return wrlb;
-	}
-	public void setWrlb(String wrlb) {
-		this.wrlb = wrlb;
-	}
-	
-}

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

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

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

@@ -1,79 +0,0 @@
-package com.xt.js.gkaq.web.model;
-/**
- * 管理制度扩展Model
- * @author LXH
- *
- */
-public class zdhqdExtendModel {
-	private String id;//id
-	private String zdmc;//制度名称
-	private String gkjyr;//港口经营人
-	private String zdfl;//制度分类
-	private String fbrq;//发布日期
-	private String xdrq;//修订日期
-	private String lxr;//联系人
-	private String lxdh;//联系电话
-	private String szd;//所在地
-	private String gqmc;//所在港区
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getZdmc() {
-		return zdmc;
-	}
-	public void setZdmc(String zdmc) {
-		this.zdmc = zdmc;
-	}
-	public String getGkjyr() {
-		return gkjyr;
-	}
-	public void setGkjyr(String gkjyr) {
-		this.gkjyr = gkjyr;
-	}
-	public String getZdfl() {
-		return zdfl;
-	}
-	public void setZdfl(String zdfl) {
-		this.zdfl = zdfl;
-	}
-	public String getFbrq() {
-		return fbrq;
-	}
-	public void setFbrq(String fbrq) {
-		this.fbrq = fbrq;
-	}
-	public String getXdrq() {
-		return xdrq;
-	}
-	public void setXdrq(String xdrq) {
-		this.xdrq = xdrq;
-	}
-	public String getLxr() {
-		return lxr;
-	}
-	public void setLxr(String lxr) {
-		this.lxr = lxr;
-	}
-	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 getGqmc() {
-		return gqmc;
-	}
-	public void setGqmc(String gqmc) {
-		this.gqmc = gqmc;
-	}
-	
-}

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

@@ -1,239 +0,0 @@
-package com.xt.js.gkaq.web.model;
-
-import java.util.Date;
-
-import com.xt.js.gkaq.common.BaseUUIDModel;
-/**
- * ¹ÜÀíÖƶÈ
- * @author Administrator
- *
- */
-public class zdhqdModel extends BaseUUIDModel {
-
-    /**
-	 * 
-	 */
-	private static final long serialVersionUID = -4495098398736737072L;
-
-	private String bxdw;
-
-    private String szd;
-
-    private String szgq;
-
-    private String zdmc;
-
-    private String zdfl;
-
-    private Date txsj;
-
-    private String tbr;
-
-    private String lxdh;
-
-    private String qymc;
-
-    private String ssgq;
-
-    private String sftb;
-
-    private String tbzt;
-
-    private String tbdyid;
-
-    private String qylb;
-
-    private String ssqy;
-
-    private String orgCode;
-
-    private String zdwh;
-
-    private Date fbrq;
-
-    private Date xdrq;
-
-    private String sfczgc;
-
-    private String zyfzId;
-
-    private String lxr;
-
-	public String getBxdw() {
-		return bxdw;
-	}
-
-	public void setBxdw(String bxdw) {
-		this.bxdw = bxdw;
-	}
-
-	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 getZdmc() {
-		return zdmc;
-	}
-
-	public void setZdmc(String zdmc) {
-		this.zdmc = zdmc;
-	}
-
-	public String getZdfl() {
-		return zdfl;
-	}
-
-	public void setZdfl(String zdfl) {
-		this.zdfl = zdfl;
-	}
-
-	public Date getTxsj() {
-		return txsj;
-	}
-
-	public void setTxsj(Date txsj) {
-		this.txsj = txsj;
-	}
-
-	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 getQymc() {
-		return qymc;
-	}
-
-	public void setQymc(String qymc) {
-		this.qymc = qymc;
-	}
-
-	public String getSsgq() {
-		return ssgq;
-	}
-
-	public void setSsgq(String ssgq) {
-		this.ssgq = ssgq;
-	}
-
-	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 String getTbdyid() {
-		return tbdyid;
-	}
-
-	public void setTbdyid(String tbdyid) {
-		this.tbdyid = tbdyid;
-	}
-
-	public String getQylb() {
-		return qylb;
-	}
-
-	public void setQylb(String qylb) {
-		this.qylb = qylb;
-	}
-
-	public String getSsqy() {
-		return ssqy;
-	}
-
-	public void setSsqy(String ssqy) {
-		this.ssqy = ssqy;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public String getZdwh() {
-		return zdwh;
-	}
-
-	public void setZdwh(String zdwh) {
-		this.zdwh = zdwh;
-	}
-
-	public Date getFbrq() {
-		return fbrq;
-	}
-
-	public void setFbrq(Date fbrq) {
-		this.fbrq = fbrq;
-	}
-
-	public Date getXdrq() {
-		return xdrq;
-	}
-
-	public void setXdrq(Date xdrq) {
-		this.xdrq = xdrq;
-	}
-
-	public String getSfczgc() {
-		return sfczgc;
-	}
-
-	public void setSfczgc(String sfczgc) {
-		this.sfczgc = sfczgc;
-	}
-
-	public String getZyfzId() {
-		return zyfzId;
-	}
-
-	public void setZyfzId(String zyfzId) {
-		this.zyfzId = zyfzId;
-	}
-
-	public String getLxr() {
-		return lxr;
-	}
-
-	public void setLxr(String lxr) {
-		this.lxr = lxr;
-	}
-
-    
-}

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

@@ -1,11 +0,0 @@
-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.BwInfoModel;
-import com.xt.js.gkaq.web.model.BwModel;
-
-public interface BwService extends BaseUUIDModelService<BwModel> {
-	public List<BwInfoModel> selectInfo (BwModel model);
-}

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

@@ -1,10 +0,0 @@
-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.CkModel;
-
-public interface CkService extends BaseUUIDModelService<CkModel> {
-	public List<CkModel> selectInfo (CkModel model);
-}

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

@@ -1,11 +0,0 @@
-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/DcService.java

@@ -1,10 +0,0 @@
-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.DcModel;
-
-public interface DcService extends BaseUUIDModelService<DcModel> {
-	public List<DcModel> selectInfo (DcModel model);
-}

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

@@ -1,13 +0,0 @@
-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/JyrTjcxService.java

@@ -1,10 +0,0 @@
-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.TjcxModel;
-
-public interface JyrTjcxService extends BaseUUIDModelService<TjcxModel> {
-	public List<TjcxModel> selectInfo (TjcxModel model);
-}

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

@@ -1,15 +0,0 @@
-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/JyrWxhwtjcxService.java

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

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

@@ -1,11 +0,0 @@
-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.WxcgtjcxModel;
-import com.xt.js.gkaq.web.model.WxhwtjcxModel;
-
-public interface WxcgtjcxService extends BaseUUIDModelService<WxcgtjcxModel> {
-	public List<WxcgtjcxModel> selectByInfo (WxcgtjcxModel model);
-}

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

@@ -1,10 +0,0 @@
-package com.xt.js.gkaq.web.service;
-
-import java.util.List;
-
-import com.xt.js.gkaq.common.BaseService;
-import com.xt.js.gkaq.web.model.WxhwModel;
-
-public interface WxhwService extends BaseService<WxhwModel> {
-	public List<WxhwModel> selectAll (WxhwModel model);
-}

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

@@ -1,11 +0,0 @@
-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.zdhqdExtendModel;
-import com.xt.js.gkaq.web.model.zdhqdModel;
-
-public interface ZdhqdService extends BaseUUIDModelService<zdhqdModel> {
-	List<zdhqdExtendModel> selectByInfo(zdhqdExtendModel model);
-}

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

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

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

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

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

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

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

@@ -1,35 +0,0 @@
-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/JyrTjcxServiceImpl.java

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

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

@@ -1,50 +0,0 @@
-package com.xt.js.gkaq.web.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.xt.js.gkaq.common.BaseMapper;
-import com.xt.js.gkaq.common.BaseServiceImpl;
-import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
-import com.xt.js.gkaq.frame.model.ComboBoxDto;
-import com.xt.js.gkaq.web.mappers.BwModelMapper;
-import com.xt.js.gkaq.web.mappers.GqModelMapper;
-import com.xt.js.gkaq.web.mappers.JyrUserModelMapper;
-import com.xt.js.gkaq.web.model.BwInfoModel;
-import com.xt.js.gkaq.web.model.BwModel;
-import com.xt.js.gkaq.web.model.GqModel;
-import com.xt.js.gkaq.web.model.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;
-
-@Service
-public class JyrUserServiceImpl extends BaseUUIDModelServiceImpl<JyrUserModel> implements JyrUserService {
-	@Autowired
-	JyrUserModelMapper mapper;
-	
-	@Override
-	protected BaseMapper<JyrUserModel> getMapper() {
-		return mapper;
-	}
-
-	@Override
-	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/JyrWxhwyjcxServiceImpl.java

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

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

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

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

@@ -1,42 +0,0 @@
-package com.xt.js.gkaq.web.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.xt.js.gkaq.common.BaseMapper;
-import com.xt.js.gkaq.common.BaseServiceImpl;
-import com.xt.js.gkaq.frame.model.ComboBoxDto;
-import com.xt.js.gkaq.web.mappers.GqModelMapper;
-import com.xt.js.gkaq.web.mappers.WxhwModelMapper;
-import com.xt.js.gkaq.web.model.GqModel;
-import com.xt.js.gkaq.web.model.WxhwModel;
-import com.xt.js.gkaq.web.service.GqService;
-import com.xt.js.gkaq.web.service.WxhwService;
-/**
- * 危险物品信息service
- * @author LXh
- *
- */
-@Service
-public class WxhwServiceImpl extends BaseServiceImpl<WxhwModel> implements WxhwService {
-
-	@Autowired
-	private WxhwModelMapper mapper;
-	
-	@Override
-	protected BaseMapper<WxhwModel> getMapper() {
-		// TODO Auto-generated method stub
-		return mapper;
-	}
-	/**
-	 * 获取所有指定危险物品信息
-	 */
-	@Override
-	public List<WxhwModel> selectAll(WxhwModel model) {
-		return mapper.selectAll(model);
-	}
-
-	
-}

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

@@ -1,32 +0,0 @@
-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.zdhqdModelMapper;
-import com.xt.js.gkaq.web.model.zdhqdExtendModel;
-import com.xt.js.gkaq.web.model.zdhqdModel;
-import com.xt.js.gkaq.web.service.ZdhqdService;
-
-@Service
-public class ZdhqdServiceImpl extends BaseUUIDModelServiceImpl<zdhqdModel> implements ZdhqdService {
-	@Autowired
-	zdhqdModelMapper mapper;
-	
-	@Override
-	protected BaseMapper<zdhqdModel> getMapper() {
-		return mapper;
-	}
-
-	@Override
-	public List<zdhqdExtendModel> selectByInfo(zdhqdExtendModel model) {
-		return mapper.selectByInfo(model);
-	}
-	
-	
-   
-}

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

@@ -10,16 +10,16 @@ import com.xt.js.gkaq.common.BaseVo;
 public class BwVo extends BaseVo {
 	private String id;
 	private String szd;//所在地
-	private Long szgq;//所在港区
-	private Long qymc;//经营人名称（id）
-	private Long mtmc;//码头名称(id)
+	private String szgq;//所在港区
+	private String qymc;//经营人名称（id）
+	private String mtmc;//码头名称(id)
 	private String bwmc;//泊位名称
-	private Long bwsx;//泊位属性
-	private Long bwszsx;//泊位所在水系
-	private Long fwlx;//服务类型
+	private String bwsx;//泊位属性
+	private String bwszsx;//泊位所在水系
+	private String fwlx;//服务类型
 	private Long tcnf;//投产年份
-	private Long jgxs;//结构型式
-	private Long sclx;//生产类型
+	private String jgxs;//结构型式
+	private String sclx;//生产类型
 	private Long jgysnf;//竣工验收年份
 	private String qysjsh;//前沿设计水深
 	private String qysjss;//前沿实际水深
@@ -29,7 +29,7 @@ public class BwVo extends BaseVo {
 	private String sjkpnl;//设计靠泊能力(吨级)
 	private String nhwtgml;//年货物通过能力
 	private String nwxhwttl;//年危险货物吞吐量
-	private Long zyhbwfl;//专业化泊位分类
+	private String zyhbwfl;//专业化泊位分类
 	private String jd;//经度
 	private String wd;//纬度
 	private String sffz;//是否发证
@@ -39,7 +39,7 @@ public class BwVo extends BaseVo {
 	private String tbzt;//同步状态
 	private Long tbdyid;//同步对应id
 	private String qylb;//区域类别
-	private Long ssqy;//所属区域
+	private String ssqy;//所属区域
 	private String recordCode;//
 	private String byzd1;
 	private String byzd2;
@@ -51,8 +51,7 @@ public class BwVo extends BaseVo {
 	private String zwbwyt;//泊位用途显示
 	private String smid;//地图id
 	private String bwdm;//
-	private Long jgxs2;
-	
+	private String jgxs2;
 	public String getId() {
 		return id;
 	}
@@ -65,22 +64,22 @@ public class BwVo extends BaseVo {
 	public void setSzd(String szd) {
 		this.szd = szd;
 	}
-	public Long getSzgq() {
+	public String getSzgq() {
 		return szgq;
 	}
-	public void setSzgq(Long szgq) {
+	public void setSzgq(String szgq) {
 		this.szgq = szgq;
 	}
-	public Long getQymc() {
+	public String getQymc() {
 		return qymc;
 	}
-	public void setQymc(Long qymc) {
+	public void setQymc(String qymc) {
 		this.qymc = qymc;
 	}
-	public Long getMtmc() {
+	public String getMtmc() {
 		return mtmc;
 	}
-	public void setMtmc(Long mtmc) {
+	public void setMtmc(String mtmc) {
 		this.mtmc = mtmc;
 	}
 	public String getBwmc() {
@@ -89,22 +88,22 @@ public class BwVo extends BaseVo {
 	public void setBwmc(String bwmc) {
 		this.bwmc = bwmc;
 	}
-	public Long getBwsx() {
+	public String getBwsx() {
 		return bwsx;
 	}
-	public void setBwsx(Long bwsx) {
+	public void setBwsx(String bwsx) {
 		this.bwsx = bwsx;
 	}
-	public Long getBwszsx() {
+	public String getBwszsx() {
 		return bwszsx;
 	}
-	public void setBwszsx(Long bwszsx) {
+	public void setBwszsx(String bwszsx) {
 		this.bwszsx = bwszsx;
 	}
-	public Long getFwlx() {
+	public String getFwlx() {
 		return fwlx;
 	}
-	public void setFwlx(Long fwlx) {
+	public void setFwlx(String fwlx) {
 		this.fwlx = fwlx;
 	}
 	public Long getTcnf() {
@@ -113,16 +112,16 @@ public class BwVo extends BaseVo {
 	public void setTcnf(Long tcnf) {
 		this.tcnf = tcnf;
 	}
-	public Long getJgxs() {
+	public String getJgxs() {
 		return jgxs;
 	}
-	public void setJgxs(Long jgxs) {
+	public void setJgxs(String jgxs) {
 		this.jgxs = jgxs;
 	}
-	public Long getSclx() {
+	public String getSclx() {
 		return sclx;
 	}
-	public void setSclx(Long sclx) {
+	public void setSclx(String sclx) {
 		this.sclx = sclx;
 	}
 	public Long getJgysnf() {
@@ -179,10 +178,10 @@ public class BwVo extends BaseVo {
 	public void setNwxhwttl(String nwxhwttl) {
 		this.nwxhwttl = nwxhwttl;
 	}
-	public Long getZyhbwfl() {
+	public String getZyhbwfl() {
 		return zyhbwfl;
 	}
-	public void setZyhbwfl(Long zyhbwfl) {
+	public void setZyhbwfl(String zyhbwfl) {
 		this.zyhbwfl = zyhbwfl;
 	}
 	public String getJd() {
@@ -239,10 +238,10 @@ public class BwVo extends BaseVo {
 	public void setQylb(String qylb) {
 		this.qylb = qylb;
 	}
-	public Long getSsqy() {
+	public String getSsqy() {
 		return ssqy;
 	}
-	public void setSsqy(Long ssqy) {
+	public void setSsqy(String ssqy) {
 		this.ssqy = ssqy;
 	}
 	public String getRecordCode() {
@@ -311,10 +310,10 @@ public class BwVo extends BaseVo {
 	public void setBwdm(String bwdm) {
 		this.bwdm = bwdm;
 	}
-	public Long getJgxs2() {
+	public String getJgxs2() {
 		return jgxs2;
 	}
-	public void setJgxs2(Long jgxs2) {
+	public void setJgxs2(String jgxs2) {
 		this.jgxs2 = jgxs2;
 	}
 	

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

@@ -9,10 +9,10 @@ import com.xt.js.gkaq.common.BaseVo;
 public class CkVo extends BaseVo {
 
 	private String id;
-	private Long ssjyr;//所属经营人
+	private String ssjyr;//所属经营人
 	private String szd;//所在地
-	private Long gq;//港区
-	private Long mt;//码头
+	private String gq;//港区
+	private String mt;//码头
 	private String qymc;//企业名称
 	private Long ckmc;//仓库名称
 	private Long wxpck;//危险品仓库
@@ -31,7 +31,7 @@ public class CkVo extends BaseVo {
 	private String tbzt;//同步状态
 	private Long tbdyid;//同步对应id
 	private String qylb;//区域类别
-	private Long ssqy;//所属区域
+	private String ssqy;//所属区域
 	private String recordcode;//
 	private String byzd1;
 	private String byzd2;
@@ -47,10 +47,10 @@ public class CkVo extends BaseVo {
 		this.id = id;
 	}
 	
-	public Long getSsjyr() {
+	public String getSsjyr() {
 		return ssjyr;
 	}
-	public void setSsjyr(Long ssjyr) {
+	public void setSsjyr(String ssjyr) {
 		this.ssjyr = ssjyr;
 	}
 	public String getSzd() {
@@ -59,16 +59,16 @@ public class CkVo extends BaseVo {
 	public void setSzd(String szd) {
 		this.szd = szd;
 	}
-	public Long getGq() {
+	public String getGq() {
 		return gq;
 	}
-	public void setGq(Long gq) {
+	public void setGq(String gq) {
 		this.gq = gq;
 	}
-	public Long getMt() {
+	public String getMt() {
 		return mt;
 	}
-	public void setMt(Long mt) {
+	public void setMt(String mt) {
 		this.mt = mt;
 	}
 	public String getQymc() {
@@ -179,10 +179,10 @@ public class CkVo extends BaseVo {
 	public void setQylb(String qylb) {
 		this.qylb = qylb;
 	}
-	public Long getSsqy() {
+	public String getSsqy() {
 		return ssqy;
 	}
-	public void setSsqy(Long ssqy) {
+	public void setSsqy(String ssqy) {
 		this.ssqy = ssqy;
 	}
 	public String getRecordcode() {

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

@@ -9,8 +9,8 @@ import com.xt.js.gkaq.common.BaseVo;
 public class DcVo extends BaseVo {
 	private String id;
 	private String szd;//所在地
-	private Long szgq;//所在港区
-	private Long qymc;//企业名称
+	private String szgq;//所在港区
+	private String qymc;//企业名称
 	private String mtmc;//码头名称
 	private String dcmc;//堆场名称
 	private String scydcyt;//堆场用途
@@ -30,7 +30,7 @@ public class DcVo extends BaseVo {
 	private String tbzt;//同步状态
 	private Long tbdyid;//同步对应id
 	private String qylb;//区域类别
-	private Long ssqy;//所属区域
+	private String ssqy;//所属区域
 	private String recordcode;//
 	private String byzd1;
 	private String byzd2;
@@ -50,16 +50,16 @@ public class DcVo extends BaseVo {
 	public void setSzd(String szd) {
 		this.szd = szd;
 	}
-	public Long getSzgq() {
+	public String getSzgq() {
 		return szgq;
 	}
-	public void setSzgq(Long szgq) {
+	public void setSzgq(String szgq) {
 		this.szgq = szgq;
 	}
-	public Long getQymc() {
+	public String getQymc() {
 		return qymc;
 	}
-	public void setQymc(Long qymc) {
+	public void setQymc(String qymc) {
 		this.qymc = qymc;
 	}
 	public String getMtmc() {
@@ -164,10 +164,10 @@ public class DcVo extends BaseVo {
 	public void setQylb(String qylb) {
 		this.qylb = qylb;
 	}
-	public Long getSsqy() {
+	public String getSsqy() {
 		return ssqy;
 	}
-	public void setSsqy(Long ssqy) {
+	public void setSsqy(String ssqy) {
 		this.ssqy = ssqy;
 	}
 	public String getRecordcode() {

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

@@ -22,21 +22,21 @@ public class JyrUserVo extends BaseVo {
 	private String tbzt;
 	private Long tbdyid;
 	private String qylb;
-	private Long ssqy;
+	private String ssqy;
 	private String recordcode;
 	private String byzd1;
 	private String byzd2;
 	private String byzd3;
 	private String byzd4;
 	private String byzd5;
-	private Long fzzyid;
+	private String fzzyid;
 	private String sfzh;
 	private String zsmc;
 	private String zsbh;
 	private String fzbm;
 	private Date yxq;
-	private Long zszl;
-	private Long ssgq;
+	private String zszl;
+	private String ssgq;
 	private String bz;
 	private String ssjyr;
 	private String zjlx;
@@ -115,10 +115,10 @@ public class JyrUserVo extends BaseVo {
 	public void setQylb(String qylb) {
 		this.qylb = qylb;
 	}
-	public Long getSsqy() {
+	public String getSsqy() {
 		return ssqy;
 	}
-	public void setSsqy(Long ssqy) {
+	public void setSsqy(String ssqy) {
 		this.ssqy = ssqy;
 	}
 	public String getRecordcode() {
@@ -157,10 +157,10 @@ public class JyrUserVo extends BaseVo {
 	public void setByzd5(String byzd5) {
 		this.byzd5 = byzd5;
 	}
-	public Long getFzzyid() {
+	public String getFzzyid() {
 		return fzzyid;
 	}
-	public void setFzzyid(Long fzzyid) {
+	public void setFzzyid(String fzzyid) {
 		this.fzzyid = fzzyid;
 	}
 	public String getSfzh() {
@@ -193,16 +193,16 @@ public class JyrUserVo extends BaseVo {
 	public void setYxq(Date yxq) {
 		this.yxq = yxq;
 	}
-	public Long getZszl() {
+	public String getZszl() {
 		return zszl;
 	}
-	public void setZszl(Long zszl) {
+	public void setZszl(String zszl) {
 		this.zszl = zszl;
 	}
-	public Long getSsgq() {
+	public String getSsgq() {
 		return ssgq;
 	}
-	public void setSsgq(Long ssgq) {
+	public void setSsgq(String ssgq) {
 		this.ssgq = ssgq;
 	}
 	public String getBz() {

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

@@ -10,7 +10,7 @@ public class JyrjcxxVo extends BaseVo {
 	
     private String szd;
 
-    private Long szgq;
+    private String szgq;
 
     private String gkjyr;
 
@@ -64,7 +64,7 @@ public class JyrjcxxVo extends BaseVo {
 
     private String qylb;
 
-    private Long ssqy;
+    private String ssqy;
 
     private String recordCode;
 
@@ -86,9 +86,9 @@ public class JyrjcxxVo extends BaseVo {
 
     private String qyzzjgdm;
 
-    private Long sshydl;
+    private String sshydl;
 
-    private Long sshyz;
+    private String sshyz;
 
     private String qyaqdj;
 
@@ -110,9 +110,9 @@ public class JyrjcxxVo extends BaseVo {
 
     private String sfzdsp;
 
-    private Long parentJyrId;
+    private String parentJyrId;
 
-    private Long xzqh;
+    private String xzqh;
 
     public String getSzd() {
         return szd;
@@ -122,11 +122,11 @@ public class JyrjcxxVo extends BaseVo {
         this.szd = szd;
     }
 
-    public Long getSzgq() {
+    public String getSzgq() {
         return szgq;
     }
 
-    public void setSzgq(Long szgq) {
+    public void setSzgq(String szgq) {
         this.szgq = szgq;
     }
 
@@ -338,11 +338,11 @@ public class JyrjcxxVo extends BaseVo {
         this.qylb = qylb == null ? null : qylb.trim();
     }
 
-    public Long getSsqy() {
+    public String getSsqy() {
         return ssqy;
     }
 
-    public void setSsqy(Long ssqy) {
+    public void setSsqy(String ssqy) {
         this.ssqy = ssqy;
     }
 
@@ -426,19 +426,19 @@ public class JyrjcxxVo extends BaseVo {
         this.qyzzjgdm = qyzzjgdm == null ? null : qyzzjgdm.trim();
     }
 
-    public Long getSshydl() {
+    public String getSshydl() {
         return sshydl;
     }
 
-    public void setSshydl(Long sshydl) {
+    public void setSshydl(String sshydl) {
         this.sshydl = sshydl;
     }
 
-    public Long getSshyz() {
+    public String getSshyz() {
         return sshyz;
     }
 
-    public void setSshyz(Long sshyz) {
+    public void setSshyz(String sshyz) {
         this.sshyz = sshyz;
     }
 
@@ -522,19 +522,19 @@ public class JyrjcxxVo extends BaseVo {
         this.sfzdsp = sfzdsp == null ? null : sfzdsp.trim();
     }
 
-    public Long getParentJyrId() {
+    public String getParentJyrId() {
         return parentJyrId;
     }
 
-    public void setParentJyrId(Long parentJyrId) {
+    public void setParentJyrId(String parentJyrId) {
         this.parentJyrId = parentJyrId;
     }
 
-    public Long getXzqh() {
+    public String getXzqh() {
         return xzqh;
     }
 
-    public void setXzqh(Long xzqh) {
+    public void setXzqh(String xzqh) {
         this.xzqh = xzqh;
     }
 

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

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

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

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

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

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

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

@@ -1,208 +0,0 @@
-<?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,
-		(SELECT TEXT FROM AQ_BASIC_FRAME_CODE WHERE VAL = SS.SZD AND PCODE = 'DM_SZD' AND STATE != 9) AS SZD ,
-		(SELECT TEXT FROM AQ_BASIC_FRAME_CODE WHERE VAL = SS.YJFL AND PCODE = 'AQSS' AND STATE != 9) AS YJFL
-	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,SZD,YJFL
-  </select>
-</mapper>

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

@@ -2,7 +2,7 @@
 <!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.GqModelMapper" >
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.GqModel" >
-    <id column="ID" property="uuid" jdbcType="DECIMAL" />
+    <id column="ID" property="id" jdbcType="VARCHAR" />
     <result column="SZD" property="szd" jdbcType="VARCHAR" />
     <result column="SSGK" property="ssgk" jdbcType="DECIMAL" />
     <result column="GQMC" property="gqmc" jdbcType="VARCHAR" />
@@ -45,9 +45,9 @@
     <result column="GQMC" property="optName" jdbcType="VARCHAR" />
   </resultMap>
   
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_DWXX_GQ
-    where ID = #{uuid,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.web.model.GqModel" >
     insert into AQ_DWXX_GQ (ID, SZD, SSGK, GQMC, GQSZSYLX, GQMJ, LYMJ, SYFW, SYMJ, GQGHMJ, GHLYMJ,
@@ -55,7 +55,7 @@
 							BZ, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE,
 							RECORD_STATUS, SFTB, TBZT, TBDYID, QYLB, SSQY, RECORD_CODE,
 							BYZD1, BYZD2, BYZD3, BYZD4, BYZD5, GISID)
-    values (#{uuid,jdbcType=DECIMAL}, #{szd,jdbcType=VARCHAR}, #{ssgk,jdbcType=DECIMAL}, 
+    values (#{id,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, #{ssgk,jdbcType=DECIMAL}, 
       #{gqmc,jdbcType=VARCHAR}, #{gqszsylx,jdbcType=VARCHAR}, #{gqmj,jdbcType=VARCHAR},
       #{lymj,jdbcType=VARCHAR}, #{syfw,jdbcType=VARCHAR}, #{symj,jdbcType=VARCHAR},
       #{gqghmj,jdbcType=VARCHAR}, #{ghlymj,jdbcType=VARCHAR}, #{fgyscydghmj,jdbcType=VARCHAR},
@@ -107,7 +107,7 @@
       ADD_USER = #{adduser,jdbcType=VARCHAR},
       UPDATE_USER = #{updateuser,jdbcType=VARCHAR},
       GISID = #{gisid,jdbcType=VARCHAR},
-    where ID = #{uuid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
    SELECT ID, SZD, SSGK, GQMC, GQSZSYLX, GQMJ, LYMJ, SYFW, SYMJ, GQGHMJ, GHLYMJ, FGYSCYDGHMJ, GHSYMJ, 
@@ -115,7 +115,7 @@
    	 RECORD_STATUS, SFTB, TBZT,TBDYID, QYLB, SSQY, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5, GISID
 	FROM
 		GKAQV2.AQ_DWXX_GQ
-	WHEREID = #{uuid,jdbcType=VARCHAR}
+	WHEREID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
      SELECT ID, SZD, SSGK, GQMC, GQSZSYLX, GQMJ, LYMJ, SYFW, SYMJ, GQGHMJ, GHLYMJ, FGYSCYDGHMJ, GHSYMJ, 

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

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

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

@@ -1,240 +0,0 @@
-<?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.JyrUserModelMapper" >
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.JyrUserModel" >
-    <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="XM" property="xm" jdbcType="VARCHAR" />
-    <result column="XB" property="XB" jdbcType="VARCHAR" />
-    <result column="ZWHZC" property="zwhzc" jdbcType="VARCHAR" />
-    <result column="LXDH" property="lxdh" jdbcType="VARCHAR" />
-    <result column="SJHM" property="sjhm" jdbcType="VARCHAR" />
-    <result column="SSJYR" property="ssjyr" jdbcType="VARCHAR" />
-    <result column="CSRQ" property="csrq" jdbcType="TIMESTAMP" />
-    <result column="SFKDL" property="SFKDL" jdbcType="VARCHAR" />
-    <result column="FZZY_ID" property="fzzyid" jdbcType="DECIMAL" />
-    <result column="SFZH" property="sfzh" jdbcType="VARCHAR" />
-    <result column="ZSMC" property="zsmc" jdbcType="VARCHAR" />
-    <result column="ZSBH" property="zsbh" jdbcType="VARCHAR" />
-    <result column="FZBM" property="fzbm" jdbcType="VARCHAR" />
-    <result column="YXQ" property="yxq" jdbcType="TIMESTAMP" />
-    <result column="ZSZL" property="zszl" jdbcType="DECIMAL" />
-    <result column="SZD" property="szd" jdbcType="VARCHAR" />
-    <result column="SSGQ" property="ssgq" jdbcType="DECIMAL" />
-    <result column="RYLX" property="rylx" jdbcType="VARCHAR" />
-    <result column="BZ" property="bz" jdbcType="VARCHAR" />
-    <result column="ZJLX" property="zjlx" jdbcType="VARCHAR" />
-    <result column="SFTB" property="sftb" jdbcType="CHAR" />
-    <result column="TBZT" property="tbzt" jdbcType="CHAR" />
-    <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
-    <result column="QYLB" property="qylb" jdbcType="CHAR" />
-    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
-    <result column="RECORD_CODE" property="recordcode" jdbcType="VARCHAR" />
-    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
-    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
-    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
-    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
-    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
-  	<result column="RECORD_STATUS" property="state" jdbcType="DECIMAL" />
-    <result column="ADD_DATE" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="UPDATE_DATE" property="updateTime" jdbcType="TIMESTAMP" />
-    <result column="ADD_USER" property="createUser" jdbcType="VARCHAR" />
-    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
-  </resultMap>
-  
-  <resultMap id="BaseResultInfoMap" type="com.xt.js.gkaq.web.model.JyrUserListModel" >
-    <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="XM" property="xm" jdbcType="VARCHAR" />
-    <result column="ZWHZC" property="zwhzc" jdbcType="VARCHAR" />
-    <result column="SSJYR" property="ssjyr" jdbcType="VARCHAR" />
-    <result column="JYRMC" property="jyrmc" jdbcType="VARCHAR" />
-    <result column="RYLX" property="rylx" jdbcType="VARCHAR" />
-    <result column="RYLXMC" property="rylxmc" jdbcType="VARCHAR" />
-    <result column="ZWHZC" property="zwhzc" jdbcType="VARCHAR" />
-     <result column="FZZY_ID" property="fzzyid" jdbcType="DECIMAL" />
-    <result column="ZSMC" property="zsmc" jdbcType="VARCHAR" />
-    <result column="ZSZL" property="zszl" jdbcType="DECIMAL" />
-    <result column="ZSBH" property="zsbh" jdbcType="VARCHAR" />
-    <result column="YXQ" property="yxq" jdbcType="TIMESTAMP" />
-    <result column="SZD" property="szd" jdbcType="VARCHAR" />
-    <result column="SZDMC" property="szdmc" jdbcType="VARCHAR" />
-    <result column="SSGQ" property="ssgq" jdbcType="DECIMAL" />
-    <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}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.JyrUserModel" >
-    insert into AQ_DWXX_JYRDRYXX (ID,XM,XB,ZWHZC,LXDH,SJHM,SSJYR,CSRQ,SFKDL,
-										SFTB,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
-										TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,
-										FZZY_ID,SFZH,ZSMC,ZSBH,FZBM,YXQ,ZSZL,SZD,SSGQ,RYLX,BZ,ZJLX)
-    values (#{id,jdbcType=VARCHAR},
-    		#{xm,jdbcType=VARCHAR}, 
-     		#{xb,jdbcType=VARCHAR},
-     		#{zwhzc,jdbcType=VARCHAR}, 
-     		#{lxdh,jdbcType=VARCHAR}, 
-     		#{sjhm,jdbcType=VARCHAR}, 
-     		#{ssjyr,jdbcType=VARCHAR}, 
-     		#{csrq,jdbcType=DATE}, 
-     		#{sfkdl,jdbcType=VARCHAR}, 
-     		#{sftb,jdbcType=VARCHAR}, 
-     		#{createUser,jdbcType=VARCHAR}, 
-     		#{createTime,jdbcType=TIMESTAMP}, 
-     		#{updateUser,jdbcType=VARCHAR}, 
-     		#{updateTime,jdbcType=TIMESTAMP}, 
-     		#{state,jdbcType=DECIMAL}, 
-     		#{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},
-     		#{fzzyid,jdbcType=DECIMAL}, 
-     		#{sfzh,jdbcType=VARCHAR}, 
-     		#{zsmc,jdbcType=VARCHAR}, 
-     		#{zsbh,jdbcType=VARCHAR}, 
-     		#{fzbm,jdbcType=VARCHAR}, 
-     		#{yxq,jdbcType=TIMESTAMP}, 
-     		#{zszl,jdbcType=DECIMAL}, 
-     		#{szd,jdbcType=VARCHAR},
-     		#{ssgq,jdbcType=DECIMAL}, 
-     		#{rylx,jdbcType=VARCHAR},
-     		#{bz,jdbcType=VARCHAR}, 
-     		#{zjlx,jdbcType=VARCHAR}
-     		
-     		
-      )
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.JyrUserModel" >
-    update AQ_DWXX_JYRDRYXX
-    set 
-    	XM = #{xm,jdbcType=VARCHAR},    
-    	XB = #{xb,jdbcType=VARCHAR},    
-    	ZWHZC = #{zwhzc,jdbcType=VARCHAR}, 
-    	LXDH = #{lxdh,jdbcType=VARCHAR},  
-    	SJHM = #{sjhm,jdbcType=VARCHAR},  
-    	CSRQ = #{csrq,jdbcType=DATE},  
-    	SFKDL =  #{sfkdl,jdbcType=VARCHAR}, 
-    	FZZY_ID=  #{fzzyid,jdbcType=DECIMAL},     
-    	SFZH = #{sfzh,jdbcType=VARCHAR},       
-    	ZSMC = #{zsmc,jdbcType=VARCHAR},       
-    	ZSBH = #{zsbh,jdbcType=VARCHAR},       
-    	FZBM = #{fzbm,jdbcType=VARCHAR},       
-    	YXQ =  #{yxq,jdbcType=TIMESTAMP},      
-    	ZSZL = #{zszl,jdbcType=DECIMAL},       
-    	SSGQ = #{ssgq,jdbcType=DECIMAL},        
-    	BZ = #{bz,jdbcType=VARCHAR},        
-    	SSJYR = #{ssjyr,jdbcType=VARCHAR}, 
-    	ZJLX =  #{zjlx,jdbcType=VARCHAR},         
-    	SZD =   #{szd,jdbcType=VARCHAR},        
-    	RYLX = #{rylx,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
-		XM,XB,ZWHZC,LXDH,SJHM,CSRQ,SFKDL,SFTB,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
-		TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,
-		FZZY_ID,SFZH,ZSMC,ZSBH,FZBM,YXQ,ZSZL,SSGQ,BZ,SSJYR,ZJLX,SZD,RYLX,ID
-	FROM
-		AQ_DWXX_JYRDRYXX
-	WHERE ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap" >
-     SELECT
-		XM,XB,ZWHZC,LXDH,SJHM,CSRQ,SFKDL,SFTB,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
-		TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,
-		FZZY_ID,SFZH,ZSMC,ZSBH,FZBM,YXQ,ZSZL,SSGQ,BZ,SSJYR,ZJLX,SZD,RYLX,ID
-	 FROM
-		AQ_DWXX_JYRDRYXX
-  </select>
-  <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.JyrUserModel">
-		SELECT
-			JYRU.ID, JYRU.XM, JYRU.ZWHZC, JYRU.SSJYR, JYR.GKJYR AS JYRMC, JYRU.FZZY_ID, JYRU.ZSMC,
-			JYRU.ZSBH, JYRU.YXQ, JYRU.ZSZL, JYRU.SZD, CO.TEXT AS SZDMC, JYRU.SSGQ, GQ.GQMC, JYRU.RYLX,
-			COD.TEXT AS RYLXMC, JYRU.BZ
-		FROM
-			AQ_DWXX_JYRDRYXX JYRU
-		LEFT JOIN AQ_DWXX_JYRJCXX JYR ON JYRU.SSJYR = JYR."ID"
-		LEFT JOIN AQ_BASIC_FRAME_CODE C ON C.VAL = JYRU.ZJLX
-		LEFT JOIN AQ_BASIC_FRAME_CODE CO ON CO.VAL = JYRU.SZD
-		LEFT JOIN AQ_BASIC_FRAME_CODE COD ON COD.VAL = JYRU.RYLX
-		LEFT JOIN AQ_DWXX_GQ GQ ON GQ.ID = JYRU.SSGQ
-		<where>
-			JYRU.RECORD_STATUS != 9
-			<if test="szd != null and szd != ''">
-				AND JYRU.SZD = #{szd,jdbcType=VARCHAR}
-			</if>
-			<if test="ssgq != null and ssgq != ''">
-				AND JYRU.SSGQ = #{ssgq,jdbcType=VARCHAR}
-			</if>
-			<if test="ssjyr != null and ssjyr != ''">
-				AND JYRU.SSJYR = #{ssjyr,jdbcType=VARCHAR}
-			</if>
-			<if test="rylx != null and rylx != ''">
-				AND JYRU.RYLX = #{rylx,jdbcType=VARCHAR}
-			</if>
-			<if test="xm != null and xm != ''">
-				AND JYRU.XM LIKE CONCAT(CONCAT('%', #{xm, jdbcType=VARCHAR}),'%')
-			</if>
-			<if test="zwhzc != null and zwhzc != ''">
-				AND JYRU.ZWHZC LIKE CONCAT(CONCAT('%', #{zwhzc, jdbcType=VARCHAR}),'%') 
-			</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/JyrWxhwtjcxMapper.xml

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

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

@@ -1,50 +0,0 @@
-<?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.WxcgtjcxMapper" >
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.WxcgtjcxModel" >
-    <id column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
-    <result column="TEXT" property="bz" jdbcType="VARCHAR" />
-    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
-    
-    <result column="SL" property="sl" jdbcType="VARCHAR" />
-    <result column="RJ" property="rj" jdbcType="DECIMAL" />
-    <result column="XHGS" property="xhgs" jdbcType="DECIMAL" />
-
-    <result column="WXSL" property="wxsl" jdbcType="VARCHAR" />
-    <result column="HZ" property="hz" jdbcType="VARCHAR" />
-    <result column="QYLX" property="qylx" jdbcType="VARCHAR" />
-  </resultMap>
-
-  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.WxcgtjcxModel">
-		SELECT 
-			J.GKJYR,
-			G.TEXT, 
-			J.BYZD1,
-			(SELECT "SUM"(C.CGGS) FROM AQ_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
-				AS SL,
-			(SELECT "SUM"(C.CGRJ) FROM AQ_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
-				AS RJ,
-			(SELECT WM_CONCAT('0'||C.CGRJ||'*'||SUM(C.CGGS)||'个') FROM AQ_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID
-				GROUP BY C.CGRJ
-			) AS XHGS,
-			(SELECT WM_CONCAT(T.WXHWMCBH||':'||NVL(SUM(T.ZYSL),0)||'吨') FROM AQ_DWXX_WXHWGKZYSBD T 
-					WHERE (T.RECORD_STATUS = 2 OR T.RECORD_STATUS = 10) AND T.QXZYSJ IS NULL AND T.ZYDW=J."ID" 
-					GROUP BY T.WXHWMCBH) AS HZ,  
-			(SELECT "SUM"(C.ZDWXYCGGS) FROM AQ_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
-				AS WXSL,
-			J.QYLX
-		FROM AQ_DWXX_JYRJCXX J
-		LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.VAL = J.SZD
-	<where>
-			J.STATE != '9'
-			<if test="szd != null and szd != '' ">
-				AND J.SZD =#{szd,jdbcType=VARCHAR}
-			</if>
-			<if test="qylx != null and qylx != '' ">
-				AND J.QYLX = #{qylx,jdbcType=VARCHAR}
-			</if>
-	</where>
-  </select>
-
-  
-</mapper>

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

@@ -1,116 +0,0 @@
-<?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.WxhwModelMapper" >
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.WxhwModel" >
-    <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="BH" property="bh" jdbcType="VARCHAR" />
-    <result column="MCHSM" property="mchsm" jdbcType="VARCHAR" />
-    <result column="YWMC" property="ywmc" jdbcType="VARCHAR" />
-    <result column="LBHXB" property="lbhxb" jdbcType="VARCHAR" />
-    <result column="CYWXX" property="cywxx" jdbcType="VARCHAR" />
-    <result column="BZLB" property="bzlb" jdbcType="VARCHAR" />
-    <result column="BZ" property="bz" 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="VARCHAR" />
-    <result column="SFTB" property="sftb" jdbcType="VARCHAR" />
-    <result column="ORG_CODE" property="orgcode" jdbcType="VARCHAR" />
-    <result column="LHXZ" property="lhxz" jdbcType="VARCHAR" />
-    <result column="AQFFCS" property="aqffcs" jdbcType="VARCHAR" />
-    <result column="SZD" property="szd" jdbcType="VARCHAR" />
-    <result column="HZWXX" property="hzwxx" jdbcType="VARCHAR" />
-    <result column="DXDJ" property="dxdj" jdbcType="VARCHAR" />
-    <result column="WRLB" property="wrlb" jdbcType="VARCHAR" />
-    
-    <result column="STATE" property="state" jdbcType="VARCHAR" />
-    
-    <result column="BHUN" property="bhun" jdbcType="VARCHAR" />
-    <result column="LBBH" property="lbbh" jdbcType="VARCHAR" />
-    <result column="MCHSMBY" property="mchsmby" jdbcType="VARCHAR" />
-  
-    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
-    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
-    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
-  </resultMap>
-  
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-    delete from AQ_WXHWPMB
-    where ID = #{id,jdbcType=DECIMAL}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.WxhwModel" >
-    insert into AQ_WXHWPMB (ID, BH, MCHSM, YWMC, LBHXB, CYWXX, BZLB, BZ, CREATE_USER, CREATE_TIME, UPDATE_USER,
-							UPDATE_TIME, STATE, TBZT, TBDYID, QYLB, SSQY, SFTB,ORG_CODE, 
-							BHUN, LBBH, MCHSMBY, LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB)
-    values (#{id,jdbcType=VARCHAR}, #{bh,jdbcType=VARCHAR}, #{mchsm,jdbcType=VARCHAR}, #{ywmc,jdbcType=VARCHAR}, 
-    		#{lbhxb,jdbcType=VARCHAR}, #{cywxx,jdbcType=VARCHAR}, #{bzlb,jdbcType=VARCHAR}, #{bz,jdbcType=VARCHAR}, 
-    		#{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, 
-    		#{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=VARCHAR}, #{tbzt,jdbcType=VARCHAR}, #{tbdyid,jdbcType=DECIMAL},
-    		#{qylb,jdbcType=VARCHAR}, #{ssqy,jdbcType=VARCHAR}, #{sftb,jdbcType=VARCHAR},#{orgcode,jdbcType=VARCHAR},
-    		#{bhun,jdbcType=VARCHAR}, #{lbbh,jdbcType=VARCHAR},#{mchsmby,jdbcType=VARCHAR}, #{lhxz,jdbcType=TIMESTAMP}, 
-    		#{aqffcs,jdbcType=VARCHAR},#{szd,jdbcType=VARCHAR}, #{hzwxx,jdbcType=VARCHAR}, #{dxdj,jdbcType=VARCHAR},
-    		#{wrlb,jdbcType=VARCHAR},
-      )
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.WxhwModel" >
-    update AQ_WXHWPMB
-    set BH = #{bh,jdbcType=VARCHAR},
-      MCHSM = #{mchsm,jdbcType=VARCHAR},
-      YWMC = #{ywmc,jdbcType=VARCHAR},
-      LBHXB = #{lbhxb,jdbcType=VARCHAR},
-      CYWXX = #{cywxx,jdbcType=VARCHAR},
-      BZLB = #{bzlb,jdbcType=VARCHAR},
-      BZ = #{bz,jdbcType=VARCHAR},
-      TBZT = #{tbzt,jdbcType=VARCHAR},
-      TBDYID = #{tbdyid,jdbcType=DECIMAL},
-      QYLB = #{qylb,jdbcType=VARCHAR}, 
-      SSQY = #{ssqy,jdbcType=VARCHAR}, 
-      SFTB = #{sftb,jdbcType=VARCHAR},
-      ORG_CODE = #{orgcode,jdbcType=VARCHAR}, 
-      LHXZ = #{lhxz,jdbcType=VARCHAR},
-      AQFFCS = #{aqffcs,jdbcType=VARCHAR},
-      SZD = #{szd,jdbcType=VARCHAR},
-      HZWXX = #{hzwxx,jdbcType=VARCHAR},
-      DXDJ = #{dxdj,jdbcType=VARCHAR},
-      WRLB = #{wrlb,jdbcType=VARCHAR},
-      BHUN = #{bhun,jdbcType=VARCHAR},
-      LBBH = #{lbbh,jdbcType=VARCHAR},
-      MCHSMBY = #{mchsmby,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      CREATE_USER = #{createUser,jdbcType=VARCHAR},
-      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
-      STATE = #{state,jdbcType=VARCHAR},
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-	SELECT
-		ID,BH,MCHSM,YWMC,LBHXB,CYWXX,BZLB,BZ,CREATE_USER,CREATE_TIME,UPDATE_USER,UPDATE_TIME,STATE,
-		TBZT,TBDYID,QYLB,SSQY,SFTB,ORG_CODE,BHUN,LBBH,MCHSMBY,LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB
-		FROM AQ_WXHWPMB
-	WHERE ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.WxhwModel">
-    SELECT
-		ID,BH,MCHSM,YWMC,LBHXB,CYWXX,BZLB,BZ,CREATE_USER,CREATE_TIME,UPDATE_USER,UPDATE_TIME,STATE,
-		TBZT,TBDYID,QYLB,SSQY,SFTB,ORG_CODE,BHUN,LBBH,MCHSMBY,LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB
-	FROM AQ_WXHWPMB
-	<where>
-		STATE = '1'
-		<if test="bh != null and bh != ''">
-			AND BH = #{bh,jdbcType=VARCHAR}
-		</if>
-		<if test="mchsm != null and mchsm != ''">
-			AND MCHSM LIKE CONCAT(CONCAT('%', #{mchsm,jdbcType=VARCHAR}),'%')
-		</if>
-		<if test="lbhxb != null and lbhxb != ''">
-			AND LBHXB = #{lbhxb,jdbcType=VARCHAR}
-		</if>
-		<if test="szd != null and szd != ''">
-			AND SZD = #{szd,jdbcType=DECIMAL}
-		</if>
-		
-	</where>
-  </select>
-</mapper>

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

@@ -1,160 +0,0 @@
-<?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.zdhqdModelMapper" >
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.zdhqdModel" >
-    <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="BXDW" property="bxdw" jdbcType="VARCHAR" />
-    <result column="SZD" property="szd" jdbcType="VARCHAR" />
-    <result column="SZGQ" property="szgq" jdbcType="VARCHAR" />
-    <result column="ZDMC" property="zdmc" jdbcType="VARCHAR" />
-    <result column="ZDFL" property="zdfl" jdbcType="VARCHAR" />
-    <result column="TXSJ" property="txsj" jdbcType="TIMESTAMP" />
-    <result column="TBR" property="tbr" jdbcType="VARCHAR" />
-    <result column="LXDH" property="lxdh" jdbcType="VARCHAR" />
-    <result column="QYMC" property="qymc" jdbcType="VARCHAR" />
-    <result column="SSGQ" property="ssgq" jdbcType="VARCHAR" />
-    <result column="STATE" property="state" jdbcType="CHAR" />
-    <result column="SFTB" property="sftb" jdbcType="CHAR" />
-    <result column="TBZT" property="tbzt" jdbcType="CHAR" />
-    <result column="TBDYID" property="tbdyid" jdbcType="VARCHAR" />
-    <result column="QYLB" property="qylb" jdbcType="CHAR" />
-    <result column="SSQY" property="ssqy" jdbcType="VARCHAR" />
-    <result column="ORG_CODE" property="orgCode" jdbcType="VARCHAR" />
-    <result column="ZDWH" property="zdwh" jdbcType="VARCHAR" />
-    <result column="FBRQ" property="fbrq" jdbcType="TIMESTAMP" />
-    <result column="XDRQ" property="xdrq" jdbcType="TIMESTAMP" />
-    <result column="SFCZGC" property="sfczgc" jdbcType="VARCHAR" />
-    <result column="ZYFZ_ID" property="zyfzId" jdbcType="VARCHAR" />
-    <result column="LXR" property="lxr" jdbcType="VARCHAR" />
-    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
-    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
-    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  
-  <resultMap id="BaseResultInfoMap" type="com.xt.js.gkaq.web.model.zdhqdExtendModel" >
-    <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="ZDMC" property="zdmc" jdbcType="VARCHAR" />
-    <result column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
-    <result column="ZDFL" property="zdfl" jdbcType="VARCHAR" />
-    <result column="FBRQ" property="fbrq" jdbcType="TIMESTAMP" />
-    <result column="XDRQ" property="xdrq" jdbcType="TIMESTAMP" />
-    <result column="LXR" property="lxr" jdbcType="VARCHAR" />
-    <result column="LXDH" property="lxdh" jdbcType="VARCHAR" />
-    <result column="SZD" property="szd" jdbcType="VARCHAR" />
-    <result column="GQMC" property="gqmc" jdbcType="VARCHAR" />
-   
-  </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from AQ_GLZD
-    where ID = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.zdhqdModel" >
-    insert into AQ_GLZD (ID, BXDW, SZD, 
-      SZGQ, ZDMC, ZDFL, TXSJ, 
-      TBR, LXDH, QYMC, SSGQ, 
-      STATE, SFTB, TBZT, TBDYID, 
-      QYLB, SSQY, ORG_CODE, ZDWH, 
-      FBRQ, XDRQ, SFCZGC, 
-      ZYFZ_ID, LXR, CREATE_USER, 
-      CREATE_TIME, UPDATE_USER, UPDATE_TIME
-      )
-    values (#{id,jdbcType=VARCHAR}, #{bxdw,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, 
-      #{szgq,jdbcType=VARCHAR}, #{zdmc,jdbcType=VARCHAR}, #{zdfl,jdbcType=VARCHAR}, #{txsj,jdbcType=TIMESTAMP}, 
-      #{tbr,jdbcType=VARCHAR}, #{lxdh,jdbcType=VARCHAR}, #{qymc,jdbcType=VARCHAR}, #{ssgq,jdbcType=VARCHAR}, 
-      #{state,jdbcType=CHAR}, #{sftb,jdbcType=CHAR}, #{tbzt,jdbcType=CHAR}, #{tbdyid,jdbcType=VARCHAR}, 
-      #{qylb,jdbcType=CHAR}, #{ssqy,jdbcType=VARCHAR}, #{orgCode,jdbcType=VARCHAR}, #{zdwh,jdbcType=VARCHAR}, 
-      #{fbrq,jdbcType=TIMESTAMP}, #{xdrq,jdbcType=TIMESTAMP}, #{sfczgc,jdbcType=VARCHAR}, 
-      #{zyfzId,jdbcType=VARCHAR}, #{lxr,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
-      )
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.zdhqdModel" >
-    update AQ_GLZD
-    set BXDW = #{bxdw,jdbcType=VARCHAR},
-      SZD = #{szd,jdbcType=VARCHAR},
-      SZGQ = #{szgq,jdbcType=VARCHAR},
-      ZDMC = #{zdmc,jdbcType=VARCHAR},
-      ZDFL = #{zdfl,jdbcType=VARCHAR},
-      TXSJ = #{txsj,jdbcType=TIMESTAMP},
-      TBR = #{tbr,jdbcType=VARCHAR},
-      LXDH = #{lxdh,jdbcType=VARCHAR},
-      QYMC = #{qymc,jdbcType=VARCHAR},
-      SSGQ = #{ssgq,jdbcType=VARCHAR},
-      STATE = #{state,jdbcType=CHAR},
-      SFTB = #{sftb,jdbcType=CHAR},
-      TBZT = #{tbzt,jdbcType=CHAR},
-      TBDYID = #{tbdyid,jdbcType=VARCHAR},
-      QYLB = #{qylb,jdbcType=CHAR},
-      SSQY = #{ssqy,jdbcType=VARCHAR},
-      ORG_CODE = #{orgCode,jdbcType=VARCHAR},
-      ZDWH = #{zdwh,jdbcType=VARCHAR},
-      FBRQ = #{fbrq,jdbcType=TIMESTAMP},
-      XDRQ = #{xdrq,jdbcType=TIMESTAMP},
-      SFCZGC = #{sfczgc,jdbcType=VARCHAR},
-      ZYFZ_ID = #{zyfzId,jdbcType=VARCHAR},
-      LXR = #{lxr,jdbcType=VARCHAR},
-      CREATE_USER = #{createUser,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, BXDW, SZD, SZGQ, ZDMC, ZDFL, TXSJ, TBR, LXDH, QYMC, SSGQ, STATE, SFTB, 
-    TBZT, TBDYID, QYLB, SSQY, ORG_CODE, ZDWH, FBRQ, XDRQ, SFCZGC, ZYFZ_ID, LXR, CREATE_USER, 
-    CREATE_TIME, UPDATE_USER, UPDATE_TIME
-    from AQ_GLZD
-    where ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, BXDW, SZD, SZGQ, ZDMC, ZDFL, TXSJ, TBR, LXDH, QYMC, SSGQ, STATE, SFTB, 
-    TBZT, TBDYID, QYLB, SSQY, ORG_CODE, ZDWH, FBRQ, XDRQ, SFCZGC, ZYFZ_ID, LXR, CREATE_USER, 
-    CREATE_TIME, UPDATE_USER, UPDATE_TIME
-    from AQ_GLZD
-  </select>
-  
-  <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.zdhqdExtendModel">
-	  	SELECT 
-			ZD.ID,
-			ZD.ZDMC,
-			J.GKJYR,
-			C.TEXT AS ZDFL,
-			ZD.FBRQ,
-			ZD.XDRQ,
-			ZD.LXR,
-			ZD.LXDH,
-			CO.TEXT AS SZD,
-			GQ.GQMC
-		FROM AQ_GLZD ZD
-			LEFT JOIN AQ_DWXX_JYRJCXX J ON J.ID = ZD.QYMC
-			LEFT JOIN AQ_BASIC_FRAME_CODE C ON C.VAL = ZD.ZDFL
-			LEFT JOIN AQ_BASIC_FRAME_CODE CO ON CO.VAL = ZD.SZD
-			LEFT JOIN AQ_DWXX_GQ GQ ON GQ.ID = ZD.SZGQ
-		<where>
-			ZD.STATE != 9
-			<if test="szd != null and szd != ''">
-				AND ZD.SZD = #{szd,jdbcType=VARCHAR}
-			</if>
-			<if test="gqmc != null and gqmc != '' ">
-				AND ZD.SZGQ = #{gqmc,jdbcType=VARCHAR}
-			</if>
-			<if test="gkjyr != null and gkjyr != ''">
-				AND J.GKJYR LIKE CONCAT(CONCAT('%', #{gkjyr, jdbcType=VARCHAR}),'%')
-			</if>
-			<if test="zdfl != null and zdfl != ''">
-				AND ZD.ZDFL = #{zdfl,jdbcType=VARCHAR}
-			</if>
-			<if test="xdrq != null and xdrq != ''">
-				AND <![CDATA[ZD.XDRQ >= "TO_TIMESTAMP"(#{xdrq,jdbcType=TIMESTAMP},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
-			</if>
-			<if test="fbrq != null and fbrq != ''">
-				AND <![CDATA[ZD.XDRQ <= "TO_TIMESTAMP"(#{fbrq,jdbcType=TIMESTAMP},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
-			</if>
-			<if test="zdmc != null and zdmc != ''">
-				AND ZD.ZDMC LIKE CONCAT(CONCAT('%', #{zdmc, jdbcType=VARCHAR}),'%')
-			</if>
-		</where>
-		ORDER BY ZD.XDRQ DESC 
-  </select>
-</mapper>

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

@@ -54,10 +54,6 @@
 						onclick="printInfo()" title="´ňÓĄ"/>
 				</div>
 				<div class="p_buttonbg">
-					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
-						onclick="" title="ÍłźĆĐĹϢ"/>
-				</div>
-				<div class="p_buttonbg">
 					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
 						onclick="" title="¸´ÖĆ"/>
 				</div>

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

@@ -21,15 +21,11 @@
 					</td>
 					<td class="tdname">统计时间：起</td>
 					<td class="tdcontent">
-						<div class="input-group date" id="tjqstimeDiv">
-                               <input id="tjqstime" name="tjqstime" class="form-control" type="text" readonly="readonly">
-                               <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                         </div>
+                        <input id="tjqstime" class="form-control" type="text"/>
 					</td>
 					<td class="tdname">统计时间：止</td>
 					<td class="tdcontent">
-						<input id="tjjstime" 
-							 style="width:60%;height: 34px;" type="text"/>
+						<input id="tjjstime" class="form-control" type="text"/>
 					</td>
 				</tr>
 				<tr>

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

@@ -21,15 +21,11 @@
 					</td>
 					<td class="tdname">统计时间：起</td>
 					<td class="tdcontent">
-						<input id="kssj" class="easyui-datetimebox" 
-							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
-							 style="width:80%;height: 34px;" type="text"/>
+						<input id="kssj" class="form-control"type="text"/>
 					</td>
 					<td class="tdname">统计时间：止</td>
 					<td class="tdcontent">
-						<input id="jssj" class="easyui-datetimebox" 
-							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
-							 style="width:80%;height: 34px;" type="text"/>
+						<input id="jssj" class="form-control" type="text"/>
 					</td>
 				</tr>
 				<tr>

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

@@ -225,6 +225,9 @@
 						    </div>   
 						</div>
 					</div>
+				</div>
+			</div>
+		</div>
 		<div class="modal fade" id="jyrTjxxinfo" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 			<div class="modal-dialog" style="width:100%;height:100%;">
 				<div class="modal-content">

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

@@ -17,7 +17,7 @@ function gksssbCkInfoInit (data) {
 	
 	$("#cktbr").val(data.tbr);
 	$("#cklxdh").val(data.lxdh);
-	
+	$("#sssbList").datagrid("loadData",{ total: 0, rows: [] });
 	
 }
 /**

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

@@ -61,10 +61,10 @@ function manageInfo (data) {
 	$("#bayxq").datetimebox("setValue",formatDate(new Date(data[0].bayxq)));
 	$("#fzyxq").datetimebox("setValue",formatDate(new Date(data[0].fzyxq)));*/
 	
-	$("#fzrq").val(formatDate(new Date(data[0].fzrq)));
-	$("#bafzrq").val(formatDate(new Date(data[0].bafzrq)));
-	$("#bayxq").val(formatDate(new Date(data[0].bayxq)));
-	$("#fzyxq").val(formatDate(new Date(data[0].fzyxq)));
+	$("#fzrq").val(formatterDateNotsfm(new Date(data[0].fzrq)));
+	$("#bafzrq").val(formatterDateNotsfm(new Date(data[0].bafzrq)));
+	$("#bayxq").val(formatterDateNotsfm(new Date(data[0].bayxq)));
+	$("#fzyxq").val(formatterDateNotsfm(new Date(data[0].fzyxq)));
 	//设置input
 	$("#bgdz").val(data[0].bgdz);
 	$("#fzjg").val(data[0].fzjg);
@@ -413,9 +413,9 @@ function eiditRyzs (ssid) {
 				            			"ssid":ssid};
 			            	editFJInfo(value);
 		            	}else {
-		            		ayer.alert("数据已成功保存！");
-		            		hideModelDialog("#jyrwin");
-			                window.parent.searchRecord();
+		            		  layer.alert("数据已成功保存！");
+		            		  hideModelDialog("jyrwin");
+		  	                  searchRecord();
 		            	}
 		            } else {
 		            	zsnr = null;
@@ -424,6 +424,10 @@ function eiditRyzs (ssid) {
 				}
 			});
 		}
+	} else {
+		  layer.alert("数据已成功保存！");
+          hideModelDialog("jyrwin");
+          searchRecord();
 	}
 }
 /**
@@ -439,10 +443,9 @@ function editFJInfo (data) {
 			success:function (data) {
 				// 成功删除后刷新页面
 	            if (data && data.success == true) {
-	            	
 	                layer.alert("数据已成功保存！");
-	                $("#jyrwin").window("close");
-	                window.parent.searchRecord();
+	                hideModelDialog("jyrwin");
+	                searchRecord();
 	            } else {
 	                layer.alert("数据保存失败！");
 	            }

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

@@ -4,13 +4,11 @@
 var tj_grid_selector = "#tj-grid-table";
 jQuery(function($) {
 	// 初始化Grid
-	$("#tjqstimeDiv").datetimepicker({
-        language : "zh-CN",
-        todayHighlight : true,
-        todayBtn : "linked",
-        format : 'yyyy-mm-dd',
-        autoclose : true,
-        minView : 2
+	$("#tjqstime").datetimepicker({
+		format:"Y-m-d"
+    });
+	$("#tjjstime").datetimepicker({
+		format:"Y-m-d"
     });
 });
 
@@ -166,8 +164,8 @@ function tj_initGrid() {
 function jyrTjSearch () {
 	var szd = $("#tjszd").val();
 	var qylx = $("#tjqylx").val();
-	var qstime = $("#tjqstime").datetimebox("getValue");
-	var jstime = $("#tjjstime").datetimebox("getValue");
+	var qstime = $("#tjqstime").val();
+	var jstime = $("#tjjstime").val();
 	// 定义查询参数
     var obj = {"szd":szd,"qylx":qylx,"qstime":qstime,"jstime":jstime};
     // 设置gird参数

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

@@ -4,6 +4,12 @@
 var whtj_grid_selector = "#whtj-grid-table";
 jQuery(function($) {
 	// 初始化Grid
+	$("#kssj").datetimepicker({
+		format:"Y-m-d"
+    });
+	$("#jssj").datetimepicker({
+		format:"Y-m-d"
+    });
 });
 
 
@@ -143,8 +149,8 @@ function getjyrbyzd () {
 function jyrWxTjsearch () {
 	var szd = $("#wxszd").val();
 	var qylx = $("#wxqylx").val();
-	var qstime = $("#kssj").datetimebox("getValue");
-	var jstime = $("#jssj").datetimebox("getValue");
+	var qstime = $("#kssj").val();
+	var jstime = $("#jssj").val();
 	var wxbyzd1 ="";
 	var wxbyzd2 ="";
 	var wxbyzd3 ="";

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

@@ -138,15 +138,6 @@ function getLookInfo (id) {
 				$("#tt").tabs('enableTab',1);
 				$("#tt").tabs('enableTab',2);
 				$("#tt").tabs('enableTab',3);
-//				var html = '泊位信息';
-//				var html2 = '堆场信息';
-//				var html3 = '仓库信息';
-//				$("#myTab a:eq(1)").html(html);
-//				$("#myTab a:eq(2)").html(html2);
-//				$("#myTab a:eq(3)").html(html3);
-//				$("#myTab a:eq(1)").attr("href","#bwInfotab");
-//				$("#myTab a:eq(2)").attr("href","#dcInfotab");
-//				$("#myTab a:eq(3)").attr("href","#ckInfotab");
 				bw_initGrid(data[0].id);
 				ck_initGrid(data[0].id);
 				dc_initGrid(data[0].id);
@@ -379,21 +370,21 @@ function initszd (select) {
 //统计信息查询
 function tjxx () {
 //	$("#jyrTjxxinfo").window("open");
-	showModelDialog("jyrTjxxinfo", "新增");
+	showModelDialog("jyrTjxxinfo", "统计查询");
 	initszd("#tjszd");
 	tj_initGrid();
 }
 //危险货物企业统计
 function whqy () {
 //	$("#jyrWhTjxxinfo").window("open");
-	showModelDialog("jyrWhTjxxinfo", "新增");
+	showModelDialog("jyrWhTjxxinfo", "危险货物企业统计");
 	initszd("#wxszd");
 	whtj_initGrid();
 }
 //危险储罐统计
 function ccss (){
 //	$("#jyrWhcgTjxxinfo").window("open");
-	showModelDialog("jyrWhcgTjxxinfo", "新增");
+	showModelDialog("jyrWhcgTjxxinfo", "危险储罐统计");
 	initszd("#wcszd");
 	wxcgtj_initGrid();
 }

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

@@ -261,6 +261,7 @@ function initRyzsbEdit (id,souces,opn) {
 function addJyrUserInfo () {
 	$("#jyrUserwin").window({title:"新增"});
 	$("#jyrUserwin").window("open");
+	$('#zstbl').datagrid('loadData',{total:0,rows:[]}); //附件列表
 //	showModelDialog("jyrUserwin", "新增");
 	formQY();
 	comClearFormData("#jyrUserInfoform");