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

gkaqv2/trunk/modules/aqsp/pom.xml

@@ -40,9 +40,8 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.xt.js.gkaq.common</groupId>
+			<groupId>com.xt.js.gkaq</groupId>
 			<artifactId>gkaq-common</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/mappers/WhxxModelMapper.java

@@ -17,5 +17,7 @@ public interface WhxxModelMapper  extends BaseMapper<WhxxModel> {
     int updateByPrimaryKey(WhxxModel record);
     
     public List<WhxxModel> selectAllByCond(WhxxModel model);
+
+    public int deleteByZyfzId(String zyfzId);
     
 }

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/mappers/WxhwsbModelMapper.java

@@ -0,0 +1,16 @@
+package com.xt.js.gkaq.aqsp.mappers;
+
+import com.xt.js.gkaq.aqsp.model.WxhwsbModel;
+import java.util.List;
+
+public interface WxhwsbModelMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(WxhwsbModel record);
+
+    WxhwsbModel selectByPrimaryKey(String id);
+
+    List<WxhwsbModel> selectAll();
+
+    int updateByPrimaryKey(WxhwsbModel record);
+}

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/model/FzglzbModel.java

@@ -1,11 +1,15 @@
 package com.xt.js.gkaq.aqsp.model;
 
-import java.util.Date;
+import com.xt.js.gkaq.common.BaseUUIDModel;
 
