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

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

@@ -1,7 +1,16 @@
 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.ComboBoxDto;
+import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
 
 public interface JyrjcxxModelMapper extends BaseMapper<JyrjcxxModel> {
+	
+	public List<JyrjcxxModel> selectAll();
+	
+	public List<JyrjcxxInfol> selectList(JyrjcxxModel model);
+	public List<ComboBoxDto> getSelect (String szd);
 }

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

@@ -8,9 +8,9 @@ public class JyrjcxxModel extends BaseUUIDModel {
     /** serialVersionUID  */
     private static final long serialVersionUID = -6835186373605689627L;
 
-    private Short szd;
+    private String szd;
 
-    private Short szgq;
+    private Long szgq;
 
     private String gkjyr;
 
@@ -46,9 +46,9 @@ public class JyrjcxxModel extends BaseUUIDModel {
 
     private String gsyyzzbh;
 
-    private Short tzze;
+    private Long tzze;
 
-    private Short zczb;
+    private Long zczb;
 
     private String gkwxhwzyfzbh;
 
@@ -64,7 +64,7 @@ public class JyrjcxxModel extends BaseUUIDModel {
 
     private String qylb;
 
-    private Short ssqy;
+    private Long ssqy;
 
     private String recordCode;
 
@@ -86,19 +86,19 @@ public class JyrjcxxModel extends BaseUUIDModel {
 
     private String qyzzjgdm;
 
-    private Short sshydl;
+    private Long sshydl;
 
-    private Short sshyz;
+    private Long sshyz;
 
     private String qyaqdj;
 
-    private Short rs;
+    private Long rs;
 
     private String aqzgbm;
 
     private String aqgljg;
 
-    private Short zzagrysl;
+    private Long zzagrysl;
 
     private String zcze;
 
@@ -110,23 +110,23 @@ public class JyrjcxxModel extends BaseUUIDModel {
 
     private String sfzdsp;
 
-    private Short parentJyrId;
+    private Long parentJyrId;
 
-    private Short xzqh;
+    private Long xzqh;
 
-    public Short getSzd() {
+    public String getSzd() {
         return szd;
     }
 
-    public void setSzd(Short szd) {
+    public void setSzd(String szd) {
         this.szd = szd;
     }
 
-    public Short getSzgq() {
+    public Long getSzgq() {
         return szgq;
     }
 
-    public void setSzgq(Short szgq) {
+    public void setSzgq(Long szgq) {
         this.szgq = szgq;
     }
 
@@ -266,19 +266,19 @@ public class JyrjcxxModel extends BaseUUIDModel {
         this.gsyyzzbh = gsyyzzbh == null ? null : gsyyzzbh.trim();
     }
 
-    public Short getTzze() {
+    public Long getTzze() {
         return tzze;
     }
 
-    public void setTzze(Short tzze) {
+    public void setTzze(Long tzze) {
         this.tzze = tzze;
     }
 
-    public Short getZczb() {
+    public Long getZczb() {
         return zczb;
     }
 
-    public void setZczb(Short zczb) {
+    public void setZczb(Long zczb) {
         this.zczb = zczb;
     }
 
@@ -338,11 +338,11 @@ public class JyrjcxxModel extends BaseUUIDModel {
         this.qylb = qylb == null ? null : qylb.trim();
     }
 
-    public Short getSsqy() {
+    public Long getSsqy() {
         return ssqy;
     }
 
-    public void setSsqy(Short ssqy) {
+    public void setSsqy(Long ssqy) {
         this.ssqy = ssqy;
     }
 
@@ -426,19 +426,19 @@ public class JyrjcxxModel extends BaseUUIDModel {
         this.qyzzjgdm = qyzzjgdm == null ? null : qyzzjgdm.trim();
     }
 
-    public Short getSshydl() {
+    public Long getSshydl() {
         return sshydl;
     }
 
-    public void setSshydl(Short sshydl) {
+    public void setSshydl(Long sshydl) {
         this.sshydl = sshydl;
     }
 
-    public Short getSshyz() {
+    public Long getSshyz() {
         return sshyz;
     }
 
-    public void setSshyz(Short sshyz) {
+    public void setSshyz(Long sshyz) {
         this.sshyz = sshyz;
     }
 
@@ -450,11 +450,11 @@ public class JyrjcxxModel extends BaseUUIDModel {
         this.qyaqdj = qyaqdj == null ? null : qyaqdj.trim();
     }
 
-    public Short getRs() {
+    public Long getRs() {
         return rs;
     }
 
-    public void setRs(Short rs) {
+    public void setRs(Long rs) {
         this.rs = rs;
     }
 
@@ -474,11 +474,11 @@ public class JyrjcxxModel extends BaseUUIDModel {
         this.aqgljg = aqgljg == null ? null : aqgljg.trim();
     }
 
-    public Short getZzagrysl() {
+    public Long getZzagrysl() {
         return zzagrysl;
     }
 
-    public void setZzagrysl(Short zzagrysl) {
+    public void setZzagrysl(Long zzagrysl) {
         this.zzagrysl = zzagrysl;
     }
 
@@ -522,19 +522,19 @@ public class JyrjcxxModel extends BaseUUIDModel {
         this.sfzdsp = sfzdsp == null ? null : sfzdsp.trim();
     }
 
-    public Short getParentJyrId() {
+    public Long getParentJyrId() {
         return parentJyrId;
     }
 
-    public void setParentJyrId(Short parentJyrId) {
+    public void setParentJyrId(Long parentJyrId) {
         this.parentJyrId = parentJyrId;
     }
 
-    public Short getXzqh() {
+    public Long getXzqh() {
         return xzqh;
     }
 
-    public void setXzqh(Short xzqh) {
+    public void setXzqh(Long xzqh) {
         this.xzqh = xzqh;
     }
 }

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

@@ -1,8 +1,16 @@
 package com.xt.js.gkaq.dwxx.service;
 
+import java.util.List;
+
 import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
+import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
 
 public interface JyrjcxxService extends BaseService<JyrjcxxModel> {
-
+	public List<JyrjcxxModel> selectAll();
+	
+	public List<JyrjcxxInfol> selectList(JyrjcxxModel model);
+	
+	public List<ComboBoxDto> getSelect (String szd);
 }

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

@@ -1,16 +1,21 @@
 package com.xt.js.gkaq.dwxx.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseServiceImpl;
 import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.dwxx.mappers.JyrjcxxModelMapper;
+import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
+import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
 import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
 
 @Service
-public class JyrjcxxServiceImpl extends BaseUUIDModelServiceImpl<JyrjcxxModel> implements JyrjcxxService {
+public class JyrjcxxServiceImpl extends BaseServiceImpl<JyrjcxxModel> implements JyrjcxxService {
     @Autowired
     private JyrjcxxModelMapper mapper;
 
@@ -19,4 +24,18 @@ public class JyrjcxxServiceImpl extends BaseUUIDModelServiceImpl<JyrjcxxModel> i
         return mapper;
     }
 
+	public List<JyrjcxxModel> selectAll() {
+		List<JyrjcxxModel> list = getMapper().selectAll();
+		return list;
+	}
+
+	public List<JyrjcxxInfol> selectList(JyrjcxxModel model) {
+		List<JyrjcxxInfol> list = mapper.selectList(model);
+		return list;
+	}
+
+	public List<ComboBoxDto> getSelect(String szd) {
+		return mapper.getSelect(szd);
+	}
+
 }

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.xt.js.gkaq.dwxx.mappers.JyrjcxxModelMapper" >
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.dwxx.model.JyrjcxxModel" >
     <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="SZD" property="szd" jdbcType="DECIMAL" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
     <result column="SZGQ" property="szgq" jdbcType="DECIMAL" />
     <result column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
     <result column="QYXZ" property="qyxz" jdbcType="VARCHAR" />
@@ -62,6 +62,77 @@
     <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
     <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
   </resultMap>
+  
+  
+  <resultMap id="JyrResultMap" type="com.xt.js.gkaq.dwxx.model.JyrjcxxInfol" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="TEXT" property="text" jdbcType="VARCHAR" />
+    <result column="GQMC" property="gqmc" jdbcType="VARCHAR" />
+    <result column="SZGQ" property="szgq" jdbcType="DECIMAL" />
+    <result column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
+    <result column="QYXZ" property="qyxz" jdbcType="VARCHAR" />
+    <result column="YZBM" property="yzbm" jdbcType="VARCHAR" />
+    <result column="BGDZ" property="bgdz" jdbcType="VARCHAR" />
+    <result column="GKJYXKZH" property="gkjyxkzh" jdbcType="VARCHAR" />
+    <result column="FZRQ" property="fzrq" jdbcType="TIMESTAMP" />
+    <result column="FZJG" property="fzjg" jdbcType="VARCHAR" />
+    <result column="JYFW" property="jyfw" jdbcType="VARCHAR" />
+    <result column="JYQY" property="jyqy" jdbcType="VARCHAR" />
+    <result column="ZYHZ" property="zyhz" jdbcType="VARCHAR" />
+    <result column="FDDBR" property="fddbr" jdbcType="VARCHAR" />
+    <result column="LXDH" property="lxdh" jdbcType="VARCHAR" />
+    <result column="CZ" property="cz" jdbcType="VARCHAR" />
+    <result column="AQBMFZR" property="aqbmfzr" jdbcType="VARCHAR" />
+    <result column="AQFZRLXDH" property="aqfzrlxdh" jdbcType="VARCHAR" />
+    <result column="AQFZRSJ" property="aqfzrsj" jdbcType="VARCHAR" />
+    <result column="GSYYZZBH" property="gsyyzzbh" jdbcType="VARCHAR" />
+    <result column="TZZE" property="tzze" jdbcType="DECIMAL" />
+    <result column="ZCZB" property="zczb" jdbcType="DECIMAL" />
+    <result column="GKWXHWZYFZBH" property="gkwxhwzyfzbh" jdbcType="VARCHAR" />
+    <result column="GKSSBAFHZSBH" property="gkssbafhzsbh" jdbcType="VARCHAR" />
+    <result column="BAFZJG" property="bafzjg" jdbcType="VARCHAR" />
+    <result column="BAFZRQ" property="bafzrq" jdbcType="TIMESTAMP" />
+    <result column="BAYXQ" property="bayxq" jdbcType="TIMESTAMP" />
+    <result column="ZYWXHWPM" property="zywxhwpm" jdbcType="VARCHAR" />
+    <result column="QYLB" property="qylb" jdbcType="CHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
+    <result column="RECORD_CODE" property="recordCode" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
+    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
+    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
+    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
+    <result column="SFWHQY" property="sfwhqy" jdbcType="CHAR" />
+    <result column="QYLX" property="qylx" jdbcType="CHAR" />
+    <result column="FZYXQ" property="fzyxq" jdbcType="TIMESTAMP" />
+    <result column="QYZZJGDM" property="qyzzjgdm" jdbcType="VARCHAR" />
+    <result column="SSHYDL" property="sshydl" jdbcType="DECIMAL" />
+    <result column="SSHYZ" property="sshyz" jdbcType="DECIMAL" />
+    <result column="QYAQDJ" property="qyaqdj" jdbcType="CHAR" />
+    <result column="RS" property="rs" jdbcType="DECIMAL" />
+    <result column="AQZGBM" property="aqzgbm" jdbcType="VARCHAR" />
+    <result column="AQGLJG" property="aqgljg" jdbcType="VARCHAR" />
+    <result column="ZZAGRYSL" property="zzagrysl" jdbcType="DECIMAL" />
+    <result column="ZCZE" property="zcze" jdbcType="VARCHAR" />
+    <result column="XSJE" property="xsje" jdbcType="VARCHAR" />
+    <result column="AQFZRZBDH" property="aqfzrzbdh" jdbcType="VARCHAR" />
+    <result column="GJJGDM" property="gjjgdm" jdbcType="VARCHAR" />
+    <result column="SFZDSP" property="sfzdsp" jdbcType="CHAR" />
+    <result column="PARENT_JYR_ID" property="parentJyrId" jdbcType="DECIMAL" />
+    <result column="XZQH" property="xzqh" jdbcType="DECIMAL" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="STATE" property="state" jdbcType="CHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.frame.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="DECIMAL" />
+    <result column="GKJYR" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
+  
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_DWXX_JYRJCXX
     where ID = #{id,jdbcType=VARCHAR}
@@ -86,7 +157,7 @@
       PARENT_JYR_ID, XZQH, CREATE_TIME, 
       UPDATE_TIME, STATE, CREATE_USER, 
       UPDATE_USER)
-    values (#{id,jdbcType=VARCHAR}, #{szd,jdbcType=DECIMAL}, #{szgq,jdbcType=DECIMAL}, 
+    values (#{id,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, #{szgq,jdbcType=DECIMAL}, 
       #{gkjyr,jdbcType=VARCHAR}, #{qyxz,jdbcType=VARCHAR}, #{yzbm,jdbcType=VARCHAR}, 
       #{bgdz,jdbcType=VARCHAR}, #{gkjyxkzh,jdbcType=VARCHAR}, #{fzrq,jdbcType=TIMESTAMP}, 
       #{fzjg,jdbcType=VARCHAR}, #{jyfw,jdbcType=VARCHAR}, #{jyqy,jdbcType=VARCHAR}, #{zyhz,jdbcType=VARCHAR}, 
@@ -108,7 +179,7 @@
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.dwxx.model.JyrjcxxModel" >
     update AQ_BASIC_DWXX_JYRJCXX
-    set SZD = #{szd,jdbcType=DECIMAL},
+    set SZD = #{szd,jdbcType=VARCHAR},
       SZGQ = #{szgq,jdbcType=DECIMAL},
       GKJYR = #{gkjyr,jdbcType=VARCHAR},
       QYXZ = #{qyxz,jdbcType=VARCHAR},
@@ -187,4 +258,63 @@
     UPDATE_TIME, STATE, CREATE_USER, UPDATE_USER
     from AQ_BASIC_DWXX_JYRJCXX
   </select>
+  
+  <select id="getSelect" resultMap="ComboBoxMap" parameterType="java.lang.String" >
+    select ID, GKJYR
+    from AQ_BASIC_DWXX_JYRJCXX
+    where SZD = #{szd,jdbcType=VARCHAR}
+  </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, 
+		    JYR.ZYHZ, JYR.FDDBR, JYR.LXDH, JYR.CZ, JYR.AQBMFZR, JYR.AQFZRLXDH, JYR.AQFZRSJ, JYR.GSYYZZBH, JYR.TZZE, JYR.ZCZB, JYR.GKWXHWZYFZBH, 
+		    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
+	    from AQ_BASIC_DWXX_JYRJCXX JYR
+	    
+		LEFT JOIN T_YJPT_GQ GQ ON JYR.SZGQ = GQ."ID"
+		LEFT JOIN AQ_BASIC_FRAME_CODE CODE ON CODE.VAL = JYR.SZD
+		
+		<where>
+			<if test="id != null and id != '' ">
+				JYR.ID = #{id,jdbcType=VARCHAR}
+			</if>
+			<if test="szd != null and szd != '' ">
+				AND JYR.SZD = #{szd,jdbcType=VARCHAR}
+			</if>
+			<if test="szgq !=null and szgq != '' ">
+				AND JYR.SZGQ = #{szgq,jdbcType=DECIMAL}
+			</if>
+			<if test="qylx != null and qylx != '' ">
+				AND JYR.QYLX = #{qylx,jdbcType=VARCHAR}
+			</if>
+			<if test="gkjyr != null and gkjyr != '' ">
+				AND JYR.GKJYR LIKE CONCAT(CONCAT('%', #{gkjyr, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="fddbr != null and fddbr != '' ">
+				AND JYR.FDDBR LIKE CONCAT(CONCAT('%', #{fddbr, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="sfwhqy != null and sfwhqy != '' ">
+				AND JYR.SFWHQY = #{sfwhqy,jdbcType=CHAR}
+			</if>
+			<if test="byzd1 != null and byzd1 != '' ">
+				AND JYR.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd1, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="byzd2 != null and byzd2 != '' ">
+				AND JYR.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd2, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="byzd3 != null and byzd3 != '' ">
+				AND JYR.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd3, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="byzd4 != null and byzd4 != '' ">
+				AND JYR.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd4, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="byzd5 != null and byzd5 != '' ">
+				AND JYR.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd5, jdbcType=VARCHAR}),'%')
+			</if>
+		</where>
+  </select>
+  
 </mapper>