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

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

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

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

@@ -0,0 +1,95 @@
+package com.xt.js.gkaq.dwxx.model;
+
+import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
+
+public class JyrInfoExcelModel extends JyrjcxxModel {
+
+	private String gkjyr;
+	private String byzd1;
+	private String sfwhqy;
+	private String sfwhqy2;
+	private String gkjyxkzh;
+	private String gkssbafhzsbh;
+	private String jyfw;
+	private String fddbr;
+	private String aqbmfzr;
+	private String aqfzrzbdh;
+	private String text;
+	private String gqmc;
+	
+	
+	public String getSfwhqy2() {
+		return sfwhqy2;
+	}
+	public void setSfwhqy2(String sfwhqy2) {
+		this.sfwhqy2 = sfwhqy2;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getSfwhqy() {
+		return sfwhqy;
+	}
+	public void setSfwhqy(String sfwhqy) {
+		this.sfwhqy = sfwhqy;
+	}
+	public String getGkjyxkzh() {
+		return gkjyxkzh;
+	}
+	public void setGkjyxkzh(String gkjyxkzh) {
+		this.gkjyxkzh = gkjyxkzh;
+	}
+	public String getGkssbafhzsbh() {
+		return gkssbafhzsbh;
+	}
+	public void setGkssbafhzsbh(String gkssbafhzsbh) {
+		this.gkssbafhzsbh = gkssbafhzsbh;
+	}
+	public String getJyfw() {
+		return jyfw;
+	}
+	public void setJyfw(String jyfw) {
+		this.jyfw = jyfw;
+	}
+	public String getFddbr() {
+		return fddbr;
+	}
+	public void setFddbr(String fddbr) {
+		this.fddbr = fddbr;
+	}
+	public String getAqbmfzr() {
+		return aqbmfzr;
+	}
+	public void setAqbmfzr(String aqbmfzr) {
+		this.aqbmfzr = aqbmfzr;
+	}
+	public String getAqfzrzbdh() {
+		return aqfzrzbdh;
+	}
+	public void setAqfzrzbdh(String aqfzrzbdh) {
+		this.aqfzrzbdh = aqfzrzbdh;
+	}
+	public String getText() {
+		return text;
+	}
+	public void setText(String text) {
+		this.text = text;
+	}
+	public String getGqmc() {
+		return gqmc;
+	}
+	public void setGqmc(String gqmc) {
+		this.gqmc = gqmc;
+	}
+	
+    
+}

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

@@ -5,10 +5,13 @@ import java.util.Date;
 import com.xt.js.gkaq.common.BaseUUIDModel;
 
 public class JyrjcxxInfol extends JyrjcxxModel {
-    /** serialVersionUID  */
-    private static final long serialVersionUID = -6835186373605689627L;
 
-    private String szd;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1883660895535594754L;
+
+	private String szd;
     
     private String text;
     

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.xt.js.gkaq.common.BaseService;
 import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.dwxx.model.ComboBoxDto;
+import com.xt.js.gkaq.dwxx.model.JyrInfoExcelModel;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
 
@@ -13,5 +14,7 @@ public interface JyrjcxxService extends BaseUUIDModelService<JyrjcxxModel> {
 	
 	public List<JyrjcxxInfol> selectList(JyrjcxxModel model);
 	
+	public List<JyrInfoExcelModel> selectExcelList(JyrjcxxModel model);
+	
 	public List<ComboBoxDto> getSelect (String szd);
 }

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

@@ -10,6 +10,7 @@ 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.JyrInfoExcelModel;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
 import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
@@ -38,4 +39,9 @@ public class JyrjcxxServiceImpl extends BaseUUIDModelServiceImpl<JyrjcxxModel> i
 		return mapper.getSelect(szd);
 	}
 
+	public List<JyrInfoExcelModel> selectExcelList(JyrjcxxModel model) {
+		List<JyrInfoExcelModel> list = mapper.selectExcelList(model);
+		return list;
+	}
+
 }

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

@@ -62,7 +62,21 @@
     <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
     <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
   </resultMap>
-  
+  <resultMap id="JyrExcelResultMap" type="com.xt.js.gkaq.dwxx.model.JyrInfoExcelModel" >
+  	<id column="ID" property="id" jdbcType="VARCHAR" />
+  	<result column="TEXT" property="text" jdbcType="VARCHAR" />
+    <result column="GQMC" property="gqmc" jdbcType="VARCHAR" />
+    <result column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
+    <result column="GKJYXKZH" property="gkjyxkzh" jdbcType="VARCHAR" />
+    <result column="JYFW" property="jyfw" jdbcType="VARCHAR" />
+    <result column="FDDBR" property="fddbr" jdbcType="VARCHAR" />
+    <result column="AQBMFZR" property="aqbmfzr" jdbcType="VARCHAR" />
+    <result column="GKSSBAFHZSBH" property="gkssbafhzsbh" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="SFWHQY" property="sfwhqy" jdbcType="CHAR" />
+    <result column="ZDWXY" property="sfwhqy2" jdbcType="CHAR" />
+    <result column="AQFZRZBDH" property="aqfzrzbdh" jdbcType="VARCHAR" />
+  </resultMap>
   
   <resultMap id="JyrResultMap" type="com.xt.js.gkaq.dwxx.model.JyrjcxxInfol" >
     <id column="ID" property="id" jdbcType="VARCHAR" />
@@ -117,7 +131,7 @@
     <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="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" />
@@ -128,8 +142,8 @@
     <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" />
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.dwxx.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="VARCHAR" />
     <result column="GKJYR" property="optName" jdbcType="VARCHAR" />
   </resultMap>
   
@@ -262,7 +276,11 @@
   <select id="getSelect" resultMap="ComboBoxMap" parameterType="java.lang.String" >
     select ID, GKJYR
     from AQ_BASIC_DWXX_JYRJCXX
-    where SZD = #{szd,jdbcType=VARCHAR}
+    <where>
+    	<if test="szd != null and szd != ''">
+    		SZD = #{szd,jdbcType=VARCHAR}
+    	</if>
+    </where>
   </select>
   
   <select id="selectList" resultMap="JyrResultMap" parameterType="com.xt.js.gkaq.dwxx.model.JyrjcxxModel" >
@@ -273,7 +291,57 @@
 		    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>
+				JYR.STATE != '9'
+			<if test="id != null and id != '' ">
+				AND 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>
+  <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.JYFW, JYR.FDDBR, JYR.AQBMFZR, JYR.AQFZRZBDH, CODE.TEXT, GQ.GQMC
+		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
 		
@@ -317,5 +385,4 @@
 			</if>
 		</where>
   </select>
-  
 </mapper>