-public class FzglzbModel {
-    private String id;
+public class FzglzbModel extends BaseUUIDModel{
 
-    private String fzzyId;
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String zyfzId;
 
     private String ryid;
 
@@ -17,8 +21,6 @@ public class FzglzbModel {
 
     private String szd;
 
-    private String state;
-
     private String sftb;
 
     private String tbzt;
@@ -33,28 +35,12 @@ public class FzglzbModel {
 
     private String flag;
 
-    private String createUser;
-
-    private Date createTime;
-
-    private String updateUser;
-
-    private Date updateTime;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
+    public String getZyfzId() {
+        return zyfzId;
     }
 
-    public String getFzzyId() {
-        return fzzyId;
-    }
-
-    public void setFzzyId(String fzzyId) {
-        this.fzzyId = fzzyId == null ? null : fzzyId.trim();
+    public void setZyfzId(String zyfzId) {
+        this.zyfzId = zyfzId == null ? null : zyfzId.trim();
     }
 
     public String getRyid() {
@@ -97,14 +83,6 @@ public class FzglzbModel {
         this.szd = szd == null ? null : szd.trim();
     }
 
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
-
     public String getSftb() {
         return sftb;
     }
@@ -160,36 +138,4 @@ public class FzglzbModel {
     public void setFlag(String flag) {
         this.flag = flag == null ? null : flag.trim();
     }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(String updateUser) {
-        this.updateUser = updateUser == null ? null : updateUser.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/model/GlzdModel.java

@@ -0,0 +1,233 @@
+package com.xt.js.gkaq.aqsp.model;
+
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class GlzdModel extends BaseUUIDModel{
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    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 == null ? null : bxdw.trim();
+    }
+
+    public String getSzd() {
+        return szd;
+    }
+
+    public void setSzd(String szd) {
+        this.szd = szd == null ? null : szd.trim();
+    }
+
+    public String getSzgq() {
+        return szgq;
+    }
+
+    public void setSzgq(String szgq) {
+        this.szgq = szgq == null ? null : szgq.trim();
+    }
+
+    public String getZdmc() {
+        return zdmc;
+    }
+
+    public void setZdmc(String zdmc) {
+        this.zdmc = zdmc == null ? null : zdmc.trim();
+    }
+
+    public String getZdfl() {
+        return zdfl;
+    }
+
+    public void setZdfl(String zdfl) {
+        this.zdfl = zdfl == null ? null : zdfl.trim();
+    }
+
+    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 == null ? null : tbr.trim();
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh == null ? null : lxdh.trim();
+    }
+
+    public String getQymc() {
+        return qymc;
+    }
+
+    public void setQymc(String qymc) {
+        this.qymc = qymc == null ? null : qymc.trim();
+    }
+
+    public String getSsgq() {
+        return ssgq;
+    }
+
+    public void setSsgq(String ssgq) {
+        this.ssgq = ssgq == null ? null : ssgq.trim();
+    }
+
+    public String getSftb() {
+        return sftb;
+    }
+
+    public void setSftb(String sftb) {
+        this.sftb = sftb == null ? null : sftb.trim();
+    }
+
+    public String getTbzt() {
+        return tbzt;
+    }
+
+    public void setTbzt(String tbzt) {
+        this.tbzt = tbzt == null ? null : tbzt.trim();
+    }
+
+    public String getTbdyid() {
+        return tbdyid;
+    }
+
+    public void setTbdyid(String tbdyid) {
+        this.tbdyid = tbdyid == null ? null : tbdyid.trim();
+    }
+
+    public String getQylb() {
+        return qylb;
+    }
+
+    public void setQylb(String qylb) {
+        this.qylb = qylb == null ? null : qylb.trim();
+    }
+
+    public String getSsqy() {
+        return ssqy;
+    }
+
+    public void setSsqy(String ssqy) {
+        this.ssqy = ssqy == null ? null : ssqy.trim();
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode == null ? null : orgCode.trim();
+    }
+
+    public String getZdwh() {
+        return zdwh;
+    }
+
+    public void setZdwh(String zdwh) {
+        this.zdwh = zdwh == null ? null : zdwh.trim();
+    }
+
+    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 == null ? null : sfczgc.trim();
+    }
+
+    public String getZyfzId() {
+        return zyfzId;
+    }
+
+    public void setZyfzId(String zyfzId) {
+        this.zyfzId = zyfzId == null ? null : zyfzId.trim();
+    }
+
+    public String getLxr() {
+        return lxr;
+    }
+
+    public void setLxr(String lxr) {
+        this.lxr = lxr == null ? null : lxr.trim();
+    }
+}

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/model/SgyahzfoModel.java

@@ -2,8 +2,14 @@ package com.xt.js.gkaq.aqsp.model;
 
 import java.util.Date;
 
-public class SgyahzfoModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class SgyahzfoModel extends BaseUUIDModel{
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
 
     private String yamc;
 
@@ -17,8 +23,6 @@ public class SgyahzfoModel {
 
     private String yags;
 
-    private String state;
-
     private String sftb;
 
     private String tbzt;
@@ -85,22 +89,6 @@ public class SgyahzfoModel {
 
     private String cyry;
 
-    private String createUser;
-
-    private Date createTime;
-
-    private String updateUser;
-
-    private Date updateTime;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
     public String getYamc() {
         return yamc;
     }
@@ -149,14 +137,6 @@ public class SgyahzfoModel {
         this.yags = yags == null ? null : yags.trim();
     }
 
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
-
     public String getSftb() {
         return sftb;
     }
@@ -420,36 +400,4 @@ public class SgyahzfoModel {
     public void setCyry(String cyry) {
         this.cyry = cyry == null ? null : cyry.trim();
     }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(String updateUser) {
-        this.updateUser = updateUser == null ? null : updateUser.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/model/WhxxModel.java

@@ -15,7 +15,7 @@ public class WhxxModel extends BaseUUIDModel{
 
     private String qynbbh;
 
-    private String fzzyId;
+    private String zyfzId;
 
     private String sftb;
 
@@ -41,6 +41,8 @@ public class WhxxModel extends BaseUUIDModel{
 
     private String szd;
 
+    private String whlx;
+
     public String getZycs() {
         return zycs;
     }
@@ -65,12 +67,12 @@ public class WhxxModel extends BaseUUIDModel{
         this.qynbbh = qynbbh == null ? null : qynbbh.trim();
     }
 
-    public String getFzzyId() {
-        return fzzyId;
+    public String getZyfzId() {
+        return zyfzId;
     }
 
-    public void setFzzyId(String fzzyId) {
-        this.fzzyId = fzzyId == null ? null : fzzyId.trim();
+    public void setZyfzId(String zyfzId) {
+        this.zyfzId = zyfzId == null ? null : zyfzId.trim();
     }
 
     public String getSftb() {
@@ -168,4 +170,12 @@ public class WhxxModel extends BaseUUIDModel{
     public void setSzd(String szd) {
         this.szd = szd == null ? null : szd.trim();
     }
+
+    public String getWhlx() {
+        return whlx;
+    }
+
+    public void setWhlx(String whlx) {
+        this.whlx = whlx == null ? null : whlx.trim();
+    }
 }

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/model/WxhwsbModel.java

@@ -0,0 +1,765 @@
+package com.xt.js.gkaq.aqsp.model;
+
+import java.util.Date;
+
+public class WxhwsbModel {
+    private String id;
+
+    private String zywtr;
+
+    private String xcglfzr;
+
+    private String addUser;
+
+    private Date addDate;
+
+    private String updateUser;
+
+    private Date updateDate;
+
+    private Short state;
+
+    private String sftb;
+
+    private String tbzt;
+
+    private Short tbdyid;
+
+    private String qylb;
+
+    private String recordCode;
+
+    private String byzd1;
+
+    private String byzd2;
+
+    private String byzd3;
+
+    private String byzd4;
+
+    private String byzd5;
+
+    private String bh;
+
+    private String cm;
+
+    private String wxplb;
+
+    private String wxwpmc;
+
+    private String wpbh;
+
+    private String jspm;
+
+    private Short zysl;
+
+    private String lhxz;
+
+    private Date zysj;
+
+    private String zydd;
+
+    private String aqffcs;
+
+    private String bgr;
+
+    private String lxfs;
+
+    private Date bgsj;
+
+    private String zyddqybh;
+
+    private Date kpsj;
+
+    private String zylx;
+
+    private String sg;
+
+    private String xg;
+
+    private Date kgsj;
+
+    private Date wgsj;
+
+    private String kgzt;
+
+    private String wgzt;
+
+    private String gjbh;
+
+    private Date zysjq;
+
+    private Date zysjz;
+
+    private Date qxzysj;
+
+    private String zyddqt;
+
+    private String wxhwmcbh;
+
+    private String inorout;
+
+    private String mao;
+
+    private String jzxsl;
+
+    private String hwxs;
+
+    private String hc;
+
+    private String cbbh;
+
+    private String merge;
+
+    private String cnno;
+
+    private Short sl20c;
+
+    private Short sl40c;
+
+    private Short sl45c;
+
+    private Short slspc;
+
+    private Short sl20t;
+
+    private Short sl40t;
+
+    private Short teu;
+
+    private String bz;
+
+    private String jzxxh;
+
+    private String startWorkReporter;
+
+    private String finishWorkReporter;
+
+    private String zydw;
+
+    private String ssqy;
+
+    private String gq;
+
+    private String szd;
+
+    private String szgq;
+
+    private String zyddssjyr;
+
+    private String hzwxx;
+
+    private String dxdj;
+
+    private String wrlb;
+
+    private String hwzl;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getZywtr() {
+        return zywtr;
+    }
+
+    public void setZywtr(String zywtr) {
+        this.zywtr = zywtr == null ? null : zywtr.trim();
+    }
+
+    public String getXcglfzr() {
+        return xcglfzr;
+    }
+
+    public void setXcglfzr(String xcglfzr) {
+        this.xcglfzr = xcglfzr == null ? null : xcglfzr.trim();
+    }
+
+    public String getAddUser() {
+        return addUser;
+    }
+
+    public void setAddUser(String addUser) {
+        this.addUser = addUser == null ? null : addUser.trim();
+    }
+
+    public Date getAddDate() {
+        return addDate;
+    }
+
+    public void setAddDate(Date addDate) {
+        this.addDate = addDate;
+    }
+
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser == null ? null : updateUser.trim();
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Short getState() {
+        return state;
+    }
+
+    public void setState(Short state) {
+        this.state = state;
+    }
+
+    public String getSftb() {
+        return sftb;
+    }
+
+    public void setSftb(String sftb) {
+        this.sftb = sftb == null ? null : sftb.trim();
+    }
+
+    public String getTbzt() {
+        return tbzt;
+    }
+
+    public void setTbzt(String tbzt) {
+        this.tbzt = tbzt == null ? null : tbzt.trim();
+    }
+
+    public Short getTbdyid() {
+        return tbdyid;
+    }
+
+    public void setTbdyid(Short tbdyid) {
+        this.tbdyid = tbdyid;
+    }
+
+    public String getQylb() {
+        return qylb;
+    }
+
+    public void setQylb(String qylb) {
+        this.qylb = qylb == null ? null : qylb.trim();
+    }
+
+    public String getRecordCode() {
+        return recordCode;
+    }
+
+    public void setRecordCode(String recordCode) {
+        this.recordCode = recordCode == null ? null : recordCode.trim();
+    }
+
+    public String getByzd1() {
+        return byzd1;
+    }
+
+    public void setByzd1(String byzd1) {
+        this.byzd1 = byzd1 == null ? null : byzd1.trim();
+    }
+
+    public String getByzd2() {
+        return byzd2;
+    }
+
+    public void setByzd2(String byzd2) {
+        this.byzd2 = byzd2 == null ? null : byzd2.trim();
+    }
+
+    public String getByzd3() {
+        return byzd3;
+    }
+
+    public void setByzd3(String byzd3) {
+        this.byzd3 = byzd3 == null ? null : byzd3.trim();
+    }
+
+    public String getByzd4() {
+        return byzd4;
+    }
+
+    public void setByzd4(String byzd4) {
+        this.byzd4 = byzd4 == null ? null : byzd4.trim();
+    }
+
+    public String getByzd5() {
+        return byzd5;
+    }
+
+    public void setByzd5(String byzd5) {
+        this.byzd5 = byzd5 == null ? null : byzd5.trim();
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh == null ? null : bh.trim();
+    }
+
+    public String getCm() {
+        return cm;
+    }
+
+    public void setCm(String cm) {
+        this.cm = cm == null ? null : cm.trim();
+    }
+
+    public String getWxplb() {
+        return wxplb;
+    }
+
+    public void setWxplb(String wxplb) {
+        this.wxplb = wxplb == null ? null : wxplb.trim();
+    }
+
+    public String getWxwpmc() {
+        return wxwpmc;
+    }
+
+    public void setWxwpmc(String wxwpmc) {
+        this.wxwpmc = wxwpmc == null ? null : wxwpmc.trim();
+    }
+
+    public String getWpbh() {
+        return wpbh;
+    }
+
+    public void setWpbh(String wpbh) {
+        this.wpbh = wpbh == null ? null : wpbh.trim();
+    }
+
+    public String getJspm() {
+        return jspm;
+    }
+
+    public void setJspm(String jspm) {
+        this.jspm = jspm == null ? null : jspm.trim();
+    }
+
+    public Short getZysl() {
+        return zysl;
+    }
+
+    public void setZysl(Short zysl) {
+        this.zysl = zysl;
+    }
+
+    public String getLhxz() {
+        return lhxz;
+    }
+
+    public void setLhxz(String lhxz) {
+        this.lhxz = lhxz == null ? null : lhxz.trim();
+    }
+
+    public Date getZysj() {
+        return zysj;
+    }
+
+    public void setZysj(Date zysj) {
+        this.zysj = zysj;
+    }
+
+    public String getZydd() {
+        return zydd;
+    }
+
+    public void setZydd(String zydd) {
+        this.zydd = zydd == null ? null : zydd.trim();
+    }
+
+    public String getAqffcs() {
+        return aqffcs;
+    }
+
+    public void setAqffcs(String aqffcs) {
+        this.aqffcs = aqffcs == null ? null : aqffcs.trim();
+    }
+
+    public String getBgr() {
+        return bgr;
+    }
+
+    public void setBgr(String bgr) {
+        this.bgr = bgr == null ? null : bgr.trim();
+    }
+
+    public String getLxfs() {
+        return lxfs;
+    }
+
+    public void setLxfs(String lxfs) {
+        this.lxfs = lxfs == null ? null : lxfs.trim();
+    }
+
+    public Date getBgsj() {
+        return bgsj;
+    }
+
+    public void setBgsj(Date bgsj) {
+        this.bgsj = bgsj;
+    }
+
+    public String getZyddqybh() {
+        return zyddqybh;
+    }
+
+    public void setZyddqybh(String zyddqybh) {
+        this.zyddqybh = zyddqybh == null ? null : zyddqybh.trim();
+    }
+
+    public Date getKpsj() {
+        return kpsj;
+    }
+
+    public void setKpsj(Date kpsj) {
+        this.kpsj = kpsj;
+    }
+
+    public String getZylx() {
+        return zylx;
+    }
+
+    public void setZylx(String zylx) {
+        this.zylx = zylx == null ? null : zylx.trim();
+    }
+
+    public String getSg() {
+        return sg;
+    }
+
+    public void setSg(String sg) {
+        this.sg = sg == null ? null : sg.trim();
+    }
+
+    public String getXg() {
+        return xg;
+    }
+
+    public void setXg(String xg) {
+        this.xg = xg == null ? null : xg.trim();
+    }
+
+    public Date getKgsj() {
+        return kgsj;
+    }
+
+    public void setKgsj(Date kgsj) {
+        this.kgsj = kgsj;
+    }
+
+    public Date getWgsj() {
+        return wgsj;
+    }
+
+    public void setWgsj(Date wgsj) {
+        this.wgsj = wgsj;
+    }
+
+    public String getKgzt() {
+        return kgzt;
+    }
+
+    public void setKgzt(String kgzt) {
+        this.kgzt = kgzt == null ? null : kgzt.trim();
+    }
+
+    public String getWgzt() {
+        return wgzt;
+    }
+
+    public void setWgzt(String wgzt) {
+        this.wgzt = wgzt == null ? null : wgzt.trim();
+    }
+
+    public String getGjbh() {
+        return gjbh;
+    }
+
+    public void setGjbh(String gjbh) {
+        this.gjbh = gjbh == null ? null : gjbh.trim();
+    }
+
+    public Date getZysjq() {
+        return zysjq;
+    }
+
+    public void setZysjq(Date zysjq) {
+        this.zysjq = zysjq;
+    }
+
+    public Date getZysjz() {
+        return zysjz;
+    }
+
+    public void setZysjz(Date zysjz) {
+        this.zysjz = zysjz;
+    }
+
+    public Date getQxzysj() {
+        return qxzysj;
+    }
+
+    public void setQxzysj(Date qxzysj) {
+        this.qxzysj = qxzysj;
+    }
+
+    public String getZyddqt() {
+        return zyddqt;
+    }
+
+    public void setZyddqt(String zyddqt) {
+        this.zyddqt = zyddqt == null ? null : zyddqt.trim();
+    }
+
+    public String getWxhwmcbh() {
+        return wxhwmcbh;
+    }
+
+    public void setWxhwmcbh(String wxhwmcbh) {
+        this.wxhwmcbh = wxhwmcbh == null ? null : wxhwmcbh.trim();
+    }
+
+    public String getInorout() {
+        return inorout;
+    }
+
+    public void setInorout(String inorout) {
+        this.inorout = inorout == null ? null : inorout.trim();
+    }
+
+    public String getMao() {
+        return mao;
+    }
+
+    public void setMao(String mao) {
+        this.mao = mao == null ? null : mao.trim();
+    }
+
+    public String getJzxsl() {
+        return jzxsl;
+    }
+
+    public void setJzxsl(String jzxsl) {
+        this.jzxsl = jzxsl == null ? null : jzxsl.trim();
+    }
+
+    public String getHwxs() {
+        return hwxs;
+    }
+
+    public void setHwxs(String hwxs) {
+        this.hwxs = hwxs == null ? null : hwxs.trim();
+    }
+
+    public String getHc() {
+        return hc;
+    }
+
+    public void setHc(String hc) {
+        this.hc = hc == null ? null : hc.trim();
+    }
+
+    public String getCbbh() {
+        return cbbh;
+    }
+
+    public void setCbbh(String cbbh) {
+        this.cbbh = cbbh == null ? null : cbbh.trim();
+    }
+
+    public String getMerge() {
+        return merge;
+    }
+
+    public void setMerge(String merge) {
+        this.merge = merge == null ? null : merge.trim();
+    }
+
+    public String getCnno() {
+        return cnno;
+    }
+
+    public void setCnno(String cnno) {
+        this.cnno = cnno == null ? null : cnno.trim();
+    }
+
+    public Short getSl20c() {
+        return sl20c;
+    }
+
+    public void setSl20c(Short sl20c) {
+        this.sl20c = sl20c;
+    }
+
+    public Short getSl40c() {
+        return sl40c;
+    }
+
+    public void setSl40c(Short sl40c) {
+        this.sl40c = sl40c;
+    }
+
+    public Short getSl45c() {
+        return sl45c;
+    }
+
+    public void setSl45c(Short sl45c) {
+        this.sl45c = sl45c;
+    }
+
+    public Short getSlspc() {
+        return slspc;
+    }
+
+    public void setSlspc(Short slspc) {
+        this.slspc = slspc;
+    }
+
+    public Short getSl20t() {
+        return sl20t;
+    }
+
+    public void setSl20t(Short sl20t) {
+        this.sl20t = sl20t;
+    }
+
+    public Short getSl40t() {
+        return sl40t;
+    }
+
+    public void setSl40t(Short sl40t) {
+        this.sl40t = sl40t;
+    }
+
+    public Short getTeu() {
+        return teu;
+    }
+
+    public void setTeu(Short teu) {
+        this.teu = teu;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz == null ? null : bz.trim();
+    }
+
+    public String getJzxxh() {
+        return jzxxh;
+    }
+
+    public void setJzxxh(String jzxxh) {
+        this.jzxxh = jzxxh == null ? null : jzxxh.trim();
+    }
+
+    public String getStartWorkReporter() {
+        return startWorkReporter;
+    }
+
+    public void setStartWorkReporter(String startWorkReporter) {
+        this.startWorkReporter = startWorkReporter == null ? null : startWorkReporter.trim();
+    }
+
+    public String getFinishWorkReporter() {
+        return finishWorkReporter;
+    }
+
+    public void setFinishWorkReporter(String finishWorkReporter) {
+        this.finishWorkReporter = finishWorkReporter == null ? null : finishWorkReporter.trim();
+    }
+
+    public String getZydw() {
+        return zydw;
+    }
+
+    public void setZydw(String zydw) {
+        this.zydw = zydw == null ? null : zydw.trim();
+    }
+
+    public String getSsqy() {
+        return ssqy;
+    }
+
+    public void setSsqy(String ssqy) {
+        this.ssqy = ssqy == null ? null : ssqy.trim();
+    }
+
+    public String getGq() {
+        return gq;
+    }
+
+    public void setGq(String gq) {
+        this.gq = gq == null ? null : gq.trim();
+    }
+
+    public String getSzd() {
+        return szd;
+    }
+
+    public void setSzd(String szd) {
+        this.szd = szd == null ? null : szd.trim();
+    }
+
+    public String getSzgq() {
+        return szgq;
+    }
+
+    public void setSzgq(String szgq) {
+        this.szgq = szgq == null ? null : szgq.trim();
+    }
+
+    public String getZyddssjyr() {
+        return zyddssjyr;
+    }
+
+    public void setZyddssjyr(String zyddssjyr) {
+        this.zyddssjyr = zyddssjyr == null ? null : zyddssjyr.trim();
+    }
+
+    public String getHzwxx() {
+        return hzwxx;
+    }
+
+    public void setHzwxx(String hzwxx) {
+        this.hzwxx = hzwxx == null ? null : hzwxx.trim();
+    }
+
+    public String getDxdj() {
+        return dxdj;
+    }
+
+    public void setDxdj(String dxdj) {
+        this.dxdj = dxdj == null ? null : dxdj.trim();
+    }
+
+    public String getWrlb() {
+        return wrlb;
+    }
+
+    public void setWrlb(String wrlb) {
+        this.wrlb = wrlb == null ? null : wrlb.trim();
+    }
+
+    public String getHwzl() {
+        return hwzl;
+    }
+
+    public void setHwzl(String hwzl) {
+        this.hwzl = hwzl == null ? null : hwzl.trim();
+    }
+}

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/service/WhxxService.java

@@ -15,4 +15,11 @@ public interface WhxxService extends BaseUUIDModelService<WhxxModel> {
     int deleteLogicByID(String id);
     
     public List<WhxxModel> findAllByCond(WhxxModel model);
+    
+    /**
+     * ¸ù¾Ý×÷Òµ¸½Ö¤É¾³ýÃ÷ϸ
+     * @param zyfzId
+     * @return
+     */
+    public int deleteByZyfzId(String zyfzId);
 }

gkaqv2/trunk/modules/aqsp/src/main/java/com/xt/js/gkaq/aqsp/service/impl/WhxxServiceImpl.java

@@ -24,4 +24,13 @@ public class WhxxServiceImpl extends BaseUUIDModelServiceImpl<WhxxModel> impleme
     public List<WhxxModel> findAllByCond(WhxxModel model) {
         return mapper.selectAllByCond(model);
     }
+    
+    /**
+     * ¸ù¾Ý×÷Òµ¸½Ö¤É¾³ýÃ÷ϸ
+     * @param zyfzId
+     * @return
+     */
+    public int deleteByZyfzId(String zyfzId) {
+        return mapper.deleteByZyfzId(zyfzId);
+    }
 }

gkaqv2/trunk/modules/aqsp/src/main/resources/com/xt/js/gkaq/aqsp/mappers/FzglzbModelMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xt.js.gkaq.aqsp.mappers.FzglzbModelMapper" >
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.aqsp.model.FzglzbModel" >
     <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="FZZY_ID" property="fzzyId" jdbcType="VARCHAR" />
+    <result column="ZYFZ_ID" property="zyfzId" jdbcType="VARCHAR" />
     <result column="RYID" property="ryid" jdbcType="VARCHAR" />
     <result column="ZDID" property="zdid" jdbcType="VARCHAR" />
     <result column="SSID" property="ssid" jdbcType="VARCHAR" />
@@ -27,13 +27,13 @@
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.aqsp.model.FzglzbModel" >
-    insert into AQ_GKWXHWZYFZBLHHZZB (ID, FZZY_ID, RYID, 
+    insert into AQ_GKWXHWZYFZBLHHZZB (ID, ZYFZ_ID, RYID, 
       ZDID, SSID, YAID, SZD, 
       STATE, SFTB, TBZT, TBDYID, 
       QYLB, SSQY, ORG_CODE, FLAG, 
       CREATE_USER, CREATE_TIME, UPDATE_USER, 
       UPDATE_TIME)
-    values (#{id,jdbcType=VARCHAR}, #{fzzyId,jdbcType=VARCHAR}, #{ryid,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{zyfzId,jdbcType=VARCHAR}, #{ryid,jdbcType=VARCHAR}, 
       #{zdid,jdbcType=VARCHAR}, #{ssid,jdbcType=VARCHAR}, #{yaid,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, 
       #{state,jdbcType=CHAR}, #{sftb,jdbcType=CHAR}, #{tbzt,jdbcType=CHAR}, #{tbdyid,jdbcType=VARCHAR}, 
       #{qylb,jdbcType=CHAR}, #{ssqy,jdbcType=VARCHAR}, #{orgCode,jdbcType=VARCHAR}, #{flag,jdbcType=VARCHAR}, 
@@ -42,7 +42,7 @@
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.aqsp.model.FzglzbModel" >
     update AQ_GKWXHWZYFZBLHHZZB
-    set FZZY_ID = #{fzzyId,jdbcType=VARCHAR},
+    set ZYFZ_ID = #{zyfzId,jdbcType=VARCHAR},
       RYID = #{ryid,jdbcType=VARCHAR},
       ZDID = #{zdid,jdbcType=VARCHAR},
       SSID = #{ssid,jdbcType=VARCHAR},
@@ -63,13 +63,13 @@
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, FZZY_ID, RYID, ZDID, SSID, YAID, SZD, STATE, SFTB, TBZT, TBDYID, QYLB, 
+    select ID, ZYFZ_ID, RYID, ZDID, SSID, YAID, SZD, STATE, SFTB, TBZT, TBDYID, QYLB, 
     SSQY, ORG_CODE, FLAG, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME
     from AQ_GKWXHWZYFZBLHHZZB
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, FZZY_ID, RYID, ZDID, SSID, YAID, SZD, STATE, SFTB, TBZT, TBDYID, QYLB, 
+    select ID, ZYFZ_ID, RYID, ZDID, SSID, YAID, SZD, STATE, SFTB, TBZT, TBDYID, QYLB, 
     SSQY, ORG_CODE, FLAG, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME
     from AQ_GKWXHWZYFZBLHHZZB
   </select>

gkaqv2/trunk/modules/aqsp/src/main/resources/com/xt/js/gkaq/aqsp/mappers/GlzdModelMapper.xml

@@ -0,0 +1,102 @@
+<?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.aqsp.mappers.GlzdModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.aqsp.model.GlzdModel" >
+    <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>
+  <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.aqsp.model.GlzdModel" >
+    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.aqsp.model.GlzdModel" >
+    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>
+</mapper>

gkaqv2/trunk/modules/aqsp/src/main/resources/com/xt/js/gkaq/aqsp/mappers/WhxxModelMapper.xml

@@ -6,7 +6,7 @@
     <result column="ZYCS" property="zycs" jdbcType="VARCHAR" />
     <result column="FZCSBH" property="fzcsbh" jdbcType="VARCHAR" />
     <result column="QYNBBH" property="qynbbh" jdbcType="VARCHAR" />
-    <result column="FZZY_ID" property="fzzyId" jdbcType="VARCHAR" />
+    <result column="ZYFZ_ID" property="zyfzId" jdbcType="VARCHAR" />
     <result column="STATE" property="state" jdbcType="CHAR" />
     <result column="SFTB" property="sftb" jdbcType="CHAR" />
     <result column="TBZT" property="tbzt" jdbcType="CHAR" />
@@ -24,27 +24,33 @@
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
     <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="WHLX" property="whlx" jdbcType="VARCHAR" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_GKWXHWZYFZBL_FZ
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
+  <delete id="deleteByZyfzId" parameterType="java.lang.String" >
+    delete from AQ_GKWXHWZYFZBL_FZ
+    where ZYFZ_ID = #{zyfzId,jdbcType=VARCHAR}
+  </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.aqsp.model.WhxxModel" >
     insert into AQ_GKWXHWZYFZBL_FZ (ID, ZYCS, FZCSBH, 
-      QYNBBH, FZZY_ID, STATE, 
+      QYNBBH, ZYFZ_ID, STATE, 
       SFTB, TBZT, TBDYID, QYLB, 
       SSQY, ORG_CODE, FZHZ, 
       QYNBMC, JYR, WXHWM, 
       WXHWM_BZ, SZD, CREATE_USER, 
-      CREATE_TIME, UPDATE_USER, UPDATE_TIME
+      CREATE_TIME, UPDATE_USER, UPDATE_TIME, WHLX
       )
     values (#{id,jdbcType=VARCHAR}, #{zycs,jdbcType=VARCHAR}, #{fzcsbh,jdbcType=VARCHAR}, 
-      #{qynbbh,jdbcType=VARCHAR}, #{fzzyId,jdbcType=VARCHAR}, #{state,jdbcType=CHAR}, 
+      #{qynbbh,jdbcType=VARCHAR}, #{zyfzId,jdbcType=VARCHAR}, #{state,jdbcType=CHAR}, 
       #{sftb,jdbcType=CHAR}, #{tbzt,jdbcType=CHAR}, #{tbdyid,jdbcType=VARCHAR}, #{qylb,jdbcType=CHAR}, 
       #{ssqy,jdbcType=VARCHAR}, #{orgCode,jdbcType=VARCHAR}, #{fzhz,jdbcType=VARCHAR}, 
       #{qynbmc,jdbcType=VARCHAR}, #{jyr,jdbcType=VARCHAR}, #{wxhwm,jdbcType=VARCHAR}, 
       #{wxhwmBz,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
+      ,#{whlx,jdbcType=VARCHAR}
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.aqsp.model.WhxxModel" >
@@ -52,7 +58,7 @@
     set ZYCS = #{zycs,jdbcType=VARCHAR},
       FZCSBH = #{fzcsbh,jdbcType=VARCHAR},
       QYNBBH = #{qynbbh,jdbcType=VARCHAR},
-      FZZY_ID = #{fzzyId,jdbcType=VARCHAR},
+      ZYFZ_ID = #{zyfzId,jdbcType=VARCHAR},
       STATE = #{state,jdbcType=CHAR},
       SFTB = #{sftb,jdbcType=CHAR},
       TBZT = #{tbzt,jdbcType=CHAR},
@@ -69,30 +75,34 @@
       CREATE_USER = #{createUser,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      WHLX = #{whlx,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, ZYCS, FZCSBH, QYNBBH, FZZY_ID, STATE, SFTB, TBZT, TBDYID, QYLB, SSQY, 
+    select ID, ZYCS, FZCSBH, QYNBBH, ZYFZ_ID, STATE, SFTB, TBZT, TBDYID, QYLB, SSQY, 
     ORG_CODE, FZHZ, QYNBMC, JYR, WXHWM, WXHWM_BZ, SZD, CREATE_USER, CREATE_TIME, UPDATE_USER, 
-    UPDATE_TIME
+    UPDATE_TIME, WHLX
     from AQ_GKWXHWZYFZBL_FZ
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, ZYCS, FZCSBH, QYNBBH, FZZY_ID, STATE, SFTB, TBZT, TBDYID, QYLB, SSQY, 
+    select ID, ZYCS, FZCSBH, QYNBBH, ZYFZ_ID, STATE, SFTB, TBZT, TBDYID, QYLB, SSQY, 
     ORG_CODE, FZHZ, QYNBMC, JYR, WXHWM, WXHWM_BZ, SZD, CREATE_USER, CREATE_TIME, UPDATE_USER, 
-    UPDATE_TIME
+    UPDATE_TIME, WHLX
     from AQ_GKWXHWZYFZBL_FZ
   </select>
   <select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.aqsp.model.ZyfzModel" >
-		select ID, ZYCS, FZCSBH, QYNBBH, FZZY_ID, STATE, SFTB, TBZT, TBDYID, QYLB, SSQY, 
+		select ID, ZYCS, FZCSBH, QYNBBH, ZYFZ_ID, STATE, SFTB, TBZT, TBDYID, QYLB, SSQY, 
 	    ORG_CODE, FZHZ, QYNBMC, JYR, WXHWM, WXHWM_BZ, SZD, CREATE_USER, CREATE_TIME, UPDATE_USER, 
-	    UPDATE_TIME
+	    UPDATE_TIME, WHLX
 	    from AQ_GKWXHWZYFZBL_FZ
     	<where>
-		    <if test="fzzyId != null and fzzyId != ''">
-		        and FZZY_ID = #{fzzyId,jdbcType=VARCHAR}
+		    <if test="zyfzId != null and zyfzId != ''">
+		        and ZYFZ_ID = #{zyfzId,jdbcType=VARCHAR}
+		    </if>
+		    <if test="id != null and id != ''">
+		        and ID = #{id,jdbcType=VARCHAR}
 		    </if>
     	</where>
   	</select>

gkaqv2/trunk/modules/aqsp/src/main/resources/com/xt/js/gkaq/aqsp/mappers/WxhwsbModelMapper.xml

@@ -0,0 +1,234 @@
+<?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.aqsp.mappers.WxhwsbModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.aqsp.model.WxhwsbModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="ZYWTR" property="zywtr" jdbcType="VARCHAR" />
+    <result column="XCGLFZR" property="xcglfzr" jdbcType="VARCHAR" />
+    <result column="ADD_USER" property="addUser" jdbcType="VARCHAR" />
+    <result column="ADD_DATE" property="addDate" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="STATE" property="state" 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="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="BH" property="bh" jdbcType="VARCHAR" />
+    <result column="CM" property="cm" jdbcType="VARCHAR" />
+    <result column="WXPLB" property="wxplb" jdbcType="VARCHAR" />
+    <result column="WXWPMC" property="wxwpmc" jdbcType="VARCHAR" />
+    <result column="WPBH" property="wpbh" jdbcType="VARCHAR" />
+    <result column="JSPM" property="jspm" jdbcType="VARCHAR" />
+    <result column="ZYSL" property="zysl" jdbcType="DECIMAL" />
+    <result column="LHXZ" property="lhxz" jdbcType="VARCHAR" />
+    <result column="ZYSJ" property="zysj" jdbcType="TIMESTAMP" />
+    <result column="ZYDD" property="zydd" jdbcType="VARCHAR" />
+    <result column="AQFFCS" property="aqffcs" jdbcType="VARCHAR" />
+    <result column="BGR" property="bgr" jdbcType="VARCHAR" />
+    <result column="LXFS" property="lxfs" jdbcType="VARCHAR" />
+    <result column="BGSJ" property="bgsj" jdbcType="TIMESTAMP" />
+    <result column="ZYDDQYBH" property="zyddqybh" jdbcType="VARCHAR" />
+    <result column="KPSJ" property="kpsj" jdbcType="TIMESTAMP" />
+    <result column="ZYLX" property="zylx" jdbcType="VARCHAR" />
+    <result column="SG" property="sg" jdbcType="VARCHAR" />
+    <result column="XG" property="xg" jdbcType="VARCHAR" />
+    <result column="KGSJ" property="kgsj" jdbcType="TIMESTAMP" />
+    <result column="WGSJ" property="wgsj" jdbcType="TIMESTAMP" />
+    <result column="KGZT" property="kgzt" jdbcType="CHAR" />
+    <result column="WGZT" property="wgzt" jdbcType="CHAR" />
+    <result column="GJBH" property="gjbh" jdbcType="VARCHAR" />
+    <result column="ZYSJQ" property="zysjq" jdbcType="TIMESTAMP" />
+    <result column="ZYSJZ" property="zysjz" jdbcType="TIMESTAMP" />
+    <result column="QXZYSJ" property="qxzysj" jdbcType="TIMESTAMP" />
+    <result column="ZYDDQT" property="zyddqt" jdbcType="VARCHAR" />
+    <result column="WXHWMCBH" property="wxhwmcbh" jdbcType="VARCHAR" />
+    <result column="INOROUT" property="inorout" jdbcType="CHAR" />
+    <result column="MAO" property="mao" jdbcType="VARCHAR" />
+    <result column="JZXSL" property="jzxsl" jdbcType="VARCHAR" />
+    <result column="HWXS" property="hwxs" jdbcType="VARCHAR" />
+    <result column="HC" property="hc" jdbcType="VARCHAR" />
+    <result column="CBBH" property="cbbh" jdbcType="VARCHAR" />
+    <result column="MERGE" property="merge" jdbcType="VARCHAR" />
+    <result column="CNNO" property="cnno" jdbcType="VARCHAR" />
+    <result column="SL20C" property="sl20c" jdbcType="DECIMAL" />
+    <result column="SL40C" property="sl40c" jdbcType="DECIMAL" />
+    <result column="SL45C" property="sl45c" jdbcType="DECIMAL" />
+    <result column="SLSPC" property="slspc" jdbcType="DECIMAL" />
+    <result column="SL20T" property="sl20t" jdbcType="DECIMAL" />
+    <result column="SL40T" property="sl40t" jdbcType="DECIMAL" />
+    <result column="TEU" property="teu" jdbcType="DECIMAL" />
+    <result column="BZ" property="bz" jdbcType="VARCHAR" />
+    <result column="JZXXH" property="jzxxh" jdbcType="VARCHAR" />
+    <result column="START_WORK_REPORTER" property="startWorkReporter" jdbcType="VARCHAR" />
+    <result column="FINISH_WORK_REPORTER" property="finishWorkReporter" jdbcType="VARCHAR" />
+    <result column="ZYDW" property="zydw" jdbcType="VARCHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="VARCHAR" />
+    <result column="GQ" property="gq" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="SZGQ" property="szgq" jdbcType="VARCHAR" />
+    <result column="ZYDDSSJYR" property="zyddssjyr" 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="HWZL" property="hwzl" jdbcType="VARCHAR" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from AQ_WXHWGKZYSBD
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.aqsp.model.WxhwsbModel" >
+    insert into AQ_WXHWGKZYSBD (ID, ZYWTR, XCGLFZR, 
+      ADD_USER, ADD_DATE, UPDATE_USER, 
+      UPDATE_DATE, STATE, SFTB, 
+      TBZT, TBDYID, QYLB, RECORD_CODE, 
+      BYZD1, BYZD2, BYZD3, 
+      BYZD4, BYZD5, BH, CM, 
+      WXPLB, WXWPMC, WPBH, 
+      JSPM, ZYSL, LHXZ, ZYSJ, 
+      ZYDD, AQFFCS, BGR, 
+      LXFS, BGSJ, ZYDDQYBH, 
+      KPSJ, ZYLX, SG, XG, 
+      KGSJ, WGSJ, KGZT, 
+      WGZT, GJBH, ZYSJQ, ZYSJZ, 
+      QXZYSJ, ZYDDQT, WXHWMCBH, 
+      INOROUT, MAO, JZXSL, HWXS, 
+      HC, CBBH, MERGE, CNNO, 
+      SL20C, SL40C, SL45C, 
+      SLSPC, SL20T, SL40T, 
+      TEU, BZ, JZXXH, START_WORK_REPORTER, 
+      FINISH_WORK_REPORTER, ZYDW, SSQY, 
+      GQ, SZD, SZGQ, ZYDDSSJYR, 
+      HZWXX, DXDJ, WRLB, 
+      HWZL)
+    values (#{id,jdbcType=VARCHAR}, #{zywtr,jdbcType=VARCHAR}, #{xcglfzr,jdbcType=VARCHAR}, 
+      #{addUser,jdbcType=VARCHAR}, #{addDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=TIMESTAMP}, #{state,jdbcType=DECIMAL}, #{sftb,jdbcType=CHAR}, 
+      #{tbzt,jdbcType=CHAR}, #{tbdyid,jdbcType=DECIMAL}, #{qylb,jdbcType=CHAR}, #{recordCode,jdbcType=VARCHAR}, 
+      #{byzd1,jdbcType=VARCHAR}, #{byzd2,jdbcType=VARCHAR}, #{byzd3,jdbcType=VARCHAR}, 
+      #{byzd4,jdbcType=VARCHAR}, #{byzd5,jdbcType=VARCHAR}, #{bh,jdbcType=VARCHAR}, #{cm,jdbcType=VARCHAR}, 
+      #{wxplb,jdbcType=VARCHAR}, #{wxwpmc,jdbcType=VARCHAR}, #{wpbh,jdbcType=VARCHAR}, 
+      #{jspm,jdbcType=VARCHAR}, #{zysl,jdbcType=DECIMAL}, #{lhxz,jdbcType=VARCHAR}, #{zysj,jdbcType=TIMESTAMP}, 
+      #{zydd,jdbcType=VARCHAR}, #{aqffcs,jdbcType=VARCHAR}, #{bgr,jdbcType=VARCHAR}, 
+      #{lxfs,jdbcType=VARCHAR}, #{bgsj,jdbcType=TIMESTAMP}, #{zyddqybh,jdbcType=VARCHAR}, 
+      #{kpsj,jdbcType=TIMESTAMP}, #{zylx,jdbcType=VARCHAR}, #{sg,jdbcType=VARCHAR}, #{xg,jdbcType=VARCHAR}, 
+      #{kgsj,jdbcType=TIMESTAMP}, #{wgsj,jdbcType=TIMESTAMP}, #{kgzt,jdbcType=CHAR}, 
+      #{wgzt,jdbcType=CHAR}, #{gjbh,jdbcType=VARCHAR}, #{zysjq,jdbcType=TIMESTAMP}, #{zysjz,jdbcType=TIMESTAMP}, 
+      #{qxzysj,jdbcType=TIMESTAMP}, #{zyddqt,jdbcType=VARCHAR}, #{wxhwmcbh,jdbcType=VARCHAR}, 
+      #{inorout,jdbcType=CHAR}, #{mao,jdbcType=VARCHAR}, #{jzxsl,jdbcType=VARCHAR}, #{hwxs,jdbcType=VARCHAR}, 
+      #{hc,jdbcType=VARCHAR}, #{cbbh,jdbcType=VARCHAR}, #{merge,jdbcType=VARCHAR}, #{cnno,jdbcType=VARCHAR}, 
+      #{sl20c,jdbcType=DECIMAL}, #{sl40c,jdbcType=DECIMAL}, #{sl45c,jdbcType=DECIMAL}, 
+      #{slspc,jdbcType=DECIMAL}, #{sl20t,jdbcType=DECIMAL}, #{sl40t,jdbcType=DECIMAL}, 
+      #{teu,jdbcType=DECIMAL}, #{bz,jdbcType=VARCHAR}, #{jzxxh,jdbcType=VARCHAR}, #{startWorkReporter,jdbcType=VARCHAR}, 
+      #{finishWorkReporter,jdbcType=VARCHAR}, #{zydw,jdbcType=VARCHAR}, #{ssqy,jdbcType=VARCHAR}, 
+      #{gq,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, #{szgq,jdbcType=VARCHAR}, #{zyddssjyr,jdbcType=VARCHAR}, 
+      #{hzwxx,jdbcType=VARCHAR}, #{dxdj,jdbcType=VARCHAR}, #{wrlb,jdbcType=VARCHAR}, 
+      #{hwzl,jdbcType=VARCHAR})
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.aqsp.model.WxhwsbModel" >
+    update AQ_WXHWGKZYSBD
+    set ZYWTR = #{zywtr,jdbcType=VARCHAR},
+      XCGLFZR = #{xcglfzr,jdbcType=VARCHAR},
+      ADD_USER = #{addUser,jdbcType=VARCHAR},
+      ADD_DATE = #{addDate,jdbcType=TIMESTAMP},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=TIMESTAMP},
+      STATE = #{state,jdbcType=DECIMAL},
+      SFTB = #{sftb,jdbcType=CHAR},
+      TBZT = #{tbzt,jdbcType=CHAR},
+      TBDYID = #{tbdyid,jdbcType=DECIMAL},
+      QYLB = #{qylb,jdbcType=CHAR},
+      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},
+      BH = #{bh,jdbcType=VARCHAR},
+      CM = #{cm,jdbcType=VARCHAR},
+      WXPLB = #{wxplb,jdbcType=VARCHAR},
+      WXWPMC = #{wxwpmc,jdbcType=VARCHAR},
+      WPBH = #{wpbh,jdbcType=VARCHAR},
+      JSPM = #{jspm,jdbcType=VARCHAR},
+      ZYSL = #{zysl,jdbcType=DECIMAL},
+      LHXZ = #{lhxz,jdbcType=VARCHAR},
+      ZYSJ = #{zysj,jdbcType=TIMESTAMP},
+      ZYDD = #{zydd,jdbcType=VARCHAR},
+      AQFFCS = #{aqffcs,jdbcType=VARCHAR},
+      BGR = #{bgr,jdbcType=VARCHAR},
+      LXFS = #{lxfs,jdbcType=VARCHAR},
+      BGSJ = #{bgsj,jdbcType=TIMESTAMP},
+      ZYDDQYBH = #{zyddqybh,jdbcType=VARCHAR},
+      KPSJ = #{kpsj,jdbcType=TIMESTAMP},
+      ZYLX = #{zylx,jdbcType=VARCHAR},
+      SG = #{sg,jdbcType=VARCHAR},
+      XG = #{xg,jdbcType=VARCHAR},
+      KGSJ = #{kgsj,jdbcType=TIMESTAMP},
+      WGSJ = #{wgsj,jdbcType=TIMESTAMP},
+      KGZT = #{kgzt,jdbcType=CHAR},
+      WGZT = #{wgzt,jdbcType=CHAR},
+      GJBH = #{gjbh,jdbcType=VARCHAR},
+      ZYSJQ = #{zysjq,jdbcType=TIMESTAMP},
+      ZYSJZ = #{zysjz,jdbcType=TIMESTAMP},
+      QXZYSJ = #{qxzysj,jdbcType=TIMESTAMP},
+      ZYDDQT = #{zyddqt,jdbcType=VARCHAR},
+      WXHWMCBH = #{wxhwmcbh,jdbcType=VARCHAR},
+      INOROUT = #{inorout,jdbcType=CHAR},
+      MAO = #{mao,jdbcType=VARCHAR},
+      JZXSL = #{jzxsl,jdbcType=VARCHAR},
+      HWXS = #{hwxs,jdbcType=VARCHAR},
+      HC = #{hc,jdbcType=VARCHAR},
+      CBBH = #{cbbh,jdbcType=VARCHAR},
+      MERGE = #{merge,jdbcType=VARCHAR},
+      CNNO = #{cnno,jdbcType=VARCHAR},
+      SL20C = #{sl20c,jdbcType=DECIMAL},
+      SL40C = #{sl40c,jdbcType=DECIMAL},
+      SL45C = #{sl45c,jdbcType=DECIMAL},
+      SLSPC = #{slspc,jdbcType=DECIMAL},
+      SL20T = #{sl20t,jdbcType=DECIMAL},
+      SL40T = #{sl40t,jdbcType=DECIMAL},
+      TEU = #{teu,jdbcType=DECIMAL},
+      BZ = #{bz,jdbcType=VARCHAR},
+      JZXXH = #{jzxxh,jdbcType=VARCHAR},
+      START_WORK_REPORTER = #{startWorkReporter,jdbcType=VARCHAR},
+      FINISH_WORK_REPORTER = #{finishWorkReporter,jdbcType=VARCHAR},
+      ZYDW = #{zydw,jdbcType=VARCHAR},
+      SSQY = #{ssqy,jdbcType=VARCHAR},
+      GQ = #{gq,jdbcType=VARCHAR},
+      SZD = #{szd,jdbcType=VARCHAR},
+      SZGQ = #{szgq,jdbcType=VARCHAR},
+      ZYDDSSJYR = #{zyddssjyr,jdbcType=VARCHAR},
+      HZWXX = #{hzwxx,jdbcType=VARCHAR},
+      DXDJ = #{dxdj,jdbcType=VARCHAR},
+      WRLB = #{wrlb,jdbcType=VARCHAR},
+      HWZL = #{hwzl,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, ZYWTR, XCGLFZR, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE, STATE, SFTB, 
+    TBZT, TBDYID, QYLB, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5, BH, CM, WXPLB, 
+    WXWPMC, WPBH, JSPM, ZYSL, LHXZ, ZYSJ, ZYDD, AQFFCS, BGR, LXFS, BGSJ, ZYDDQYBH, KPSJ, 
+    ZYLX, SG, XG, KGSJ, WGSJ, KGZT, WGZT, GJBH, ZYSJQ, ZYSJZ, QXZYSJ, ZYDDQT, WXHWMCBH, 
+    INOROUT, MAO, JZXSL, HWXS, HC, CBBH, MERGE, CNNO, SL20C, SL40C, SL45C, SLSPC, SL20T, 
+    SL40T, TEU, BZ, JZXXH, START_WORK_REPORTER, FINISH_WORK_REPORTER, ZYDW, SSQY, GQ, 
+    SZD, SZGQ, ZYDDSSJYR, HZWXX, DXDJ, WRLB, HWZL
+    from AQ_WXHWGKZYSBD
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+    select ID, ZYWTR, XCGLFZR, ADD_USER, ADD_DATE, UPDATE_USER, UPDATE_DATE, STATE, SFTB, 
+    TBZT, TBDYID, QYLB, RECORD_CODE, BYZD1, BYZD2, BYZD3, BYZD4, BYZD5, BH, CM, WXPLB, 
+    WXWPMC, WPBH, JSPM, ZYSL, LHXZ, ZYSJ, ZYDD, AQFFCS, BGR, LXFS, BGSJ, ZYDDQYBH, KPSJ, 
+    ZYLX, SG, XG, KGSJ, WGSJ, KGZT, WGZT, GJBH, ZYSJQ, ZYSJZ, QXZYSJ, ZYDDQT, WXHWMCBH, 
+    INOROUT, MAO, JZXSL, HWXS, HC, CBBH, MERGE, CNNO, SL20C, SL40C, SL45C, SLSPC, SL20T, 
+    SL40T, TEU, BZ, JZXXH, START_WORK_REPORTER, FINISH_WORK_REPORTER, ZYDW, SSQY, GQ, 
+    SZD, SZGQ, ZYDDSSJYR, HZWXX, DXDJ, WRLB, HWZL
+    from AQ_WXHWGKZYSBD
+  </select>
+</mapper>

gkaqv2/trunk/modules/aqsp/src/main/resources/generatorConfig.xml

@@ -7,7 +7,7 @@
 		<commentGenerator>
 			<property name="suppressAllComments" value="true" />
 		</commentGenerator>
-		<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver" connectionURL="jdbc:oracle:thin:@192.168.57.36:1521:orcl" userId="gkaqv2" password="gkaq">
+		<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver" connectionURL="jdbc:oracle:thin:@172.16.50.184:1521:orcl" userId="gkaqv2" password="gkaq">
 		</jdbcConnection>
 		<javaTypeResolver>
 			<property name="forceBigDecimals" value="false" />
@@ -23,7 +23,7 @@
 			targetPackage="com.xt.js.gkaq.aqsp.mappers" targetProject="src/main/java">
 			<property name="enableSubPackages" value="true" />
 		</javaClientGenerator>
-		<table tableName="AQ_GKWXHWZYFZBL_FZ" domainObjectName="WhxxModel">
+		<table tableName="AQ_GLZD" domainObjectName="GlzdModel">
 		</table>
 	</context>
 </generatorConfiguration>

gkaqv2/trunk/modules/bom/pom.xml

@@ -191,6 +191,11 @@
 			</dependency>
 			<dependency>
 				<groupId>com.xt.js.gkaq</groupId>
+				<artifactId>gkaq-zcdc</artifactId>
+				<version>0.0.1-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>com.xt.js.gkaq</groupId>
 				<artifactId>gkaq-frame</artifactId>
 				<version>0.0.1-SNAPSHOT</version>
 			</dependency>

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

@@ -41,6 +41,16 @@ public abstract class BaseUUIDModel implements Serializable {
     /** ¼Ç¼״̬ */
     private String updateUser;
 
+    private String byzd1;
+
+    private String byzd2;
+
+    private String byzd3;
+
+    private String byzd4;
+
+    private String byzd5;
+
 	public String getCreateUser() {
         return createUser;
     }
@@ -129,4 +139,45 @@ public abstract class BaseUUIDModel implements Serializable {
 	public final void setId(String id) {
 		this.id = id;
 	}
+	
+
+    public String getByzd1() {
+        return byzd1;
+    }
+
+    public void setByzd1(String byzd1) {
+        this.byzd1 = byzd1 == null ? null : byzd1.trim();
+    }
+
+    public String getByzd2() {
+        return byzd2;
+    }
+
+    public void setByzd2(String byzd2) {
+        this.byzd2 = byzd2 == null ? null : byzd2.trim();
+    }
+
+    public String getByzd3() {
+        return byzd3;
+    }
+
+    public void setByzd3(String byzd3) {
+        this.byzd3 = byzd3 == null ? null : byzd3.trim();
+    }
+
+    public String getByzd4() {
+        return byzd4;
+    }
+
+    public void setByzd4(String byzd4) {
+        this.byzd4 = byzd4 == null ? null : byzd4.trim();
+    }
+
+    public String getByzd5() {
+        return byzd5;
+    }
+
+    public void setByzd5(String byzd5) {
+        this.byzd5 = byzd5 == null ? null : byzd5.trim();
+    }
 }

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

@@ -912,10 +912,18 @@ public class Constants {
     public static final String LEAF_BTN = "B";
 
     /**
-     * 行政区划：江苏
+     * 行政区划：江苏省全部市县
      */
     public static final String XZQH_JS = "32";
     /**
+     * 行政区划：江苏前4位模糊查询
+     */
+    public static final String XZQH_JS4 = "3200%";
+    /**
+     * 行政区划：江苏省市级
+     */
+    public static final String XZQH_JSS = "32%00";
+    /**
      * 用户类型：超级管理员
      */
     public static final String USER_TYPE_SA = "0";

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

@@ -5,7 +5,12 @@ import java.util.List;
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.dwxx.model.BwInfoModel;
 import com.xt.js.gkaq.dwxx.model.BwModel;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
 
 public interface BwModelMapper extends BaseMapper<BwModel> {
 	public List<BwInfoModel> selectByInfo(BwModel model);
+	
+	public List<ComboBoxDto> selectMtCom (String jyr);
+	
+	public BwInfoModel selectGetEdit (BwModel model);
 }

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

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

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

@@ -7,4 +7,6 @@ import com.xt.js.gkaq.dwxx.model.DcModel;
 
 public interface DcModelMapper extends BaseMapper<DcModel> {
 	public List<DcModel> selectByInfo(DcModel model);
+	
+	public DcModel selectGetEditDc(DcModel model);
 }

gkaqv2/trunk/modules/dwxx/src/main/java/com/xt/js/gkaq/dwxx/mappers/JyrjcxxModelMapper.java

@@ -16,4 +16,5 @@ public interface JyrjcxxModelMapper extends BaseMapper<JyrjcxxModel> {
 	
 	public List<JyrInfoExcelModel> selectExcelList(JyrjcxxModel model);
 	public List<ComboBoxDto> getSelect (JyrjcxxModel model);
+	public List<ComboBoxDto> getHyzl (ComboBoxDto combo);
 }

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

@@ -14,7 +14,8 @@ public class BwInfoModel extends BaseUUIDModel {
 	private static final long serialVersionUID = 1856022900011957047L;
 	private String szd;//所在地
 	private String szgq;//所在港区
-	private String qymc;//经营人名称（id）
+	private String ssjyr;//经营人id
+	private String qymc;//经营人名称
 	private String mtmc;//码头名称(id)
 	private String mtName;//码头名称
 	private String bwmc;//泊位名称
@@ -56,6 +57,14 @@ public class BwInfoModel extends BaseUUIDModel {
 	private String smid;//地图id
 	private String bwdm;//
 	private String jgxs2;
+	
+	
+	public String getQymc() {
+		return qymc;
+	}
+	public void setQymc(String qymc) {
+		this.qymc = qymc;
+	}
 	public String getSzd() {
 		return szd;
 	}
@@ -68,11 +77,12 @@ public class BwInfoModel extends BaseUUIDModel {
 	public void setSzgq(String szgq) {
 		this.szgq = szgq;
 	}
-	public String getQymc() {
-		return qymc;
+	
+	public String getSsjyr() {
+		return ssjyr;
 	}
-	public void setQymc(String qymc) {
-		this.qymc = qymc;
+	public void setSsjyr(String ssjyr) {
+		this.ssjyr = ssjyr;
 	}
 	public String getMtmc() {
 		return mtmc;

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

@@ -14,7 +14,7 @@ public class BwModel extends BaseUUIDModel {
 	private static final long serialVersionUID = 1856022900011957047L;
 	private String szd;//所在地
 	private String szgq;//所在港区
-	private String qymc;//经营人名称（id）
+	private String ssjyr;//经营人名称（id）
 	private String mtmc;//码头名称(id)
 	private String bwmc;//泊位名称
 	private String bwsx;//泊位属性
@@ -67,11 +67,12 @@ public class BwModel extends BaseUUIDModel {
 	public void setSzgq(String szgq) {
 		this.szgq = szgq;
 	}
-	public String getQymc() {
-		return qymc;
+	
+	public String getSsjyr() {
+		return ssjyr;
 	}
-	public void setQymc(String qymc) {
-		this.qymc = qymc;
+	public void setSsjyr(String ssjyr) {
+		this.ssjyr = ssjyr;
 	}
 	public String getMtmc() {
 		return mtmc;

gkaqv2/trunk/modules/dwxx/src/main/java/com/xt/js/gkaq/dwxx/model/CkInfoModel.java

@@ -0,0 +1,246 @@
+package com.xt.js.gkaq.dwxx.model;
+
+/**
+ * 仓库Model
+ * @author 李小虎
+ *
+ */
+public class CkInfoModel {
+
+	private String id;
+	private String ssjyr;//所属经营人
+	private String szd;//所在地
+	private String gq;//港区
+	private String 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 String gisid;//交通局GIS对应id号
+	private String jd;//经度
+	private String wd;//纬度
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private String ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String zwckyt;//仓库用途显示
+	
+	private Long ckmj;//仓库面积
+	private Long ckrj;//仓库容积
+	
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public Long getCkmj() {
+		return ckmj;
+	}
+	public void setCkmj(Long ckmj) {
+		this.ckmj = ckmj;
+	}
+	public Long getCkrj() {
+		return ckrj;
+	}
+	public void setCkrj(Long ckrj) {
+		this.ckrj = ckrj;
+	}
+	public String getSsjyr() {
+		return ssjyr;
+	}
+	public void setSsjyr(String ssjyr) {
+		this.ssjyr = ssjyr;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getGq() {
+		return gq;
+	}
+	public void setGq(String gq) {
+		this.gq = gq;
+	}
+	public String getMt() {
+		return mt;
+	}
+	public void setMt(String 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 String getGisid() {
+		return gisid;
+	}
+	public void setGisid(String gisid) {
+		this.gisid = gisid;
+	}
+	public String getJd() {
+		return jd;
+	}
+	public void setJd(String jd) {
+		this.jd = jd;
+	}
+	public String getWd() {
+		return wd;
+	}
+	public void setWd(String wd) {
+		this.wd = wd;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public String getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(String 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/dwxx/src/main/java/com/xt/js/gkaq/dwxx/model/CkModel.java

@@ -16,7 +16,6 @@ public class CkModel extends BaseUUIDModel {
 	private String szd;//所在地
 	private String gq;//港区
 	private String mt;//码头
-	private String qymc;//企业名称
 	private String ckmc;//仓库名称
 	private String wxpck;//危险品仓库
 	private String ckyt;//仓库用途
@@ -42,6 +41,23 @@ public class CkModel extends BaseUUIDModel {
 	private String byzd4;
 	private String byzd5;
 	private String zwckyt;//仓库用途显示
+	
+	private Long ckmj;//仓库面积
+	private Long ckrj;//仓库容积
+	
+	
+	public Long getCkmj() {
+		return ckmj;
+	}
+	public void setCkmj(Long ckmj) {
+		this.ckmj = ckmj;
+	}
+	public Long getCkrj() {
+		return ckrj;
+	}
+	public void setCkrj(Long ckrj) {
+		this.ckrj = ckrj;
+	}
 	public String getSsjyr() {
 		return ssjyr;
 	}
@@ -66,12 +82,6 @@ public class CkModel extends BaseUUIDModel {
 	public void setMt(String mt) {
 		this.mt = mt;
 	}
-	public String getQymc() {
-		return qymc;
-	}
-	public void setQymc(String qymc) {
-		this.qymc = qymc;
-	}
 	public String getCkmc() {
 		return ckmc;
 	}

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

@@ -14,7 +14,8 @@ public class DcModel extends BaseUUIDModel {
 	private static final long serialVersionUID = 5402972991830338558L;
 	private String szd;//所在地
 	private String szgq;//所在港区
-	private String qymc;//企业名称
+	private String qymc;//经营人名称
+	private String ssjyr;//所属经营人
 	private String mtmc;//码头名称
 	private String dcmc;//堆场名称
 	private String scydcyt;//堆场用途
@@ -42,6 +43,14 @@ public class DcModel extends BaseUUIDModel {
 	private String byzd4;
 	private String byzd5;
 	private String zwdcyt;//堆场用途显示
+	
+	
+	public String getSsjyr() {
+		return ssjyr;
+	}
+	public void setSsjyr(String ssjyr) {
+		this.ssjyr = ssjyr;
+	}
 	public String getSzd() {
 		return szd;
 	}

gkaqv2/trunk/modules/dwxx/src/main/java/com/xt/js/gkaq/dwxx/model/JyrjcxxInfol.java

@@ -120,8 +120,55 @@ public class JyrjcxxInfol extends JyrjcxxModel {
     private String parentJyrId;
 
     private String xzqh;
+   
+    private String qyxzmc;
+    private Date zdspsjq;
+    private Date zdspsjz;
+    private String dawxynum;
+    private String zjhm;
+    
+    
+    public String getQyxzmc() {
+		return qyxzmc;
+	}
+
+	public void setQyxzmc(String qyxzmc) {
+		this.qyxzmc = qyxzmc;
+	}
+
+	public Date getZdspsjq() {
+		return zdspsjq;
+	}
+
+	public void setZdspsjq(Date zdspsjq) {
+		this.zdspsjq = zdspsjq;
+	}
+
+	public Date getZdspsjz() {
+		return zdspsjz;
+	}
+
+	public void setZdspsjz(Date zdspsjz) {
+		this.zdspsjz = zdspsjz;
+	}
+
+	public String getDawxynum() {
+		return dawxynum;
+	}
+
+	public void setDawxynum(String dawxynum) {
+		this.dawxynum = dawxynum;
+	}
+
+	public String getZjhm() {
+		return zjhm;
+	}
+
+	public void setZjhm(String zjhm) {
+		this.zjhm = zjhm;
+	}
 
-    public String getSzd() {
+	public String getSzd() {
         return szd;
     }
 

gkaqv2/trunk/modules/dwxx/src/main/java/com/xt/js/gkaq/dwxx/model/JyrjcxxModel.java

@@ -113,8 +113,23 @@ public class JyrjcxxModel extends BaseUUIDModel {
     private String parentJyrId;
 
     private String xzqh;
-
-    public String getSzd() {
+    
+    private String qyxzmc;
+    private Date zdspsjq;
+    private Date zdspsjz;
+    private String dawxynum;
+    private String zjhm;
+    
+
+    public String getZjhm() {
+		return zjhm;
+	}
+
+	public void setZjhm(String zjhm) {
+		this.zjhm = zjhm;
+	}
+
+	public String getSzd() {
         return szd;
     }
 
@@ -537,4 +552,37 @@ public class JyrjcxxModel extends BaseUUIDModel {
     public void setXzqh(String xzqh) {
         this.xzqh = xzqh;
     }
+
+	public String getQyxzmc() {
+		return qyxzmc;
+	}
+
+	public void setQyxzmc(String qyxzmc) {
+		this.qyxzmc = qyxzmc;
+	}
+
+	public Date getZdspsjq() {
+		return zdspsjq;
+	}
+
+	public void setZdspsjq(Date zdspsjq) {
+		this.zdspsjq = zdspsjq;
+	}
+
+	public Date getZdspsjz() {
+		return zdspsjz;
+	}
+
+	public void setZdspsjz(Date zdspsjz) {
+		this.zdspsjz = zdspsjz;
+	}
+
+	public String getDawxynum() {
+		return dawxynum;
+	}
+
+	public void setDawxynum(String dawxynum) {
+		this.dawxynum = dawxynum;
+	}
+    
 }

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

@@ -5,7 +5,15 @@ import java.util.List;
 import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.dwxx.model.BwInfoModel;
 import com.xt.js.gkaq.dwxx.model.BwModel;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
 
 public interface BwService extends BaseUUIDModelService<BwModel> {
 	public List<BwInfoModel> selectInfo (BwModel model);
+	
+	public BwInfoModel selectGetEdit (BwModel model);
+	/**
+	 * ÂëÍ·ÏÂÀ­¿òÐÅÏ¢
+	 * @return
+	 */
+	public List<ComboBoxDto> selectMtCom (String jyr);
 }

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

@@ -3,8 +3,10 @@ package com.xt.js.gkaq.dwxx.service;
 import java.util.List;
 
 import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.dwxx.model.CkInfoModel;
 import com.xt.js.gkaq.dwxx.model.CkModel;
 
 public interface CkService extends BaseUUIDModelService<CkModel> {
 	public List<CkModel> selectInfo (CkModel model);
+	public CkInfoModel selectGetEdit(CkInfoModel model);
 }

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

@@ -7,4 +7,6 @@ import com.xt.js.gkaq.dwxx.model.DcModel;
 
 public interface DcService extends BaseUUIDModelService<DcModel> {
 	public List<DcModel> selectInfo (DcModel model);
+	
+	public DcModel selectGetEditDc(DcModel model);
 }

gkaqv2/trunk/modules/dwxx/src/main/java/com/xt/js/gkaq/dwxx/service/JyrjcxxService.java

@@ -16,4 +16,5 @@ public interface JyrjcxxService extends BaseUUIDModelService<JyrjcxxModel> {
 	public List<JyrInfoExcelModel> selectExcelList(JyrjcxxModel model);
 	
 	public List<ComboBoxDto> getSelect (JyrjcxxModel model);
+	public List<ComboBoxDto> getHyzl (ComboBoxDto combo);
 }

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

@@ -10,6 +10,7 @@ import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.dwxx.mappers.BwModelMapper;
 import com.xt.js.gkaq.dwxx.model.BwInfoModel;
 import com.xt.js.gkaq.dwxx.model.BwModel;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
 import com.xt.js.gkaq.dwxx.service.BwService;
 
 @Service
@@ -25,6 +26,16 @@ public class BwServiceImpl extends BaseUUIDModelServiceImpl<BwModel> implements
 	public List<BwInfoModel> selectInfo(BwModel model) {
 		return mapper.selectByInfo(model);
 	}
+	/**
+	 * ÂëÍ·ÏÂÀ­¿òÐÅÏ¢
+	 */
+	public List<ComboBoxDto> selectMtCom(String jyr) {
+		return mapper.selectMtCom(jyr);
+	}
+
+	public BwInfoModel selectGetEdit(BwModel model) {
+		return mapper.selectGetEdit(model);
+	}
 
 	
    

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

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.dwxx.mappers.CkModelMapper;
+import com.xt.js.gkaq.dwxx.model.CkInfoModel;
 import com.xt.js.gkaq.dwxx.model.CkModel;
 import com.xt.js.gkaq.dwxx.service.CkService;
 
@@ -25,6 +26,10 @@ public class CkServiceImpl extends BaseUUIDModelServiceImpl<CkModel> implements
 		return mapper.selectByInfo(model);
 	}
 
+	public CkInfoModel selectGetEdit(CkInfoModel model) {
+		return mapper.selectGetEdit(model);
+	}
+
 	
    
 }

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

@@ -25,6 +25,10 @@ public class DcServiceImpl extends BaseUUIDModelServiceImpl<DcModel> implements
 		return mapper.selectByInfo(model);
 	}
 
+	public DcModel selectGetEditDc(DcModel model) {
+		return mapper.selectGetEditDc(model);
+	}
+
 	
    
 }

gkaqv2/trunk/modules/dwxx/src/main/java/com/xt/js/gkaq/dwxx/service/impl/JyrjcxxServiceImpl.java

@@ -43,4 +43,8 @@ public class JyrjcxxServiceImpl extends BaseUUIDModelServiceImpl<JyrjcxxModel> i
 		return list;
 	}
 
+	public List<ComboBoxDto> getHyzl(ComboBoxDto combo) {
+		return mapper.getHyzl(combo);
+	}
+
 }

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

@@ -5,7 +5,7 @@
     <id column="ID" property="id" jdbcType="DECIMAL" />
     <result column="SZD" property="szd" jdbcType="VARCHAR" />
     <result column="SZGQ" property="szgq" jdbcType="VARCHAR" />
-    <result column="QYMC" property="qymc" jdbcType="VARCHAR" />
+    <result column="SSJYR" property="ssjyr" jdbcType="VARCHAR" />
     <result column="MTMC" property="mtmc" jdbcType="VARCHAR" />
     <result column="BWMC" property="bwmc" jdbcType="VARCHAR" />
     <result column="BWSX" property="bwsx" jdbcType="VARCHAR" />
@@ -57,6 +57,7 @@
     <id column="ID" property="id" jdbcType="DECIMAL" />
     <result column="SZD" property="szd" jdbcType="VARCHAR" />
     <result column="SZGQ" property="szgq" jdbcType="VARCHAR" />
+    <result column="SSJYR" property="ssjyr" jdbcType="VARCHAR" />
     <result column="QYMC" property="qymc" jdbcType="VARCHAR" />
     <result column="MTMC" property="mtmc" jdbcType="VARCHAR" />
     <result column="MTNAME" property="mtName" jdbcType="VARCHAR" />
@@ -107,18 +108,23 @@
   </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>
   
+  <resultMap id="MtComboBoxMap" type="com.xt.js.gkaq.dwxx.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="VARCHAR" />
+    <result column="MTMC" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
+  
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_DWXX_BW
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.dwxx.model.BwModel" >
-    insert into AQ_DWXX_BW (ID,SZD,SZGQ,QYMC,MTMC,BWMC,BWSX,BWSZSX,FWLX,TCNF,JGXS,SCLX,JGYSNF,
+    insert into AQ_DWXX_BW (ID,SZD,SZGQ,SSJYR,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,
@@ -127,7 +133,7 @@
     values (#{id,jdbcType=VARCHAR},
     		#{szd,jdbcType=VARCHAR}, 
      		#{szgq,jdbcType=VARCHAR},
-     		#{qymc,jdbcType=VARCHAR}, 
+     		#{ssjyr,jdbcType=VARCHAR}, 
      		#{mtmc,jdbcType=VARCHAR}, 
      		#{bwmc,jdbcType=VARCHAR}, 
      		#{bwsx,jdbcType=VARCHAR}, 
@@ -179,7 +185,7 @@
     update AQ_DWXX_BW
     set SZD = #{szd,jdbcType=VARCHAR},
       	SZGQ = #{szgq,jdbcType=VARCHAR},
-		QYMC = #{qymc,jdbcType=VARCHAR}, 
+		SSJYR = #{ssjyr,jdbcType=VARCHAR}, 
 		MTMC = #{mtmc,jdbcType=VARCHAR}, 
 		BWMC = #{bwmc,jdbcType=VARCHAR}, 
 		BWSX = #{bwsx,jdbcType=VARCHAR}, 
@@ -228,7 +234,7 @@
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-   SELECT ID,SZD,SZGQ,QYMC,MTMC,BWMC,BWSX,BWSZSX,FWLX,TCNF,JGXS,SCLX,JGYSNF,QYSJSH,QYSJSS,BWCD,
+   SELECT ID,SZD,SZGQ,SSJYR,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,
@@ -238,7 +244,7 @@
 	WHERE ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-     SELECT ID,SZD,SZGQ,QYMC,MTMC,BWMC,BWSX,BWSZSX,FWLX,TCNF,JGXS,SCLX,JGYSNF,QYSJSH,QYSJSS,BWCD,
+     SELECT ID,SZD,SZGQ,SSJYR,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,
@@ -247,7 +253,7 @@
 		GKAQV2.AQ_DWXX_BW
   </select>
   <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.dwxx.model.BwModel">
-	  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,
+	  SELECT B.ID, B.SZD, B.SZGQ, B.SSJYR, 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
@@ -258,29 +264,28 @@
 			<if test="id != null and id != '' ">
 				AND B.ID = #{id,jdbcType=VARCHAR}
 			</if>
-			<if test="qymc != null and qymc != '' ">
-				AND B.QYMC = #{qymc,jdbcType=VARCHAR}
+			<if test="ssjyr != null and ssjyr != '' ">
+				AND B.SSJYR = #{ssjyr,jdbcType=VARCHAR}
 			</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
+  <select id="selectGetEdit" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.dwxx.model.BwModel">
+	  SELECT B.ID, B.SZD, B.SZGQ, B.SSJYR, B.MTMC, 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,
+			 J.GKJYR AS QYMC
+	  FROM GKAQV2.AQ_DWXX_BW B
+	 LEFT JOIN AQ_DWXX_JYRJCXX J ON J."ID" = B.SSJYR
 	<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> -->
+			B.RECORD_STATUS != '9'
+			AND B.ID = #{id,jdbcType=VARCHAR}
+			
+	</where>
+  </select>
+  <select id="selectMtCom" resultMap="MtComboBoxMap" parameterType="java.lang.String">
+  		SELECT ID, MTMC FROM AQ_DWXX_GQ_MT WHERE RECORD_STATUS != 9 AND JYR IS NULL OR  JYR = #{jyr,jdbcType=VARCHAR}
+  </select>
   
 </mapper>

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

@@ -8,11 +8,56 @@
     <result column="GQ" property="gq" jdbcType="VARCHAR" />
     <result column="MT" property="mt" jdbcType="VARCHAR" />
     
-    <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="CKMJ" property="ckmj" jdbcType="DECIMAL" />
+    <result column="CKRJ" property="ckrj" jdbcType="DECIMAL" />
+    <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="VARCHAR" />
+    
+    <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="VARCHAR" />
+    <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="BaseResultCkInfoMap" type="com.xt.js.gkaq.dwxx.model.CkInfoModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="SSJYR" property="ssjyr" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="GQ" property="gq" jdbcType="VARCHAR" />
+    <result column="MT" property="mt" jdbcType="VARCHAR" />
+    
+    <result column="CKMC" property="ckmc" jdbcType="VARCHAR" />
+    <result column="QYMC" property="qymc" jdbcType="VARCHAR" />
+    <result column="WXPCK" property="wxpck" jdbcType="VARCHAR" />
+    <result column="CKYT" property="ckyt" jdbcType="VARCHAR" />
+    
+    <result column="CKMJ" property="ckmj" jdbcType="DECIMAL" />
+    <result column="CKRJ" property="ckrj" jdbcType="DECIMAL" />
     <result column="CKGS" property="ckgs" jdbcType="DECIMAL" />
     <result column="YTHGCGRJ" property="ythgcgrj" jdbcType="DECIMAL" />
     <result column="SCYCKMJ" property="scyckmj" jdbcType="DECIMAL" />
@@ -43,7 +88,6 @@
     <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="VARCHAR" />
     <result column="GQMC" property="optName" jdbcType="VARCHAR" />
@@ -54,17 +98,17 @@
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.dwxx.model.CkModel" >
-    insert into AQ_DWXX_CK (ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+    insert into AQ_DWXX_CK (ID,SSJYR,SZD,GQ,MT,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)
+									BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT,CKMJ,CKRJ)
     values (#{id,jdbcType=VARCHAR},
     		#{ssjyr,jdbcType=VARCHAR},
     		#{szd,jdbcType=VARCHAR}, 
      		#{gq,jdbcType=VARCHAR}, 
      		#{mt,jdbcType=VARCHAR}, 
-     		#{qymc,jdbcType=VARCHAR}, 
+     		
      		#{ckmc,jdbcType=DECIMAL}, 
      		#{wxpck,jdbcType=DECIMAL}, 
      		#{ckyt,jdbcType=DECIMAL}, 
@@ -96,7 +140,8 @@
      		#{byzd4,jdbcType=VARCHAR}, 
      		#{byzd5,jdbcType=VARCHAR},
      		#{zwckyt,jdbcType=VARCHAR}, 
-     	
+     		#{ckmj,jdbcType=DECIMAL}, 
+     		#{ckrj,jdbcType=DECIMAL}
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.dwxx.model.CkModel" >
@@ -105,7 +150,6 @@
     	SZD = #{szd,jdbcType=VARCHAR}, 
       	GQ = #{gq,jdbcType=VARCHAR}, 
 		MT = #{mt,jdbcType=VARCHAR}, 
-		QYMC = #{qymc,jdbcType=VARCHAR}, 
 		CKMC = #{ckmc,jdbcType=DECIMAL}, 
 		WXPCK = #{wxpck,jdbcType=DECIMAL}, 
 		CKYT = #{ckyt,jdbcType=DECIMAL}, 
@@ -137,37 +181,38 @@
 		BYZD4 = #{byzd4,jdbcType=VARCHAR}, 
 		BYZD5 = #{byzd5,jdbcType=VARCHAR},
 		ZWCKYT = #{zwckyt,jdbcType=VARCHAR}, 
-	
+		CKMJ = #{ckmj,jdbcType=DECIMAL}, 
+		CKRJ = #{ckrj,jdbcType=DECIMAL}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
    SELECT 
-		ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+		ID,SSJYR,SZD,GQ,MT,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
+		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT,CKMJ,CKRJ
 	FROM
 		AQ_DWXX_CK
 	WHERE ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
      SELECT 
-		ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+		ID,SSJYR,SZD,GQ,MT,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
+		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT,CKMJ,CKRJ
 	FROM
 		AQ_DWXX_CK
   </select>
   <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.dwxx.model.CkModel">
 	 SELECT 
-		ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+		ID,SSJYR,SZD,GQ,MT,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
+		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT,CKMJ,CKRJ
 	FROM
 		AQ_DWXX_CK
 	<where>
@@ -176,28 +221,22 @@
 				AND ID = #{id,jdbcType=VARCHAR}
 			</if>
 			<if test="ssjyr != null and ssjyr != '' ">
-				AND SSJYR = #{ssjyr,jdbcType=DECIMAL}
+				AND SSJYR = #{ssjyr,jdbcType=VARCHAR}
 			</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
+  <select id="selectGetEdit" resultMap="BaseResultCkInfoMap" parameterType="com.xt.js.gkaq.dwxx.model.CkInfoModel">
+	 SELECT 
+			C.ID,C.SSJYR,C.SZD,C.GQ,C.MT,C.CKMC,C.WXPCK,C.CKYT,C.CKGS,C.YTHGCGRJ,C.WXPCKMJ,
+			C.YKRJ,CPYRJ,C.GISID,C.JD,C.WD,C.ZWCKYT,C.CKMJ,C.CKRJ,J.GKJYR AS QYMC
 	FROM
-		GKAQV2.T_YJPT_GQ
+		AQ_DWXX_CK C
+		LEFT JOIN AQ_DWXX_JYRJCXX J ON J."ID" = C.SSJYR
 	<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> -->
+			RECORD_STATUS != '9'
+			AND C.ID = #{id,jdbcType=VARCHAR}
+	</where>
+  </select>
   
 </mapper>

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

@@ -6,6 +6,7 @@
     <result column="SZD" property="szd" jdbcType="VARCHAR" />
     <result column="SZGQ" property="szgq" jdbcType="VARCHAR" />
     <result column="QYMC" property="qymc" jdbcType="VARCHAR" />
+    <result column="SSJYR" property="ssjyr" jdbcType="VARCHAR" />
     <result column="MTMC" property="mtmc" jdbcType="VARCHAR" />
     <result column="DCMC" property="dcmc" jdbcType="VARCHAR" />
     <result column="SCYDCYT" property="scydcyt" jdbcType="VARCHAR" />
@@ -49,13 +50,13 @@
     where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.dwxx.model.DcModel" >
-    insert into AQ_DWXX_DC (ID,SZD,SZGQ,QYMC,MTMC,DCMC,SCYDCYT,DCZMJ,DCZRL,JZXMJ,JZXDCDCNL,WXPXDCMJ,WXPXDCDCNL,JD,WD,JTJGISDYIDH,
+    insert into AQ_DWXX_DC (ID,SZD,SZGQ,SSJYR,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=VARCHAR},
     		#{szd,jdbcType=VARCHAR}, 
      		#{szgq,jdbcType=VARCHAR}, 
-     		#{qymc,jdbcType=VARCHAR}, 
+     		#{ssjyr,jdbcType=VARCHAR}, 
      		#{mtmc,jdbcType=VARCHAR}, 
      		#{dcmc,jdbcType=VARCHAR}, 
      		#{scydcyt,jdbcType=VARCHAR}, 
@@ -95,7 +96,7 @@
     update AQ_DWXX_DC
     set SZD = #{szd,jdbcType=VARCHAR}, 
 		 SZGQ = #{szgq,jdbcType=VARCHAR}, 
-		 QYMC = #{qymc,jdbcType=VARCHAR}, 
+		 SSJYR = #{ssjyr,jdbcType=VARCHAR}, 
 		 MTMC = #{mtmc,jdbcType=VARCHAR}, 
 		 DCMC = #{dcmc,jdbcType=VARCHAR}, 
 		 SCYDCYT = #{scydcyt,jdbcType=VARCHAR}, 
@@ -132,7 +133,7 @@
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
   	SELECT
-		ID,SZD,SZGQ,QYMC,MTMC,DCMC,SCYDCYT,DCZMJ,DCZRL,JZXMJ,JZXDCDCNL,WXPXDCMJ,WXPXDCDCNL,JD,WD,JTJGISDYIDH,
+		ID,SZD,SZGQ,SSJYR,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
@@ -141,7 +142,7 @@
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
      SELECT
-		ID,SZD,SZGQ,QYMC,MTMC,DCMC,SCYDCYT,DCZMJ,DCZRL,JZXMJ,JZXDCDCNL,WXPXDCMJ,WXPXDCDCNL,JD,WD,JTJGISDYIDH,
+		ID,SZD,SZGQ,SSJYR,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
@@ -149,7 +150,7 @@
   </select>
   <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.dwxx.model.DcModel">
 	 SELECT
-		ID,SZD,SZGQ,QYMC,MTMC,DCMC,SCYDCYT,DCZMJ,DCZRL,JZXMJ,JZXDCDCNL,WXPXDCMJ,WXPXDCDCNL,JD,WD,JTJGISDYIDH,
+		ID,SZD,SZGQ,SSJYR,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
@@ -159,29 +160,24 @@
 			<if test="id != null and id != '' ">
 				AND ID = #{id,jdbcType=VARCHAR}
 			</if>
-			<if test="qymc != null and qymc != '' ">
-				AND QYMC = #{qymc,jdbcType=VARCHAR}
+			<if test="ssjyr != null and ssjyr != '' ">
+				AND SSJYR = #{ssjyr,jdbcType=VARCHAR}
 			</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
+  
+  <select id="selectGetEditDc" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.dwxx.model.DcModel">
+	 SELECT
+		C.ID,C.SZD,C.SZGQ,C.SSJYR,C.MTMC,C.DCMC,C.SCYDCYT,C.DCZMJ,C.DCZRL,C.JZXMJ,C.JZXDCDCNL,C.WXPXDCMJ,C.WXPXDCDCNL,
+		C.JD,C.WD,C.JTJGISDYIDH,C.ZWDCYT,
+		J.GKJYR AS QYMC
 	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>
+		AQ_DWXX_DC C
+		LEFT JOIN AQ_DWXX_JYRJCXX J ON J."ID" = C.SSJYR
+		<where>
+			C.RECORD_STATUS != '9'
+			AND C.ID = #{id,jdbcType=VARCHAR}
 		</where>
-  </select> -->
-  
+	</select>
 </mapper>

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

@@ -157,9 +157,9 @@
 	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_BASIC_FRAME_CODE C ON C.CODE = SS.YJFL
+		LEFT JOIN AQ_BASIC_FRAME_CODE CO ON CO.CODE = SS.EJFL
+		LEFT JOIN AQ_BASIC_FRAME_CODE COD ON COD.CODE = SS.SZD
 		LEFT JOIN AQ_DWXX_GQ GQ ON GQ.ID = SS.SZGQ
 	<where>
 		SS.RECORD_STATUS != 9
@@ -188,8 +188,8 @@
   <select id="selectTjInfo" resultMap="BaseResultTjInfoMap" parameterType="com.xt.js.gkaq.dwxx.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
+		(SELECT TEXT FROM AQ_BASIC_FRAME_CODE WHERE CODE = SS.SZD AND PCODE = 'DM_SZD' AND STATE != 9) AS SZD ,
+		(SELECT TEXT FROM AQ_BASIC_FRAME_CODE WHERE CODE = SS.YJFL AND PCODE = 'AQSS' AND STATE != 9) AS YJFL
 	FROM 
 	 	AQ_DWXX_GKSSSB SS 
 	<where>-

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

@@ -187,9 +187,9 @@
 		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_BASIC_FRAME_CODE C ON C.CODE = JYRU.ZJLX
+		LEFT JOIN AQ_BASIC_FRAME_CODE CO ON CO.CODE = JYRU.SZD
+		LEFT JOIN AQ_BASIC_FRAME_CODE COD ON COD.CODE = JYRU.RYLX
 		LEFT JOIN AQ_DWXX_GQ GQ ON GQ.ID = JYRU.SSGQ
 		<where>
 			JYRU.RECORD_STATUS != 9
@@ -216,7 +216,7 @@
    <select id="selectTJByInfo" resultMap="BaseResultTJMap" parameterType="com.xt.js.gkaq.dwxx.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
+					LEFT JOIN AQ_BASIC_FRAME_CODE C ON C.CODE = RY.RYLX
 		<where>
 				RY.SZD = #{szd,jdbcType=VARCHAR}
 			<if test="rylx != null and rylx != ''">
@@ -232,7 +232,7 @@
 			ORDER BY J.GKJYR
    </select>
    <select id="getSelect" resultMap="ComboBoxMap" parameterType="java.lang.String" >
-	   select TEXT, VAL from AQ_BASIC_FRAME_CODE 
+	   select TEXT, CODE from AQ_BASIC_FRAME_CODE 
 		where CODE = #{code,jdbcType=VARCHAR}
 	    and STATE != 9
 		order by SORTNO

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

@@ -72,7 +72,7 @@
 		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
+	LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.CODE = J.SZD
 		
 	<where>
 			J.STATE != '9'

gkaqv2/trunk/modules/dwxx/src/main/resources/com/xt/js/gkaq/dwxx/mappers/JyrjcxxModelMapper.xml

@@ -56,6 +56,13 @@
     <result column="SFZDSP" property="sfzdsp" jdbcType="CHAR" />
     <result column="PARENT_JYR_ID" property="parentJyrId" jdbcType="VARCHAR" />
     <result column="XZQH" property="xzqh" jdbcType="VARCHAR" />
+    
+   <result column="QYXZMC" property="qyxzmc" jdbcType="VARCHAR" />
+    <result column="ZDSPSJQ" property="zdspsjq" jdbcType="TIMESTAMP" />
+    <result column="ZDSPSJZ" property="zdspsjz" jdbcType="TIMESTAMP" />
+    <result column="DANGER_SRC_UNIT_NUM" property="dawxynum" jdbcType="DECIMAL" />
+    <result column="ZJHM" property="zjhm" jdbcType="VARCHAR" />
+    
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="STATE" property="state" jdbcType="CHAR" />
@@ -135,6 +142,13 @@
     <result column="SFZDSP" property="sfzdsp" jdbcType="CHAR" />
     <result column="PARENT_JYR_ID" property="parentJyrId" jdbcType="VARCHAR" />
     <result column="XZQH" property="xzqh" jdbcType="VARCHAR" />
+    
+    <result column="QYXZMC" property="qyxzmc" jdbcType="VARCHAR" />
+    <result column="ZDSPSJQ" property="zdspsjq" jdbcType="TIMESTAMP" />
+    <result column="ZDSPSJZ" property="zdspsjz" jdbcType="TIMESTAMP" />
+    <result column="DANGER_SRC_UNIT_NUM" property="dawxynum" jdbcType="DECIMAL" />
+    <result column="ZJHM" property="zjhm" jdbcType="VARCHAR" />
+    
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="STATE" property="state" jdbcType="CHAR" />
@@ -147,6 +161,11 @@
     <result column="GKJYR" property="optName" jdbcType="VARCHAR" />
   </resultMap>
   
+  <resultMap id="HyzlCombo" 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_JYRJCXX
     where ID = #{id,jdbcType=VARCHAR}
@@ -170,7 +189,9 @@
       AQFZRZBDH, GJJGDM, SFZDSP, 
       PARENT_JYR_ID, XZQH, CREATE_TIME, 
       UPDATE_TIME, STATE, CREATE_USER, 
-      UPDATE_USER)
+      UPDATE_USER,
+      QYXZMC,ZDSPSJQ,ZDSPSJZ,DANGER_SRC_UNIT_NUM,ZJHM
+      )
     values (#{id,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, #{szgq,jdbcType=VARCHAR}, 
       #{gkjyr,jdbcType=VARCHAR}, #{qyxz,jdbcType=VARCHAR}, #{yzbm,jdbcType=VARCHAR}, 
       #{bgdz,jdbcType=VARCHAR}, #{gkjyxkzh,jdbcType=VARCHAR}, #{fzrq,jdbcType=TIMESTAMP}, 
@@ -189,7 +210,12 @@
       #{aqfzrzbdh,jdbcType=VARCHAR}, #{gjjgdm,jdbcType=VARCHAR}, #{sfzdsp,jdbcType=CHAR}, 
       #{parentJyrId,jdbcType=VARCHAR}, #{xzqh,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=CHAR}, #{createUser,jdbcType=VARCHAR}, 
-      #{updateUser,jdbcType=VARCHAR})
+      #{updateUser,jdbcType=VARCHAR},
+     #{qyxzmc,jdbcType=VARCHAR}, #{zdspsjq,jdbcType=TIMESTAMP},#{zdspsjz,jdbcType=TIMESTAMP},
+      #{dawxynum,jdbcType=DECIMAL}, #{zjhm,jdbcType=VARCHAR}
+      
+      
+      )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.dwxx.model.JyrjcxxModel" >
     update AQ_DWXX_JYRJCXX
@@ -250,7 +276,14 @@
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       STATE = #{state,jdbcType=CHAR},
       CREATE_USER = #{createUser,jdbcType=VARCHAR},
-      UPDATE_USER = #{updateUser,jdbcType=VARCHAR}
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      
+      
+      QYXZMC = #{qyxzmc,jdbcType=VARCHAR},
+      ZDSPSJQ = #{zdspsjq,jdbcType=TIMESTAMP},
+      ZDSPSJZ = #{zdspsjz,jdbcType=TIMESTAMP},
+      DANGER_SRC_UNIT_NUM = #{dawxynum,jdbcType=DECIMAL},
+      ZJHM = #{zjhm,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -259,7 +292,8 @@
     GKSSBAFHZSBH, BAFZJG, BAFZRQ, BAYXQ, ZYWXHWPM, QYLB, SSQY, RECORD_CODE, BYZD1, BYZD2, 
     BYZD3, BYZD4, BYZD5, SFWHQY, QYLX, FZYXQ, QYZZJGDM, SSHYDL, SSHYZ, QYAQDJ, RS, AQZGBM, 
     AQGLJG, ZZAGRYSL, ZCZE, XSJE, AQFZRZBDH, GJJGDM, SFZDSP, PARENT_JYR_ID, XZQH, CREATE_TIME, 
-    UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
+    UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER,
+    QYXZMC,ZDSPSJQ,ZDSPSJZ,DANGER_SRC_UNIT_NUM,ZJHM
     from AQ_DWXX_JYRJCXX
     where ID = #{id,jdbcType=VARCHAR}
   </select>
@@ -269,7 +303,8 @@
     GKSSBAFHZSBH, BAFZJG, BAFZRQ, BAYXQ, ZYWXHWPM, QYLB, SSQY, RECORD_CODE, BYZD1, BYZD2, 
     BYZD3, BYZD4, BYZD5, SFWHQY, QYLX, FZYXQ, QYZZJGDM, SSHYDL, SSHYZ, QYAQDJ, RS, AQZGBM, 
     AQGLJG, ZZAGRYSL, ZCZE, XSJE, AQFZRZBDH, GJJGDM, SFZDSP, PARENT_JYR_ID, XZQH, CREATE_TIME, 
-    UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
+    UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER,
+    QYXZMC,ZDSPSJQ,ZDSPSJZ,DANGER_SRC_UNIT_NUM,ZJHM
     from AQ_DWXX_JYRJCXX
   </select>
   
@@ -283,6 +318,13 @@
     	</if>
     </where>
   </select>
+  <select id="getHyzl" resultMap="HyzlCombo" parameterType="com.xt.js.gkaq.dwxx.model.ComboBoxDto">
+  	SELECT TEXT, CODE from AQ_BASIC_FRAME_CODE 
+	WHERE PCODE = #{optName,jdbcType=VARCHAR}
+	AND PID = #{optVal,jdbcType=VARCHAR}
+    AND STATE != 9
+	ORDER BY SORTNO
+  </select>
   
   <select id="selectList" resultMap="JyrResultMap" parameterType="com.xt.js.gkaq.dwxx.model.JyrjcxxModel" >
 	  	select JYR.ID, JYR.SZD, CODE.TEXT, JYR.SZGQ, GQ.GQMC, JYR.GKJYR, JYR.QYXZ, JYR.YZBM, JYR.BGDZ, JYR.GKJYXKZH, JYR.FZRQ, JYR.FZJG, JYR.JYFW, JYR.JYQY, 
@@ -290,11 +332,12 @@
 		    JYR.GKSSBAFHZSBH, JYR.BAFZJG, JYR.BAFZRQ, JYR.BAYXQ, JYR.ZYWXHWPM, JYR.QYLB, JYR.SSQY, JYR.RECORD_CODE, JYR.BYZD1, JYR.BYZD2, 
 		    JYR.BYZD3, JYR.BYZD4, JYR.BYZD5, JYR.SFWHQY, JYR.QYLX, JYR.FZYXQ, JYR.QYZZJGDM, JYR.SSHYDL, JYR.SSHYZ, JYR.QYAQDJ, JYR.RS, JYR.AQZGBM, 
 		    JYR.AQGLJG, JYR.ZZAGRYSL, JYR.ZCZE, JYR.XSJE, JYR.AQFZRZBDH, JYR.GJJGDM, JYR.SFZDSP, JYR.PARENT_JYR_ID, JYR.XZQH, JYR.CREATE_TIME, 
-		    JYR.UPDATE_TIME, JYR.STATE, JYR.CREATE_USER, JYR.UPDATE_USER
+		    JYR.UPDATE_TIME, JYR.STATE, JYR.CREATE_USER, JYR.UPDATE_USER,
+		    JYR.QYXZMC,JYR.ZDSPSJQ,JYR.ZDSPSJZ,JYR.DANGER_SRC_UNIT_NUM,JYR.ZJHM
 	    from AQ_DWXX_JYRJCXX JYR
 	  
 		LEFT JOIN AQ_DWXX_GQ GQ ON JYR.SZGQ = GQ."ID"
-		LEFT JOIN AQ_BASIC_FRAME_CODE CODE ON CODE.VAL = JYR.SZD
+		LEFT JOIN AQ_BASIC_FRAME_CODE CODE ON CODE.CODE = JYR.SZD
 		
 		<where>
 				JYR.STATE != '9'
@@ -339,12 +382,12 @@
   <select id="selectExcelList" resultMap="JyrExcelResultMap" parameterType="com.xt.js.gkaq.dwxx.model.JyrjcxxModel" >
 	  	
 	    SELECT
-			JYR. ID, JYR.GKJYR, JYR.BYZD1, JYR.SFWHQY, JYR.SFWHQY AS ZDWXY,JYR.GKJYXKZH, JYR.GKSSBAFHZSBH,
+			JYR. ID, JYR.GKJYR, JYR.QYXZMC, JYR.SFWHQY, JYR.SFWHQY AS ZDWXY,JYR.GKJYXKZH, JYR.GKSSBAFHZSBH,
 			JYR.JYFW, JYR.FDDBR, JYR.AQBMFZR, JYR.AQFZRZBDH, CODE.TEXT, GQ.GQMC
 		FROM
 			AQ_DWXX_JYRJCXX JYR
 		LEFT JOIN AQ_DWXX_GQ GQ ON JYR.SZGQ = GQ."ID"
-		LEFT JOIN AQ_BASIC_FRAME_CODE CODE ON CODE.VAL = JYR.SZD
+		LEFT JOIN AQ_BASIC_FRAME_CODE CODE ON CODE.CODE = JYR.SZD
 		
 		<where>
 				JYR.STATE != '9'

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

@@ -34,7 +34,7 @@
 				AS WXSL,
 			J.QYLX
 		FROM AQ_DWXX_JYRJCXX J
-		LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.VAL = J.SZD
+		LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.CODE = J.SZD
 	<where>
 			J.STATE != '9'
 			<if test="szd != null and szd != '' ">

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

@@ -108,7 +108,7 @@
 			AND LBHXB = #{lbhxb,jdbcType=VARCHAR}
 		</if>
 		<if test="szd != null and szd != ''">
-			AND SZD = #{szd,jdbcType=DECIMAL}
+			AND SZD = #{szd,jdbcType=VARCHAR}
 		</if>
 		
 	</where>

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

@@ -128,8 +128,8 @@
 			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_BASIC_FRAME_CODE C ON C.CODE = ZD.ZDFL
+			LEFT JOIN AQ_BASIC_FRAME_CODE CO ON CO.CODE = ZD.SZD
 			LEFT JOIN AQ_DWXX_GQ GQ ON GQ.ID = ZD.SZGQ
 		<where>
 			ZD.STATE != 9

gkaqv2/trunk/modules/frame/pom.xml

@@ -48,6 +48,16 @@
 			<groupId>org.activiti</groupId>
 			<artifactId>activiti-spring</artifactId>
 		</dependency>
+<!-- 		<dependency>
+		    <groupId>org.activiti</groupId>
+		    <artifactId>activiti-modeler</artifactId>
+		    <version>5.20.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.activiti</groupId>
+		    <artifactId>activiti-diagram-rest</artifactId>
+		    <version>5.20.0</version>
+		</dependency> -->
 		<dependency>
 			<groupId>com.yuanxd.tools</groupId>
 			<artifactId>x-tools-io</artifactId>

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/CodeModelMapper.java

@@ -31,6 +31,7 @@ public interface CodeModelMapper extends BaseMapper<CodeModel> {
      * @return
      */
     List<ComboBoxDto> selectByPcode(String pcode);
+    List<ComboBoxDto> selectByGcode(String pcode);
 
     /**
      * ¸ù¾ÝÌõ¼þ²éѯÊý¾Ý¼¯ºÏ

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/GroupModelMapper.java

@@ -21,5 +21,5 @@ public interface GroupModelMapper extends BaseMapper<GroupModel> {
 
     List<ComboBoxDto> selectByCombo(@Param(value="orgid") String orgid);
 
-    GroupModelDto selectByUser(String userId);
+    List<GroupModelDto> selectByUser(String userId);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/NoticeModelMapper.java

@@ -0,0 +1,7 @@
+package com.xt.js.gkaq.frame.mappers;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.frame.model.NoticeModel;
+
+public interface NoticeModelMapper extends BaseMapper<NoticeModel> {
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/NoticeViewModelMapper.java

@@ -0,0 +1,7 @@
+package com.xt.js.gkaq.frame.mappers;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.frame.model.NoticeViewModel;
+
+public interface NoticeViewModelMapper extends BaseMapper<NoticeViewModel> {
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/WfPropModelMapper.java

@@ -2,9 +2,12 @@ package com.xt.js.gkaq.frame.mappers;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.WfPropModel;
 
 public interface WfPropModelMapper extends BaseMapper<WfPropModel> {
-    List<WfPropModel> selectByCondition(String wfKey, String activity, String propName);
+    List<WfPropModel> selectByCondition(@Param("wfKey") String wfKey, @Param("activity") String activity,
+            @Param("propName") String propName);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/WorkRemindModelMapper.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.frame.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.frame.model.WorkRemindModel;
+
+public interface WorkRemindModelMapper extends BaseMapper<WorkRemindModel> {
+
+    List<WorkRemindModel> selectAllByCond(WorkRemindModel model);
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/XzqhModelMapper.java

@@ -9,7 +9,7 @@ import com.xt.js.gkaq.frame.model.XzqhModel;
 public interface XzqhModelMapper extends BaseMapper<XzqhModel> {
 
     /**
-     * 锟斤拷锟斤拷锟斤拷锟斤拷锟窖�拷锟捷硷拷锟斤拷
+     * 根据条件查询数据集合
      * 
      * @param model
      * @return

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/ButtonModel.java

@@ -68,4 +68,18 @@ public class ButtonModel extends BaseUUIDModel {
         this.sortno = sortno;
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!(obj instanceof ButtonModel))
+            return false;
+        BaseUUIDModel objModel = (BaseUUIDModel) obj;
+        return getId().equals(objModel.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return getId().hashCode();
+    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/CodeModel.java

@@ -12,12 +12,12 @@ public class CodeModel extends BaseUUIDModel {
 
     private String pcode;
 
+    private String groupCode;
+
     private String text;
 
     private String code;
 
-    private String val;
-
     private String leaf;
 
     private Long sortno;
@@ -56,14 +56,6 @@ public class CodeModel extends BaseUUIDModel {
         this.code = code == null ? null : code.trim();
     }
 
-    public String getVal() {
-        return val;
-    }
-
-    public void setVal(String val) {
-        this.val = val == null ? null : val.trim();
-    }
-
     public String getLeaf() {
         return leaf;
     }
@@ -88,4 +80,12 @@ public class CodeModel extends BaseUUIDModel {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/GroupButtonModel.java

@@ -1,26 +1,17 @@
 package com.xt.js.gkaq.frame.model;
 
-public class GroupButtonModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class GroupButtonModel extends BaseUUIDModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = -1384538293585535766L;
 
     private String groupId;
 
     private String buttonId;
 
-    private String state;
-
-    private Object createTime;
-
-    private Object updateTime;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
     public String getGroupId() {
         return groupId;
     }
@@ -37,27 +28,4 @@ public class GroupButtonModel {
         this.buttonId = buttonId == null ? null : buttonId.trim();
     }
 
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
-
-    public Object getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Object createTime) {
-        this.createTime = createTime;
-    }
-
-    public Object getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Object updateTime) {
-        this.updateTime = updateTime;
-    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/GroupMenuModel.java

@@ -1,26 +1,17 @@
 package com.xt.js.gkaq.frame.model;
 
-public class GroupMenuModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class GroupMenuModel extends BaseUUIDModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = -7359958848098027908L;
 
     private String groupId;
 
     private String menuId;
 
-    private String state;
-
-    private Object createTime;
-
-    private Object updateTime;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
     public String getGroupId() {
         return groupId;
     }
@@ -37,27 +28,4 @@ public class GroupMenuModel {
         this.menuId = menuId == null ? null : menuId.trim();
     }
 
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
-
-    public Object getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Object createTime) {
-        this.createTime = createTime;
-    }
-
-    public Object getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Object updateTime) {
-        this.updateTime = updateTime;
-    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/MenuModel.java

@@ -10,6 +10,8 @@ public class MenuModel extends BaseUUIDModel {
 
     private String pid;
 
+    private String pcode;
+
     private String name;
 
     private String code;
@@ -98,4 +100,26 @@ public class MenuModel extends BaseUUIDModel {
         this.sortno = sortno;
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!(obj instanceof MenuModel))
+            return false;
+        BaseUUIDModel objModel = (BaseUUIDModel) obj;
+        return getId().equals(objModel.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return getId().hashCode();
+    }
+
+    public String getPcode() {
+        return pcode;
+    }
+
+    public void setPcode(String pcode) {
+        this.pcode = pcode;
+    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/NoticeModel.java

@@ -0,0 +1,121 @@
+package com.xt.js.gkaq.frame.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class NoticeModel extends BaseUUIDModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = 6188936953938227163L;
+
+    private String title;
+
+    private String content;
+
+    private String lkr;
+
+    private String sftb;
+
+    private String tbzt;
+
+    private String tbdyid;
+
+    private String qylb;
+
+    private String ssqy;
+
+    private String szd;
+
+    private String qykj;
+    
+    private String allkj;
+
+    public String getAllkj() {
+        return allkj;
+    }
+
+    public void setAllkj(String allkj) {
+        this.allkj = allkj;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title == null ? null : title.trim();
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public String getLkr() {
+        return lkr;
+    }
+
+    public void setLkr(String lkr) {
+        this.lkr = lkr == null ? null : lkr.trim();
+    }
+
+    public String getSftb() {
+        return sftb;
+    }
+
+    public void setSftb(String sftb) {
+        this.sftb = sftb == null ? null : sftb.trim();
+    }
+
+    public String getTbzt() {
+        return tbzt;
+    }
+
+    public void setTbzt(String tbzt) {
+        this.tbzt = tbzt == null ? null : tbzt.trim();
+    }
+
+    public String getTbdyid() {
+        return tbdyid;
+    }
+
+    public void setTbdyid(String tbdyid) {
+        this.tbdyid = tbdyid == null ? null : tbdyid.trim();
+    }
+
+    public String getQylb() {
+        return qylb;
+    }
+
+    public void setQylb(String qylb) {
+        this.qylb = qylb == null ? null : qylb.trim();
+    }
+
+    public String getSsqy() {
+        return ssqy;
+    }
+
+    public void setSsqy(String ssqy) {
+        this.ssqy = ssqy == null ? null : ssqy.trim();
+    }
+
+    public String getSzd() {
+        return szd;
+    }
+
+    public void setSzd(String szd) {
+        this.szd = szd == null ? null : szd.trim();
+    }
+
+    public String getQykj() {
+        return qykj;
+    }
+
+    public void setQykj(String qykj) {
+        this.qykj = qykj == null ? null : qykj.trim();
+    }
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/NoticeViewModel.java

@@ -0,0 +1,101 @@
+package com.xt.js.gkaq.frame.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class NoticeViewModel extends BaseUUIDModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = 5299912060823947496L;
+
+    private String ggid;
+
+    private String qymc;
+
+    private String sftb;
+
+    private String tbzt;
+
+    private String tbdyid;
+
+    private String qylb;
+
+    private String ssqy;
+
+    private String szd;
+
+    private String sfkj;
+
+    public String getGgid() {
+        return ggid;
+    }
+
+    public void setGgid(String ggid) {
+        this.ggid = ggid == null ? null : ggid.trim();
+    }
+
+    public String getQymc() {
+        return qymc;
+    }
+
+    public void setQymc(String qymc) {
+        this.qymc = qymc == null ? null : qymc.trim();
+    }
+
+    public String getSftb() {
+        return sftb;
+    }
+
+    public void setSftb(String sftb) {
+        this.sftb = sftb == null ? null : sftb.trim();
+    }
+
+    public String getTbzt() {
+        return tbzt;
+    }
+
+    public void setTbzt(String tbzt) {
+        this.tbzt = tbzt == null ? null : tbzt.trim();
+    }
+
+    public String getTbdyid() {
+        return tbdyid;
+    }
+
+    public void setTbdyid(String tbdyid) {
+        this.tbdyid = tbdyid == null ? null : tbdyid.trim();
+    }
+
+    public String getQylb() {
+        return qylb;
+    }
+
+    public void setQylb(String qylb) {
+        this.qylb = qylb == null ? null : qylb.trim();
+    }
+
+    public String getSsqy() {
+        return ssqy;
+    }
+
+    public void setSsqy(String ssqy) {
+        this.ssqy = ssqy == null ? null : ssqy.trim();
+    }
+
+    public String getSzd() {
+        return szd;
+    }
+
+    public void setSzd(String szd) {
+        this.szd = szd == null ? null : szd.trim();
+    }
+
+    public String getSfkj() {
+        return sfkj;
+    }
+
+    public void setSfkj(String sfkj) {
+        this.sfkj = sfkj == null ? null : sfkj.trim();
+    }
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/ParamModel.java

@@ -14,7 +14,7 @@ public class ParamModel extends BaseUUIDModel {
 
 	private String clazz;
 
-	private String disp;
+	private String remark;
 
 	public String getKey() {
 		return key;
@@ -40,11 +40,11 @@ public class ParamModel extends BaseUUIDModel {
 		this.clazz = clazz == null ? null : clazz.trim();
 	}
 
-	public String getDisp() {
-		return disp;
+	public String getRemark() {
+		return remark;
 	}
 
-	public void setDisp(String disp) {
-		this.disp = disp == null ? null : disp.trim();
+	public void setRemark(String remark) {
+		this.remark = remark == null ? null : remark.trim();
 	}
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/RoleButtonModel.java

@@ -1,22 +1,17 @@
 package com.xt.js.gkaq.frame.model;
 
-public class RoleButtonModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class RoleButtonModel extends BaseUUIDModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = -7263740396180957388L;
 
     private String roleId;
 
     private String buttonId;
 
-    private String state;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
     public String getRoleId() {
         return roleId;
     }
@@ -32,12 +27,4 @@ public class RoleButtonModel {
     public void setButtonId(String buttonId) {
         this.buttonId = buttonId == null ? null : buttonId.trim();
     }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/RoleMenuModel.java

@@ -1,26 +1,17 @@
 package com.xt.js.gkaq.frame.model;
 
-public class RoleMenuModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class RoleMenuModel extends BaseUUIDModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = -8038904289939673564L;
 
     private String roleId;
 
     private String menuId;
 
-    private String state;
-
-    private Object createTime;
-
-    private Object updateTime;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
     public String getRoleId() {
         return roleId;
     }
@@ -36,28 +27,4 @@ public class RoleMenuModel {
     public void setMenuId(String menuId) {
         this.menuId = menuId == null ? null : menuId.trim();
     }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
-
-    public Object getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Object createTime) {
-        this.createTime = createTime;
-    }
-
-    public Object getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Object updateTime) {
-        this.updateTime = updateTime;
-    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/TaskModel.java

@@ -30,10 +30,6 @@ public class TaskModel extends BaseUUIDModel{
 
     private String auditResult;
 
-    private String qylb;
-
-    private Short ssqy;
-
     private String busKey;
 
     private String auditUser;
@@ -44,7 +40,57 @@ public class TaskModel extends BaseUUIDModel{
 
     private String auditUsername;
 
-    private Short szd;
+    private String sftb;
+
+    private String tbzt;
+
+    private String tbdyid;
+
+    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 getSsqy() {
+        return ssqy;
+    }
+
+    public void setSsqy(String ssqy) {
+        this.ssqy = ssqy;
+    }
+
+    public String getSzd() {
+        return szd;
+    }
+
+    public void setSzd(String szd) {
+        this.szd = szd;
+    }
+
+    private String qylb;
+
+    private String ssqy;
+
+    private String szd;
 
     public String getTaskId() {
         return taskId;
@@ -142,14 +188,6 @@ public class TaskModel extends BaseUUIDModel{
         this.qylb = qylb == null ? null : qylb.trim();
     }
 
-    public Short getSsqy() {
-        return ssqy;
-    }
-
-    public void setSsqy(Short ssqy) {
-        this.ssqy = ssqy;
-    }
-
     public String getBusKey() {
         return busKey;
     }
@@ -190,11 +228,4 @@ public class TaskModel extends BaseUUIDModel{
         this.auditUsername = auditUsername == null ? null : auditUsername.trim();
     }
 
-    public Short getSzd() {
-        return szd;
-    }
-
-    public void setSzd(Short szd) {
-        this.szd = szd;
-    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/UserInfoModel.java

@@ -41,6 +41,8 @@ public class UserInfoModel extends UserModel {
     private String developmentOrg;
 
     private Date birthday;
+    
+    private String sex;
 
     private String politicsStatus;
 
@@ -248,4 +250,12 @@ public class UserInfoModel extends UserModel {
         this.address = address == null ? null : address.trim();
     }
 
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/UserModel.java

@@ -20,8 +20,7 @@ public class UserModel extends BaseUUIDModel implements User {
     private String loginPassword;
     /** 所在部门 */
     private String orgid;
-    /** 性别 */
-    private String sex;
+    private String wechatid;
     /** 联系电话 */
     private String phone;
 
@@ -29,10 +28,7 @@ public class UserModel extends BaseUUIDModel implements User {
     private String email;
 
     /** 人员类型（行政人员 1、经营人2、船代3等） */
-    private String rylx;
-
-    /** 账号失效时间 */
-    private Object sxsj;
+    private String userType;
 
     public String getRealName() {
         return realName;
@@ -66,14 +62,6 @@ public class UserModel extends BaseUUIDModel implements User {
         this.orgid = orgid == null ? null : orgid.trim();
     }
 
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex == null ? null : sex.trim();
-    }
-
     public String getPhone() {
         return phone;
     }
@@ -90,19 +78,19 @@ public class UserModel extends BaseUUIDModel implements User {
         this.email = email == null ? null : email.trim();
     }
 
-    public String getRylx() {
-        return rylx;
+    public String getWechatid() {
+        return wechatid;
     }
 
-    public void setRylx(String rylx) {
-        this.rylx = rylx == null ? null : rylx.trim();
+    public void setWechatid(String wechatid) {
+        this.wechatid = wechatid;
     }
 
-    public Object getSxsj() {
-        return sxsj;
+    public String getUserType() {
+        return userType;
     }
 
-    public void setSxsj(Object sxsj) {
-        this.sxsj = sxsj;
+    public void setUserType(String userType) {
+        this.userType = userType;
     }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/WorkRemindModel.java

@@ -0,0 +1,152 @@
+package com.xt.js.gkaq.frame.model;
+
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
+public class WorkRemindModel extends BaseUUIDModel {
+    /**
+     * serialVersionUID
+     */
+    private static final long serialVersionUID = 853841771485890233L;
+
+    private Date txsj;
+
+    private String txzt;
+
+    private String txnr;
+
+    private String bdid;
+
+    private String bdlx;
+
+    private String jsr;
+
+    private String fsr;
+
+    private String sftb;
+
+    private String tbzt;
+
+    private String tbdyid;
+
+    private String qylb;
+
+    private String ssqy;
+
+    private String bustype;
+
+    private String szd;
+
+    public Date getTxsj() {
+        return txsj;
+    }
+
+    public void setTxsj(Date txsj) {
+        this.txsj = txsj;
+    }
+
+    public String getTxzt() {
+        return txzt;
+    }
+
+    public void setTxzt(String txzt) {
+        this.txzt = txzt == null ? null : txzt.trim();
+    }
+
+    public String getTxnr() {
+        return txnr;
+    }
+
+    public void setTxnr(String txnr) {
+        this.txnr = txnr == null ? null : txnr.trim();
+    }
+
+    public String getBdid() {
+        return bdid;
+    }
+
+    public void setBdid(String bdid) {
+        this.bdid = bdid == null ? null : bdid.trim();
+    }
+
+    public String getBdlx() {
+        return bdlx;
+    }
+
+    public void setBdlx(String bdlx) {
+        this.bdlx = bdlx == null ? null : bdlx.trim();
+    }
+
+    public String getJsr() {
+        return jsr;
+    }
+
+    public void setJsr(String jsr) {
+        this.jsr = jsr == null ? null : jsr.trim();
+    }
+
+    public String getFsr() {
+        return fsr;
+    }
+
+    public void setFsr(String fsr) {
+        this.fsr = fsr == null ? null : fsr.trim();
+    }
+
+    public String getSftb() {
+        return sftb;
+    }
+
+    public void setSftb(String sftb) {
+        this.sftb = sftb == null ? null : sftb.trim();
+    }
+
+    public String getTbzt() {
+        return tbzt;
+    }
+
+    public void setTbzt(String tbzt) {
+        this.tbzt = tbzt == null ? null : tbzt.trim();
+    }
+
+    public String getTbdyid() {
+        return tbdyid;
+    }
+
+    public void setTbdyid(String tbdyid) {
+        this.tbdyid = tbdyid == null ? null : tbdyid.trim();
+    }
+
+    public String getQylb() {
+        return qylb;
+    }
+
+    public void setQylb(String qylb) {
+        this.qylb = qylb == null ? null : qylb.trim();
+    }
+
+    public String getSsqy() {
+        return ssqy;
+    }
+
+    public void setSsqy(String ssqy) {
+        this.ssqy = ssqy == null ? null : ssqy.trim();
+    }
+
+    public String getBustype() {
+        return bustype;
+    }
+
+    public void setBustype(String bustype) {
+        this.bustype = bustype == null ? null : bustype.trim();
+    }
+
+    public String getSzd() {
+        return szd;
+    }
+
+    public void setSzd(String szd) {
+        this.szd = szd == null ? null : szd.trim();
+    }
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/XzqhModel.java

@@ -1,5 +1,7 @@
 package com.xt.js.gkaq.frame.model;
 
+import java.util.Date;
+
 import com.xt.js.gkaq.common.BaseUUIDModel;
 
 public class XzqhModel extends BaseUUIDModel {
@@ -12,7 +14,9 @@ public class XzqhModel extends BaseUUIDModel {
 
     private String name;
 
-    private Short xh;
+    private Integer sortno;
+    
+    private Date fbsj;
 
     public String getCode() {
         return code;
@@ -30,12 +34,20 @@ public class XzqhModel extends BaseUUIDModel {
         this.name = name == null ? null : name.trim();
     }
 
-    public Short getXh() {
-        return xh;
+    public Integer getSortno() {
+        return sortno;
+    }
+
+    public void setSortno(Integer sortno) {
+        this.sortno = sortno;
+    }
+
+    public Date getFbsj() {
+        return fbsj;
     }
 
-    public void setXh(Short xh) {
-        this.xh = xh;
+    public void setFbsj(Date fbsj) {
+        this.fbsj = fbsj;
     }
 
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/CodeService.java

@@ -23,6 +23,7 @@ public interface CodeService extends BaseUUIDModelService<CodeModel> {
      * @return
      */
     public List<ComboBoxDto> findByPcode(String pcode);
+    public List<ComboBoxDto> findByGcode(String gcode);
 
     /**
      * ¸ù¾ÝÌõ¼þ²éѯÊý¾Ý¼¯ºÏ

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/GroupButtonService.java

@@ -2,10 +2,10 @@ package com.xt.js.gkaq.frame.service;
 
 import java.util.List;
 
-import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.GroupButtonModel;
 
-public interface GroupButtonService extends BaseService<GroupButtonModel> {
+public interface GroupButtonService extends BaseUUIDModelService<GroupButtonModel> {
 
     public List<GroupButtonModel> findByGroupId(String groupId);
     

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/GroupMenuService.java

@@ -2,10 +2,10 @@ package com.xt.js.gkaq.frame.service;
 
 import java.util.List;
 
-import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.GroupMenuModel;
 
-public interface GroupMenuService extends BaseService<GroupMenuModel> {
+public interface GroupMenuService extends BaseUUIDModelService<GroupMenuModel> {
 
     public List<GroupMenuModel> findByGroupId(String groupId);
     

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/GroupService.java

@@ -19,5 +19,5 @@ public interface GroupService extends BaseUUIDModelService<GroupModel> {
 
     public List<ComboBoxDto> findByCombo(String orgid);
 
-    public GroupModelDto selectByUser(String userId);
+    public List<GroupModelDto> selectByUser(String userId);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/NoticeService.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.frame.service;
+
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.NoticeModel;
+
+/**
+ * ¹«¸æ·þÎñ½Ó¿Ú
+ */
+public interface NoticeService extends BaseUUIDModelService<NoticeModel> {
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/NoticeViewService.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.frame.service;
+
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.NoticeViewModel;
+
+/**
+ * ¹«¸æ²é¿´·þÎñ½Ó¿Ú
+ */
+public interface NoticeViewService extends BaseUUIDModelService<NoticeViewModel> {
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/RoleButtonService.java

@@ -2,10 +2,10 @@ package com.xt.js.gkaq.frame.service;
 
 import java.util.List;
 
-import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.RoleButtonModel;
 
-public interface RoleButtonService extends BaseService<RoleButtonModel> {
+public interface RoleButtonService extends BaseUUIDModelService<RoleButtonModel> {
 
     public List<RoleButtonModel> findByRoleId(String roleId);
     

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/RoleMenuService.java

@@ -2,10 +2,10 @@ package com.xt.js.gkaq.frame.service;
 
 import java.util.List;
 
-import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.RoleMenuModel;
 
-public interface RoleMenuService extends BaseService<RoleMenuModel> {
+public interface RoleMenuService extends BaseUUIDModelService<RoleMenuModel> {
 
     public List<RoleMenuModel> findByRoleId(String roleId);
     

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/WorkRemindService.java

@@ -0,0 +1,14 @@
+package com.xt.js.gkaq.frame.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.frame.model.WorkRemindModel;
+
+/**
+ * ¹¤×÷ÌáÐÑ·þÎñ½Ó¿Ú
+ */
+public interface WorkRemindService extends BaseUUIDModelService<WorkRemindModel> {
+
+    public List<WorkRemindModel> findAllByCond(WorkRemindModel model);
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/XzqhService.java

@@ -7,12 +7,12 @@ import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.XzqhModel;
 
 /**
- * 锟斤拷锟斤拷锟斤拷锟斤拷锟接匡拷
+ * 行政区划接口
  */
 public interface XzqhService extends BaseUUIDModelService<XzqhModel> {
 
     /**
-     * 锟斤拷锟斤拷锟斤拷锟斤拷锟窖�拷锟捷硷拷锟斤拷
+     * 根据条件查询数据集合
      * 
      * @param model
      * @return

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/CodeServiceImpl.java

@@ -35,6 +35,10 @@ public class CodeServiceImpl extends BaseUUIDModelServiceImpl<CodeModel> impleme
         return mapper.selectByPcode(pcode);
     }
 
+    public List<ComboBoxDto> findByGcode(String gcode) {
+        return mapper.selectByGcode(gcode);
+    }
+
     public List<CodeModelDto> findAllByCond(CodeModelDto model) {
         return mapper.selectAllByCond(model);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/GroupButtonServiceImpl.java

@@ -1,25 +1,18 @@
 package com.xt.js.gkaq.frame.service.impl;
 
-import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.xt.js.gkaq.common.BaseMapper;
-import com.xt.js.gkaq.common.BaseServiceImpl;
-import com.xt.js.gkaq.common.BaseUUIDModel;
-import com.xt.js.gkaq.common.IdGenerator;
-import com.xt.js.gkaq.common.UUIDGenerator;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.frame.mappers.GroupButtonModelMapper;
 import com.xt.js.gkaq.frame.model.GroupButtonModel;
 import com.xt.js.gkaq.frame.service.GroupButtonService;
 
 @Service
-public class GroupButtonServiceImpl extends BaseServiceImpl<GroupButtonModel> implements GroupButtonService {
-    /** IDÖ÷¼üÉú³ÉÆ÷ */
-    private IdGenerator idGenerator = new UUIDGenerator();
+public class GroupButtonServiceImpl extends BaseUUIDModelServiceImpl<GroupButtonModel> implements GroupButtonService {
 
     @Autowired
 	private GroupButtonModelMapper mapper;
@@ -29,17 +22,6 @@ public class GroupButtonServiceImpl extends BaseServiceImpl<GroupButtonModel> im
 		return mapper;
 	}
 
-    @Transactional
-    @Override
-    public int add(GroupButtonModel record) {
-        record.setId(idGenerator.generateStringId());
-        Date now = new Date();
-        record.setCreateTime(now);
-        record.setUpdateTime(now);
-        record.setState(BaseUUIDModel.STATE_DRAFT);
-        return mapper.insert(record);
-    }
-
     public List<GroupButtonModel> findByGroupId(String groupId) {
         return mapper.selectByGroupId(groupId);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/GroupMenuServiceImpl.java

@@ -1,26 +1,18 @@
 package com.xt.js.gkaq.frame.service.impl;
 
-import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.xt.js.gkaq.common.BaseMapper;
-import com.xt.js.gkaq.common.BaseServiceImpl;
-import com.xt.js.gkaq.common.BaseUUIDModel;
-import com.xt.js.gkaq.common.IdGenerator;
-import com.xt.js.gkaq.common.UUIDGenerator;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.frame.mappers.GroupMenuModelMapper;
 import com.xt.js.gkaq.frame.model.GroupMenuModel;
 import com.xt.js.gkaq.frame.service.GroupMenuService;
 
 @Service
-public class GroupMenuServiceImpl extends BaseServiceImpl<GroupMenuModel> implements GroupMenuService {
-    /** IDÖ÷¼üÉú³ÉÆ÷ */
-    private IdGenerator idGenerator = new UUIDGenerator();
-
+public class GroupMenuServiceImpl extends BaseUUIDModelServiceImpl<GroupMenuModel> implements GroupMenuService {
     @Autowired
 	private GroupMenuModelMapper mapper;
 
@@ -29,17 +21,6 @@ public class GroupMenuServiceImpl extends BaseServiceImpl<GroupMenuModel> implem
 		return mapper;
 	}
 
-    @Transactional
-    @Override
-    public int add(GroupMenuModel record) {
-        record.setId(idGenerator.generateStringId());
-        Date now = new Date();
-        record.setCreateTime(now);
-        record.setUpdateTime(now);
-        record.setState(BaseUUIDModel.STATE_DRAFT);
-        return mapper.insert(record);
-    }
-
     public List<GroupMenuModel> findByGroupId(String groupId) {
         return mapper.selectByGroupId(groupId);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/GroupServiceImpl.java

@@ -31,7 +31,7 @@ public class GroupServiceImpl extends BaseUUIDModelServiceImpl<GroupModel> imple
         return mapper.selectByCombo(orgid);
     }
 
-    public GroupModelDto selectByUser(String userId) {
+    public List<GroupModelDto> selectByUser(String userId) {
         return mapper.selectByUser(userId);
     }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/NoticeServiceImpl.java

@@ -0,0 +1,22 @@
+package com.xt.js.gkaq.frame.service.impl;
+
+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.frame.mappers.NoticeModelMapper;
+import com.xt.js.gkaq.frame.model.NoticeModel;
+import com.xt.js.gkaq.frame.service.NoticeService;
+
+@Service
+public class NoticeServiceImpl extends BaseUUIDModelServiceImpl<NoticeModel> implements NoticeService {
+    @Autowired
+    private NoticeModelMapper mapper;
+
+    @Override
+    protected BaseMapper<NoticeModel> getMapper() {
+        return mapper;
+    }
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/NoticeViewServiceImpl.java

@@ -0,0 +1,22 @@
+package com.xt.js.gkaq.frame.service.impl;
+
+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.frame.mappers.NoticeViewModelMapper;
+import com.xt.js.gkaq.frame.model.NoticeViewModel;
+import com.xt.js.gkaq.frame.service.NoticeViewService;
+
+@Service
+public class NoticeViewServiceImpl extends BaseUUIDModelServiceImpl<NoticeViewModel> implements NoticeViewService {
+    @Autowired
+    private NoticeViewModelMapper mapper;
+
+    @Override
+    protected BaseMapper<NoticeViewModel> getMapper() {
+        return mapper;
+    }
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/RoleButtonServiceImpl.java

@@ -4,21 +4,15 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.xt.js.gkaq.common.BaseMapper;
-import com.xt.js.gkaq.common.BaseServiceImpl;
-import com.xt.js.gkaq.common.BaseUUIDModel;
-import com.xt.js.gkaq.common.IdGenerator;
-import com.xt.js.gkaq.common.UUIDGenerator;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.frame.mappers.RoleButtonModelMapper;
 import com.xt.js.gkaq.frame.model.RoleButtonModel;
 import com.xt.js.gkaq.frame.service.RoleButtonService;
 
 @Service
-public class RoleButtonServiceImpl extends BaseServiceImpl<RoleButtonModel> implements RoleButtonService {
-    /** IDÖ÷¼üÉú³ÉÆ÷ */
-    private IdGenerator idGenerator = new UUIDGenerator();
+public class RoleButtonServiceImpl extends BaseUUIDModelServiceImpl<RoleButtonModel> implements RoleButtonService {
 
     @Autowired
 	private RoleButtonModelMapper mapper;
@@ -28,14 +22,6 @@ public class RoleButtonServiceImpl extends BaseServiceImpl<RoleButtonModel> impl
 		return mapper;
 	}
 
-    @Transactional
-    @Override
-    public int add(RoleButtonModel record) {
-        record.setId(idGenerator.generateStringId());
-        record.setState(BaseUUIDModel.STATE_DRAFT);
-        return mapper.insert(record);
-    }
-
     public List<RoleButtonModel> findByRoleId(String roleId) {
         return mapper.selectByRoleId(roleId);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/RoleMenuServiceImpl.java

@@ -1,26 +1,18 @@
 package com.xt.js.gkaq.frame.service.impl;
 
-import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.xt.js.gkaq.common.BaseMapper;
-import com.xt.js.gkaq.common.BaseServiceImpl;
-import com.xt.js.gkaq.common.BaseUUIDModel;
-import com.xt.js.gkaq.common.IdGenerator;
-import com.xt.js.gkaq.common.UUIDGenerator;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.frame.mappers.RoleMenuModelMapper;
 import com.xt.js.gkaq.frame.model.RoleMenuModel;
 import com.xt.js.gkaq.frame.service.RoleMenuService;
 
 @Service
-public class RoleMenuServiceImpl extends BaseServiceImpl<RoleMenuModel> implements RoleMenuService {
-    /** IDÖ÷¼üÉú³ÉÆ÷ */
-    private IdGenerator idGenerator = new UUIDGenerator();
-
+public class RoleMenuServiceImpl extends BaseUUIDModelServiceImpl<RoleMenuModel> implements RoleMenuService {
     @Autowired
 	private RoleMenuModelMapper mapper;
 
@@ -29,17 +21,6 @@ public class RoleMenuServiceImpl extends BaseServiceImpl<RoleMenuModel> implemen
 		return mapper;
 	}
 
-    @Transactional
-    @Override
-    public int add(RoleMenuModel record) {
-        record.setId(idGenerator.generateStringId());
-        Date now = new Date();
-        record.setCreateTime(now);
-        record.setUpdateTime(now);
-        record.setState(BaseUUIDModel.STATE_DRAFT);
-        return mapper.insert(record);
-    }
-
     public List<RoleMenuModel> findByRoleId(String roleId) {
         return mapper.selectByRoleId(roleId);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/SysLogServiceImpl.java

@@ -36,8 +36,10 @@ public class SysLogServiceImpl extends BaseUUIDModelServiceImpl<SysLogModel> imp
         Date now = new Date();
         record.setCreateTime(now);
         record.setUpdateTime(now);
-        record.setCreateUser(user.getLoginName());
-        record.setUpdateUser(user.getLoginName());
+        if (user != null) {
+            record.setCreateUser(user.getLoginName());
+            record.setUpdateUser(user.getLoginName());
+        }
         record.setState(BaseUUIDModel.STATE_DRAFT);
         return mapper.insert(record);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/WorkRemindServiceImpl.java

@@ -0,0 +1,29 @@
+package com.xt.js.gkaq.frame.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.frame.mappers.WorkRemindModelMapper;
+import com.xt.js.gkaq.frame.model.WorkRemindModel;
+import com.xt.js.gkaq.frame.service.WorkRemindService;
+
+@Service
+public class WorkRemindServiceImpl extends BaseUUIDModelServiceImpl<WorkRemindModel> implements WorkRemindService {
+    @Autowired
+    private WorkRemindModelMapper mapper;
+
+    @Override
+    protected BaseMapper<WorkRemindModel> getMapper() {
+        return mapper;
+    }
+
+    @Override
+    public List<WorkRemindModel> findAllByCond(WorkRemindModel model) {
+        return mapper.selectAllByCond(model);
+    }
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/XzqhServiceImpl.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.common.Constants;
 import com.xt.js.gkaq.frame.mappers.XzqhModelMapper;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.model.XzqhModel;
@@ -27,6 +28,9 @@ public class XzqhServiceImpl extends BaseUUIDModelServiceImpl<XzqhModel> impleme
     }
 
     public List<ComboBoxDto> findByCombo(String code) {
+        if (Constants.XZQH_JS4.equals(code)) {
+            code = Constants.XZQH_JSS;
+        }
         return mapper.selectByCombo(code);
     }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/system/GkaqFormAuthenticationFilter.java

@@ -1,6 +1,11 @@
 package com.xt.js.gkaq.frame.system;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -25,6 +30,7 @@ import com.xt.js.gkaq.frame.service.GroupService;
 import com.xt.js.gkaq.frame.service.MenuService;
 import com.xt.js.gkaq.frame.service.SysLogService;
 import com.yuanxd.tools.utils.Assert;
+import com.yuanxd.tools.utils.string.StringUtils;
 
 /**
  * 验证码表单认证
@@ -51,9 +57,44 @@ public class GkaqFormAuthenticationFilter extends FormAuthenticationFilter {
         Assert.isInstanceOf(UserModel.class, principal);
         // 根据当前用户获得授权的菜单并保存到会话
         UserModel user = (UserModel) principal;
-        GroupModelDto userGroup = groupService.selectByUser(user.getId());
-        List<MenuModel> menuList = menuService.selectAllByUser(userGroup);
-        List<ButtonModel> btnList = buttonService.selectAllByUser(userGroup);
+        List<GroupModelDto> userGroupList = groupService.selectByUser(user.getId());
+        Set<MenuModel> menuSet = new HashSet<MenuModel>();
+        Set<ButtonModel> btnSet = new HashSet<ButtonModel>();
+        for (GroupModelDto userGroup : userGroupList) {
+            menuSet.addAll(menuService.selectAllByUser(userGroup));
+            btnSet.addAll(buttonService.selectAllByUser(userGroup));
+        }
+        List<MenuModel> menuList = new ArrayList<MenuModel>(menuSet);
+        List<ButtonModel> btnList = new ArrayList<ButtonModel>(btnSet);
+        Collections.sort(menuList, new Comparator<MenuModel>() {
+            @Override
+            public int compare(MenuModel o1, MenuModel o2) {
+                if (StringUtils.isEmpty(o1.getPid()) && StringUtils.isEmpty(o2.getPid())) {
+                    return o1.getSortno().compareTo(o2.getSortno());
+                } else {
+                    if (StringUtils.isEmpty(o1.getPid())) {
+                        return 1;
+                    }
+                    if (StringUtils.isEmpty(o2.getPid())) {
+                        return -1;
+                    }
+                    int ret = o1.getPid().compareTo(o2.getPid());
+                    if (ret == 0) {
+                        ret = o1.getSortno().compareTo(o2.getSortno());
+                    }
+                    return ret;
+                }
+            }
+        });
+        Collections.sort(btnList, new Comparator<ButtonModel>() {
+            @Override
+            public int compare(ButtonModel o1, ButtonModel o2) {
+                if (StringUtils.isEmpty(o1.getMenu()) || StringUtils.isEmpty(o2.getMenu())) {
+                    return 0;
+                }
+                return o1.getMenu().compareTo(o2.getMenu());
+            }
+        });
         Session session = SecurityUtils.getSubject().getSession();
         session.setAttribute(Constants.SESSION_KEY_USER, user);
         session.setAttribute(Constants.SESSION_KEY_MENUS, menuList);

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/system/Utils.java

@@ -21,7 +21,9 @@ public abstract class Utils {
      */
     public static UserModel getCurrentUser() {
         Subject subject = SecurityUtils.getSubject();
-        if (null == subject || subject.getPrincipal() == null) { return null; }
+        if (null == subject || subject.getPrincipal() == null) {
+            return null;
+        }
         return (UserModel) subject.getPrincipal();
     }
 

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/wf/ActivitiUtils.java

@@ -41,7 +41,6 @@ public class ActivitiUtils {
      * @return
      */
     public static GroupEntity toActivitiGroup(RoleModel role) {
-        // TODO ¿¼ÂǽÇÉ«¡¢·Ö×é¡¢×éÖ¯
         GroupEntity groupEntity = new GroupEntity();
         groupEntity.setRevision(1);
         groupEntity.setType("assignment");

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/wf/BaseWorkFlowService.java

@@ -0,0 +1,85 @@
+package com.xt.js.gkaq.frame.wf;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.task.Task;
+
+import com.xt.js.gkaq.common.SinglePageRequest;
+import com.xt.js.gkaq.frame.model.TaskModel;
+import com.yuanxd.tools.io.http.JsonResult;
+
+public interface BaseWorkFlowService {
+
+    /**
+     * 发布流程
+     * 
+     * @param path
+     */
+    public void deploy(String path);
+
+    /**
+     * 提交记录，发起工作流<br>
+     * 根据业务主键、流程变量列表，发起人发起流程
+     * 
+     * @param param
+     * @param variables
+     * @return
+     */
+    public String create(WorkFlowParam param, Map<String, Object> variables);
+
+    /**
+     * 完成任务
+     * 
+     * @param param
+     * @param variables
+     * @return
+     */
+    public List<Task> complete(WorkFlowParam param, Map<String, Object> variables);
+
+    /**
+     * 签收工作流
+     * 
+     * @param businessKey
+     * @param currentUserName
+     */
+    public void claim(String businessKey, String currentUserName);
+
+    /**
+     * 根据业务ID顺序获取流程任务信息
+     * 
+     * @param budId
+     * @return
+     */
+    public List<TaskModel> getTaskInfoByBusId(String busId);
+
+    /**
+     * 根据用户及业务key查询当前任务
+     * 
+     * @param user
+     * @param businessKey
+     * @return
+     */
+    public Task getTaskByUserAndBusKey(String user, String businessKey);
+
+    /**
+     * 根据用户及业务key查询当前候选任务
+     * 
+     * @param user
+     * @param businessKey
+     * @return
+     */
+    public Task getCandidateTaskByUserAndBusKey(String user, String businessKey);
+
+    /**
+     * 待办任务查询列表
+     * 
+     * @param pageRequest
+     * @param busKey
+     * @param begin
+     * @param end
+     * @return
+     */
+    public JsonResult todoList(SinglePageRequest pageRequest, String busKey, Date begin, Date end);
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/wf/MyGroupEntityManager.java

@@ -65,7 +65,6 @@ public class MyGroupEntityManager extends GroupEntityManager {
 
     @Override
     public List<Group> findGroupsByUser(String userId) {
-        // TODO ¿¼ÂǽÇÉ«¡¢·Ö×é¡¢×éÖ¯
         // Group List
         List<Group> groupList = new ArrayList<Group>();
         List<RoleModel> roles = roleService.findByUserId(userId);

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/wf/WFUUIDGenerator.java

@@ -0,0 +1,16 @@
+package com.xt.js.gkaq.frame.wf;
+
+import java.util.UUID;
+
+import org.activiti.engine.impl.cfg.IdGenerator;
+
+
+public class WFUUIDGenerator implements IdGenerator {
+
+    public String getNextId() {
+        String id = UUID.randomUUID().toString();
+        id = id.replace("-", "").toUpperCase();
+        return id;
+    }
+}
+

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/wf/WorkItem.java

@@ -1,46 +1,46 @@
 package com.xt.js.gkaq.frame.wf;
 
 /**
- * 浠ｅ姙浠诲姟璁板綍
+ * 代办任务记录
  * 
- * @author 琚佹檽鍐?
+ * @author 袁晓冬
  * 
  */
 public class WorkItem {
-	/** task浠诲姟ID */
-	private String id;
-	/** 娴佺▼浠ｇ爜 */
-	private String processKey;
-	/** 娴佺▼鍚嶇О */
-	private String processName;
-	/** 娴佺▼姝ラ�浠ｇ爜 */
-	private String definitionKey;
-	/** 娴佺▼姝ラ�鍚?*/
-	private String definitionName;
-	/** 鍙戦?浜篒D */
-	private String senderID;
-	/** 鍙戦?浜哄悕绉?*/
-	private String senderName;
-	/** 鍙戦?鍗曚綅 */
-	private String sendDept;
-	/** 浠诲姟鎻忚堪 */
-	private String description;
-	/** 鍒涘缓鏃堕棿 */
-	private String createTime;
-	/** 浠诲姟鎺ユ敹鏃堕棿 */
-	private String receiveTime;
-	/** 娴佺▼鐘舵?锛堢�鏀躲?澶勭悊锛?*/
-	private String status;
-	/** 娴佺▼缂栧彿 */
-	private String pid;
-	/** 浠诲姟KEY */
-	private String businessKey;
-	/** 娴佺▼鍙戣捣浜?*/
-	private String applyUserName;
-	/** 娴佺▼褰撳墠鎺ユ敹浜?*/
-	private String currUserName;
-	/** 鎺ユ敹鏃堕棿 */
-	private String jssj;
+    /** task任务ID */
+    private String id;
+    /** 流程代码 */
+    private String processKey;
+    /** 流程名称 */
+    private String processName;
+    /** 流程步骤代码 */
+    private String definitionKey;
+    /** 流程步骤名 */
+    private String definitionName;
+    /** 发送人ID */
+    private String senderID;
+    /** 发送人名称 */
+    private String senderName;
+    /** 发送单位 */
+    private String sendDept;
+    /** 任务描述 */
+    private String description;
+    /** 创建时间 */
+    private String createTime;
+    /** 任务接收时间 */
+    private String receiveTime;
+    /** 流程状态（签收、处理） */
+    private String status;
+    /** 流程编号 */
+    private String pid;
+    /** 任务KEY */
+    private String businessKey;
+    /** 流程发起人 */
+    private String applyUserName;
+    /** 流程当前接收人 */
+    private String currUserName;
+    /** 接收时间 */
+    private String jssj;
 
 	public String getApplyUserName() {
 		return applyUserName;

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/wf/WorkflowMangerService.java

@@ -36,6 +36,12 @@ public interface WorkflowMangerService {
     public static final String KEY_EXECUTION_ID = "executionID";
 
     /**
+     * 部署相关的流程配置
+     * @param xmlPath
+     */
+    public void deploy(String xmlPath);
+
+    /**
      * 提交记录，发起工作流<br>
      * 根据业务主键、流程变量列表、发起人、流程定义发起流程
      * 

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/wf/impl/BaseWorkFlowServiceImpl.java

@@ -0,0 +1,217 @@
+package com.xt.js.gkaq.frame.wf.impl;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.impl.javax.el.MethodNotFoundException;
+import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
+import org.activiti.engine.task.Task;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.common.SinglePageRequest;
+import com.xt.js.gkaq.frame.model.TaskModel;
+import com.xt.js.gkaq.frame.service.TaskModelService;
+import com.xt.js.gkaq.frame.system.Utils;
+import com.xt.js.gkaq.frame.wf.BaseWorkFlowService;
+import com.xt.js.gkaq.frame.wf.WorkFlowParam;
+import com.xt.js.gkaq.frame.wf.WorkflowMangerService;
+import com.yuanxd.tools.io.http.JsonResult;
+
+/**
+ * 工作流服务基类接口<br>
+ * 需要使用工作流的服务实现此接口，并集成WfBaseServiceImpl类
+ * 
+ * @author 袁晓冬
+ * 
+ */
+public abstract class BaseWorkFlowServiceImpl<T extends BaseUUIDModel>
+        extends BaseUUIDModelServiceImpl<T> implements BaseWorkFlowService {
+    /** 工作流服务 */
+    @Autowired
+    protected WorkflowMangerService workflowMangerService;
+    @Autowired
+    protected TaskModelService taskModelService;
+
+    /**
+     * 发布流程
+     */
+    public void deploy(String path) {
+        workflowMangerService.deploy(path);
+    }
+
+    /**
+     * 会签时判断流程是否可以完成
+     * 
+     * @param execution
+     * @return
+     */
+    public Boolean canComplete(ActivityExecution execution) {
+        throw new MethodNotFoundException("error");
+    }
+
+    /**
+     * 签收工作流
+     * 
+     * @param businessKey
+     * @param currentUserName
+     */
+    public void claim(String businessKey, String currentUserName) {
+        Task task = workflowMangerService.getCandidateTaskByUserAndBusKey(currentUserName, businessKey,
+                getProcessDefinitionKey());
+        if (task != null) {
+            workflowMangerService.claim(task.getId(), currentUserName);
+        } else {
+            throw new ActivitiException("task.not.found");
+        }
+    }
+
+    public Map<String, Object> getProcessInstanceVariables(String busId) {
+        return workflowMangerService.getProcessInstanceVariables(busId, getProcessDefinitionKey());
+    }
+
+    public Object getProcessInstanceVariables(String busId, String variableName) {
+        return workflowMangerService.getProcessInstanceVariables(busId, getProcessDefinitionKey(), variableName);
+    }
+
+    /**
+     * 完成任务
+     * 
+     * @param param
+     * @param variables
+     * @return
+     */
+    @Override
+    public List<Task> complete(WorkFlowParam param, Map<String, Object> variables) {
+        if (null == param) {
+            param = new WorkFlowParam();
+        }
+        if (null == variables) {
+            variables = new HashMap<String, Object>();
+        }
+        if (StringUtils.isEmpty(param.get(WorkFlowParam.AUDIT_USER)) && Utils.getCurrentUser() != null) {
+            param.put(WorkFlowParam.AUDIT_USER, Utils.getCurrentUser().getId().toString());
+        }
+        Task task = null;
+        // 流程定义key获取不到
+        Assert.hasLength(getProcessDefinitionKey());
+        param.put(WorkFlowParam.PROCESS_DEFINITIONKEY, getProcessDefinitionKey());
+        String businessKey = param.get(WorkFlowParam.BUSINESS_KEY).toString();
+        if (!StringUtils.hasLength(businessKey)) {
+            task = workflowMangerService.getTaskByTaskId(param.getString(WorkFlowParam.TASK_ID));
+        } else {
+            // 根据业务主键查询当前人签收的任务
+            task = workflowMangerService.getTaskByUserAndBusKey(param.getString(WorkFlowParam.AUDIT_USER),
+                    businessKey, getProcessDefinitionKey());
+        }
+        if (null == task) {
+            throw new ActivitiException("no task found!");
+        }
+        param.put(WorkFlowParam.TASK_DEFINITIONKEY, task.getTaskDefinitionKey());
+        inComplete(param, variables);
+        return workflowMangerService.complete(param, variables, task);
+    }
+
+    /**
+     * 提交记录，发起工作流<br>
+     * 根据业务主键、流程变量列表，发起人发起流程
+     * 
+     * @param param
+     * @param variables
+     */
+    public String create(WorkFlowParam param, Map<String, Object> variables) {
+        String key = getProcessDefinitionKey();
+        Assert.hasLength(key);
+        inCreate(param, variables);
+        String processInstanceId = workflowMangerService.create(param, variables, key);
+        workflowMangerService.autoComplete(param, processInstanceId, variables);
+        return processInstanceId;
+    }
+
+    /**
+     * processDefinitionKey key of process definition, cannot be null.
+     * 
+     * @return processDefinitionKey
+     */
+    public abstract String getProcessDefinitionKey();
+
+    /**
+     * 根据业务ID顺序获取流程任务信息
+     * 
+     * @param budId
+     * @return
+     */
+    public List<TaskModel> getTaskInfoByBusId(String busId) {
+        TaskModel model = new TaskModel();
+        model.setBusId(busId);
+        model.setBusKey(getProcessDefinitionKey());
+        return taskModelService.findAllByCond(model);
+    }
+
+    /**
+     * 根据用户及业务key查询当前任务
+     * 
+     * @param user
+     * @param businessKey
+     * @return
+     */
+    public Task getTaskByUserAndBusKey(String user, String businessKey) {
+        return workflowMangerService.getTaskByUserAndBusKey(user, businessKey, getProcessDefinitionKey());
+    }
+
+    /**
+     * 根据用户及业务key查询当前候选任务
+     * 
+     * @param user
+     * @param businessKey
+     * @return
+     */
+    public Task getCandidateTaskByUserAndBusKey(String user, String businessKey) {
+        return workflowMangerService.getCandidateTaskByUserAndBusKey(user, businessKey, getProcessDefinitionKey());
+    }
+
+    /**
+     * 完成任务
+     * 
+     * @param auditForm
+     * @param variables
+     */
+    public void inComplete(WorkFlowParam auditForm, Map<String, Object> variables) {
+
+    }
+
+    /**
+     * 当调用发起工作流时在此方法内执行业务处理<br>
+     * 如业务数据状态更新.
+     * 
+     * @param auditForm
+     * @param variables
+     */
+    public void inCreate(WorkFlowParam auditForm, Map<String, Object> variables) {
+
+    }
+
+    /**
+     * 待办任务查询列表
+     * 
+     * @param pageRequest
+     * @param busKey
+     * @param begin
+     * @param end
+     * @return
+     */
+    public JsonResult todoList(SinglePageRequest pageRequest, String busKey, Date begin, Date end) {
+        if (busKey != null && busKey.trim().equals("")) {
+            busKey = null;
+        }
+        return workflowMangerService.todoList(pageRequest,
+                String.valueOf(Utils.getCurrentUser().getId()), busKey,
+                Utils.getDateFirstTime(begin), Utils.getDateLastTime(end));
+    }
+}