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

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

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.web.mappers.BloBModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.BloBModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="VALUE" property="value" jdbcType="BLOB" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+
+
+    <result column="SFTB" property="sftb" jdbcType="CHAR" />
+    <result column="TBZT" property="tbzt" jdbcType="CHAR" />
+    <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
+    <result column="QYLB" property="qylb" jdbcType="CHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
+    <result column="RECORD_CODE" property="recordcode" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
+    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
+    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
+    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
+  	<result column="RECORD_STATUS" property="state" jdbcType="DECIMAL" />
+    <result column="ADD_DATE" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_DATE" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="ADD_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.dwxx.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="DECIMAL" />
+    <result column="GQMC" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    DELETE from AQ_BASIC_BLOB
+    WHERE ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.RyzsbModel" >
+    insert into AQ_BASIC_BLOB (ID,SZD,VALUE,
+								ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+								TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,
+								BYZD1,BYZD2,BYZD3,BYZD4,BYZD5)
+    values (#{id,jdbcType=VARCHAR},
+    		#{szd,jdbcType=VARCHAR}, 
+     		#{value,jdbcType=BLOB},
+     		
+     		#{createUser,jdbcType=VARCHAR}, 
+     		#{createTime,jdbcType=TIMESTAMP}, 
+     		#{updateUser,jdbcType=VARCHAR}, 
+     		#{updateTime,jdbcType=TIMESTAMP}, 
+     		#{state,jdbcType=DECIMAL},
+     		#{sftb,jdbcType=VARCHAR}, 
+     		#{tbzt,jdbcType=VARCHAR}, 
+     		#{tbdyid,jdbcType=DECIMAL}, 
+     		#{qylb,jdbcType=VARCHAR}, 
+     		#{ssqy,jdbcType=DECIMAL}, 
+     		#{recordcode,jdbcType=VARCHAR}, 
+     		#{byzd1,jdbcType=VARCHAR},
+     		#{byzd2,jdbcType=VARCHAR},
+     		#{byzd3,jdbcType=VARCHAR}, 
+     		#{byzd4,jdbcType=VARCHAR}, 
+     		#{byzd5,jdbcType=VARCHAR}
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.RyzsbModel" >
+    update AQ_BASIC_BLOB
+    set SZD = #{szd,jdbcType=VARCHAR},  
+      	VALUE = #{value,jdbcType=BLOB}, 
+		  
+		ADD_USER = #{createUser,jdbcType=VARCHAR}, 
+		ADD_DATE = #{createTime,jdbcType=TIMESTAMP}, 
+		UPDATE_USER = #{updateUser,jdbcType=VARCHAR}, 
+		UPDATE_DATE = #{updateTime,jdbcType=TIMESTAMP}, 
+		RECORD_STATUS = #{state,jdbcType=DECIMAL},
+		SFTB = #{sftb,jdbcType=VARCHAR}, 
+		TBZT = #{tbzt,jdbcType=VARCHAR}, 
+		TBDYID = #{tbdyid,jdbcType=DECIMAL}, 
+		QYLB = #{qylb,jdbcType=VARCHAR}, 
+		SSQY = #{ssqy,jdbcType=DECIMAL}, 
+		RECORD_CODE = #{recordcode,jdbcType=VARCHAR}, 
+		BYZD1 = #{byzd1,jdbcType=VARCHAR},
+		BYZD2 = #{byzd2,jdbcType=VARCHAR},
+		BYZD3 = #{byzd3,jdbcType=VARCHAR}, 
+		BYZD4 = #{byzd4,jdbcType=VARCHAR}, 
+		BYZD5 = #{byzd5,jdbcType=VARCHAR}
+	
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+   SELECT ID,SZD,VALUE,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,
+			BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	FROM
+			AQ_BASIC_BLOB
+	WHERE ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+     SELECT ID,SZD,VALUE,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,
+			BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	FROM
+			AQ_BASIC_BLOB
+  </select>
+  <!-- <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.RyzsbModel">
+	  SELECT ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	  FROM AQ_BASIC_DWXX_RYZSB
+	<where>
+			RECORD_STATUS != '9'
+			<if test="id != null and id != '' ">
+				AND ID = #{id,jdbcType=VARCHAR}
+			</if>
+			<if test="ryid != null and ryid != '' ">
+				AND RYID = #{ryid,jdbcType=VARCHAR}
+			</if>
+			
+	</where>
+  </select> -->
+</mapper>

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

@@ -36,7 +36,7 @@
     <result column="BWDM" property="bwdm" jdbcType="VARCHAR" />
     <result column="JGXS2" property="jgxs2" jdbcType="DECIMAL" />
     <result column="SFTB" property="sftb" jdbcType="CHAR" />
-    <result column="TBZT" property="TBZT" jdbcType="CHAR" />
+    <result column="TBZT" property="tbzt" jdbcType="CHAR" />
     <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
     <result column="QYLB" property="qylb" jdbcType="CHAR" />
     <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />

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

@@ -3,17 +3,17 @@
 <mapper namespace="com.xt.js.gkaq.web.mappers.JyrTjcxMapper" >
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.TjcxModel" >
     <id column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
-    <result column="SYHGMT" property="syhgmt" jdbcType="DECIMAL" />
-    <result column="WXHW" property="wxhw" jdbcType="DECIMAL" />
-    <result column="PH" property="ph" jdbcType="DECIMAL" />
-    <result column="JZX" property="jzx" jdbcType="DECIMAL" />
-    <result column="WD" property="wd" jdbcType="DECIMAL" />
-    <result column="WDYX" property="wdyx" jdbcType="DECIMAL" />
-    <result column="QD" property="qd" jdbcType="DECIMAL" />
+    <result column="SYHGMT" property="syhgmt" jdbcType="VARCHAR" />
+    <result column="WXHW" property="wxhw" jdbcType="VARCHAR" />
+    <result column="PH" property="ph" jdbcType="VARCHAR" />
+    <result column="JZX" property="jzx" jdbcType="VARCHAR" />
+    <result column="WD" property="wd" jdbcType="VARCHAR" />
+    <result column="WDYX" property="wdyx" jdbcType="VARCHAR" />
+    <result column="QD" property="qd" jdbcType="VARCHAR" />
     <result column="QDYX" property="qdyx" jdbcType="DECIMAL" />
-    <result column="SL" property="sl" jdbcType="DECIMAL" />
-    <result column="WXSJ" property="wxsj" jdbcType="DECIMAL" />
-    <result column="RL" property="rl" jdbcType="DECIMAL" />
+    <result column="SL" property="sl" jdbcType="VARCHAR" />
+    <result column="WXSJ" property="wxsl" jdbcType="VARCHAR" />
+    <result column="RL" property="rj" jdbcType="VARCHAR" />
   </resultMap>
 
   <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.TjcxModel">
@@ -60,10 +60,10 @@
 				AND J.QYLX = #{qylx,jdbcType=VARCHAR}
 			</if>
 			<if test="qstime != null and qstime != '' ">
-				AND <![CDATA[J.CREATE_TIME >= #{qstime,jdbcType=TIMESTAMP}]]>
+				AND <![CDATA[J.CREATE_TIME >= "TO_TIMESTAMP"(#{qstime,jdbcType=TIMESTAMP},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 			</if>
 			<if test="jstime != null and jstime != '' ">
-				AND <![CDATA[J.CREATE_TIME < #{jstime,jdbcType=TIMESTAMP}]]>
+				AND <![CDATA[J.CREATE_TIME < "TO_TIMESTAMP"(#{jstime,jdbcType=TIMESTAMP},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 			</if>
 	</where>
   </select>

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

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

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.xt.js.gkaq.web.mappers.JyrWxhwtjcxMapper" >
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.WxhwtjcxModel" >
     <id column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
-    <result column="BZ" property="bz" jdbcType="VARCHAR" />
+    <result column="TEXT" property="bz" jdbcType="VARCHAR" />
     <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
     <result column="BWMC" property="bwmc" jdbcType="VARCHAR" />
     <result column="WD" property="wd" jdbcType="DECIMAL" />
@@ -20,62 +20,62 @@
   <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.WxhwtjcxModel">
 	SELECT 
 		J.GKJYR,
-		G.BZ, 
+		G.TEXT, 
 		J.BYZD1,
-		(SELECT WM_CONCAT(BWMC) AS MC FROM T_YJPT_JYRXX_BW 
+		(SELECT WM_CONCAT(BWMC) AS MC FROM AQ_BASIC_DWXX_BW 
 				WHERE RECORD_STATUS = '1' AND QYMC = J."ID") AS BWMC, 
-		(SELECT "SUM"(1) FROM T_YJPT_JYRXX_BW  B 
+		(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW  B 
 				WHERE <![CDATA["TO_NUMBER"(B.SJKPNL) >=1]]> AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') AS WD,
-		(SELECT "SUM"(1) FROM T_YJPT_JYRXX_BW  B 
+		(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW  B 
 				WHERE "TO_NUMBER"(B.SJKPNL) >= 0.1 AND
 				 <![CDATA["TO_NUMBER"(B.SJKPNL) <1]]> AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') AS QD,
-		(SELECT NVL(SUM(T.ZYSL),0) FROM T_YJPT_WXHWGKZYSBD T 
+		(SELECT NVL(SUM(T.ZYSL),0) FROM AQ_BASIC_DWXX_WXHWGKZYSBD T 
 				WHERE (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND T.QXZYSJ IS NULL AND T.INOROUT IS NOT NULL AND T.ZYDW=J."ID"
-				<if test="zydd != null and zydd != ''">
-					AND T.ZYDD=#{zydd,jdbcType=VARCHAR}
+				<if test="szd != null and szd != ''">
+					AND T.ZYDD=#{szd,jdbcType=VARCHAR}
 				</if>
 				<if test="kssj != null and kssj != ''">
-					<![CDATA[AND BGSJ>=#{kssj,jdbcType=VARCHAR}]]>
+					<![CDATA[AND BGSJ>="TO_TIMESTAMP"(#{kssj,jdbcType=VARCHAR},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 				</if>			
-				<if test="jssj != null jssj != ''">
-					<![CDATA[AND BGSJ<=#{jssj,jdbcType=VARCHAR}]]>
+				<if test="jssj != null and jssj != ''">
+					<![CDATA[AND BGSJ<="TO_TIMESTAMP"(#{jssj,jdbcType=VARCHAR},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 				</if>
 				) AS TTL,
-		(SELECT NVL(SUM(T.TEU),0) FROM T_YJPT_WXHWGKZYSBD T 
+		(SELECT NVL(SUM(T.TEU),0) FROM AQ_BASIC_DWXX_WXHWGKZYSBD T 
 				WHERE (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND T.QXZYSJ IS NULL AND T.INOROUT IS NOT NULL  AND T.ZYDW=J."ID"
-				<if test="zydd != null and zydd != ''">
-					AND T.ZYDD=#{zydd,jdbcType=VARCHAR}
+				<if test="szd != null and szd != ''">
+					AND T.ZYDD=#{szd,jdbcType=VARCHAR}
 				</if>
 				<if test="kssj != null and kssj != ''">
-					<![CDATA[AND BGSJ>=#{kssj,jdbcType=VARCHAR}]]>
+					<![CDATA[AND BGSJ>="TO_TIMESTAMP"(#{kssj,jdbcType=VARCHAR},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 				</if>			
-				<if test="jssj != null jssj != ''">
-					<![CDATA[AND BGSJ<=#{jssj,jdbcType=VARCHAR}]]>
+				<if test="jssj != null and jssj != ''">
+					<![CDATA[AND BGSJ<="TO_TIMESTAMP"(#{jssj,jdbcType=VARCHAR},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 				</if>
 				) AS JZXTTL,
 		GQ.GQMC,
-		(SELECT WM_CONCAT(B.HCKPNL||'*'||COUNT(ROWNUM)) AS S FROM T_YJPT_JYRXX_BW B 
+		(SELECT WM_CONCAT(B.HCKPNL||'*'||COUNT(ROWNUM)) AS S FROM AQ_BASIC_DWXX_BW B 
 				WHERE  B.RECORD_STATUS!='9' AND B.WXPBW ='Y' AND B.QYMC=J."ID" GROUP BY B.HCKPNL)AS GM,
-		(SELECT GKWXHWZYFZBH FROM T_YJPT_JYRJCXX WHERE RECORD_STATUS != '9' AND ID = J."ID") AS SFFZ,
-		(SELECT WM_CONCAT(T.WXHWMCBH||':'||NVL(SUM(T.ZYSL),0)||'吨') FROM T_YJPT_WXHWGKZYSBD T 
+		(SELECT GKWXHWZYFZBH FROM AQ_BASIC_DWXX_JYRJCXX WHERE STATE != '9' AND ID = J."ID") AS SFFZ,
+		(SELECT WM_CONCAT(T.WXHWMCBH||':'||NVL(SUM(T.ZYSL),0)||'吨') FROM AQ_BASIC_DWXX_WXHWGKZYSBD T 
 				WHERE (T.RECORD_STATUS = 2 OR T.RECORD_STATUS = 10) AND T.QXZYSJ IS NULL AND T.ZYDW=J."ID" 
-				<if test="zydd != null and zydd != ''">
-					AND T.ZYDD=#{zydd,jdbcType=VARCHAR}
+				<if test="szd != null and szd != ''">
+					AND T.ZYDD=#{szd,jdbcType=VARCHAR}
 				</if>
 				<if test="kssj != null and kssj != ''">
-					<![CDATA[AND BGSJ>=#{kssj,jdbcType=VARCHAR}]]>
+					<![CDATA[AND BGSJ>="TO_TIMESTAMP"(#{kssj,jdbcType=VARCHAR},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 				</if>			
-				<if test="jssj != null jssj != ''">
-					<![CDATA[AND BGSJ<=#{jssj,jdbcType=VARCHAR}]]>
+				<if test="jssj != null and jssj != ''">
+					<![CDATA[AND BGSJ<="TO_TIMESTAMP"(#{jssj,jdbcType=VARCHAR},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 				</if>
 				GROUP BY T.WXHWMCBH) AS HZ,  
 		J.QYLX
-	FROM T_YJPT_JYRJCXX J
+	FROM AQ_BASIC_DWXX_JYRJCXX J
 	LEFT JOIN T_YJPT_GQ GQ ON GQ."ID" = J.SZGQ
-	LEFT JOIN T_YJPT_GGDM G ON G."ID" = J.SZD
+	LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.VAL = J.SZD
 		
 	<where>
-			J.RECORD_STATUS != '9'
+			J.STATE != '9'
 			<if test="szd != null and szd != '' ">
 				AND J.SZD =#{szd,jdbcType=VARCHAR}
 			</if>
@@ -83,20 +83,39 @@
 				AND J.QYLX = #{qylx,jdbcType=VARCHAR}
 			</if>
 			<if test="kssj != null and kssj != '' ">
-				AND <![CDATA[J.ADD_DATE >= #{kssj,jdbcType=TIMESTAMP}]]>
+				AND <![CDATA[J.CREATE_TIME >= "TO_TIMESTAMP"(#{kssj,jdbcType=TIMESTAMP},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 			</if>
 			<if test="jssj != null and jssj != '' ">
-				AND <![CDATA[J.ADD_DATE < #{jssj,jdbcType=TIMESTAMP}]]>
-			</if>
-			<if test="byzd1 != null and byzd1 != ''">
-				AND J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd1, jdbcType=VARCHAR}),'%')
-			</if>
-			<if test="byzd2 != null and byzd2 != ''">
-				 OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd2, jdbcType=VARCHAR}),'%')
-			</if>
-			<if test="byzd3 != null and byzd3 != ''">
-				OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd3, jdbcType=VARCHAR}),'%')
+				AND <![CDATA[J.CREATE_TIME < "TO_TIMESTAMP"(#{jssj,jdbcType=TIMESTAMP},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
 			</if>
+			<choose>
+				<when test="byzd1 != null and byzd1 != '' and byzd2 != null and byzd2 != '' and byzd3 != null and byzd3 != ''">
+					AND (J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd1, jdbcType=VARCHAR}),'%')
+					OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd2, jdbcType=VARCHAR}),'%')
+					OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd3, jdbcType=VARCHAR}),'%'))
+				</when>
+				<when test="byzd1 != null and byzd1 != '' and byzd2 != null and byzd2 != ''">
+					AND (J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd1, jdbcType=VARCHAR}),'%')
+					OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd2, jdbcType=VARCHAR}),'%'))
+				</when>
+				<when test="byzd2 != null and byzd2 != '' and byzd3 != null and byzd3 != ''">
+					AND (J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd2, jdbcType=VARCHAR}),'%')
+					OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd3, jdbcType=VARCHAR}),'%'))
+				</when>
+				<when test="byzd1 != null and byzd1 != '' and byzd3 != null and byzd3 != ''">
+					AND (J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd1, jdbcType=VARCHAR}),'%')
+					OR J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd3, jdbcType=VARCHAR}),'%'))
+				</when>
+				<when test="byzd1 != null and byzd1 != ''">
+					AND J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd1, jdbcType=VARCHAR}),'%')
+				</when>
+				<when test="byzd2 != null and byzd2 != ''">
+					AND J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd2, jdbcType=VARCHAR}),'%')
+				</when>
+				<when test="byzd3 != null and byzd3 != ''">
+					AND J.BYZD1 LIKE CONCAT(CONCAT('%', #{byzd3, jdbcType=VARCHAR}),'%')
+				</when>
+			</choose>
 	</where>
   </select>
 

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

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.web.mappers.RyzsbModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.RyzsbModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="RYID" property="ryid" jdbcType="VARCHAR" />
+    <result column="ZSMC" property="zsmc" jdbcType="VARCHAR" />
+    <result column="ZSZL" property="zszl" jdbcType="VARCHAR" />
+    <result column="ZSBH" property="zsbh" jdbcType="VARCHAR" />
+    <result column="YXQ" property="yxq" jdbcType="TIMESTAMP" />
+    <result column="BZ" property="bz" jdbcType="VARCHAR" />
+    <result column="ZSNR" property="zsnr" jdbcType="VARCHAR" />
+
+    <result column="SFTB" property="sftb" jdbcType="CHAR" />
+    <result column="TBZT" property="tbzt" jdbcType="CHAR" />
+    <result column="TBDYID" property="tbdyid" jdbcType="DECIMAL" />
+    <result column="QYLB" property="qylb" jdbcType="CHAR" />
+    <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
+    <result column="RECORD_CODE" property="recordcode" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
+    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
+    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
+    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
+  	<result column="RECORD_STATUS" property="state" jdbcType="DECIMAL" />
+    <result column="ADD_DATE" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_DATE" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="ADD_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <resultMap id="ComboBoxMap" type="com.xt.js.gkaq.dwxx.model.ComboBoxDto" >
+    <result column="ID" property="optVal" jdbcType="DECIMAL" />
+    <result column="GQMC" property="optName" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    DELETE from AQ_BASIC_DWXX_RYZSB
+    WHERE ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.web.model.RyzsbModel" >
+    insert into AQ_BASIC_DWXX_RYZSB (ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,
+									ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+									SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5)
+    values (#{id,jdbcType=VARCHAR},
+    		#{szd,jdbcType=VARCHAR}, 
+     		#{zsnr,jdbcType=VARCHAR},
+     		#{ryid,jdbcType=VARCHAR}, 
+     		#{zsmc,jdbcType=VARCHAR}, 
+     		#{zszl,jdbcType=VARCHAR}, 
+     		#{zsbh,jdbcType=VARCHAR}, 
+     		#{yxq,jdbcType=TIMESTAMP}, 
+     		#{bz,jdbcType=VARCHAR}, 
+     		
+     		#{createUser,jdbcType=VARCHAR}, 
+     		#{createTime,jdbcType=TIMESTAMP}, 
+     		#{updateUser,jdbcType=VARCHAR}, 
+     		#{updateTime,jdbcType=TIMESTAMP}, 
+     		#{state,jdbcType=DECIMAL},
+     		#{sftb,jdbcType=VARCHAR}, 
+     		#{tbzt,jdbcType=VARCHAR}, 
+     		#{tbdyid,jdbcType=DECIMAL}, 
+     		#{qylb,jdbcType=VARCHAR}, 
+     		#{ssqy,jdbcType=DECIMAL}, 
+     		#{recordcode,jdbcType=VARCHAR}, 
+     		#{byzd1,jdbcType=VARCHAR},
+     		#{byzd2,jdbcType=VARCHAR},
+     		#{byzd3,jdbcType=VARCHAR}, 
+     		#{byzd4,jdbcType=VARCHAR}, 
+     		#{byzd5,jdbcType=VARCHAR}
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.RyzsbModel" >
+    update AQ_BASIC_DWXX_RYZSB
+    set SZD = #{szd,jdbcType=VARCHAR},  
+      	ZSNR = #{zsnr,jdbcType=VARCHAR}, 
+		RYID = #{ryid,jdbcType=VARCHAR}, 
+		ZSMC = #{zsmc,jdbcType=VARCHAR}, 
+		ZSZL = #{zszl,jdbcType=VARCHAR}, 
+		ZSBH = #{zsbh,jdbcType=VARCHAR}, 
+		yxq = #{yxq,jdbcType=TIMESTAMP},
+		bz = #{bz,jdbcType=VARCHAR},   
+		ADD_USER = #{createUser,jdbcType=VARCHAR}, 
+		ADD_DATE = #{createTime,jdbcType=TIMESTAMP}, 
+		UPDATE_USER = #{updateUser,jdbcType=VARCHAR}, 
+		UPDATE_DATE = #{updateTime,jdbcType=TIMESTAMP}, 
+		RECORD_STATUS = #{state,jdbcType=DECIMAL},
+		SFTB = #{sftb,jdbcType=VARCHAR}, 
+		TBZT = #{tbzt,jdbcType=VARCHAR}, 
+		TBDYID = #{tbdyid,jdbcType=DECIMAL}, 
+		QYLB = #{qylb,jdbcType=VARCHAR}, 
+		SSQY = #{ssqy,jdbcType=DECIMAL}, 
+		RECORD_CODE = #{recordcode,jdbcType=VARCHAR}, 
+		BYZD1 = #{byzd1,jdbcType=VARCHAR},
+		BYZD2 = #{byzd2,jdbcType=VARCHAR},
+		BYZD3 = #{byzd3,jdbcType=VARCHAR}, 
+		BYZD4 = #{byzd4,jdbcType=VARCHAR}, 
+		BYZD5 = #{byzd5,jdbcType=VARCHAR}
+	
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+   SELECT ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	FROM
+			AQ_BASIC_DWXX_RYZSB
+	WHERE ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+     SELECT ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	FROM
+			AQ_BASIC_DWXX_RYZSB
+  </select>
+  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.RyzsbModel">
+	  SELECT ID,SZD,ZSNR,RYID,ZSMC,ZSZL,ZSBH,YXQ,BZ,
+			ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
+			SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5
+	  FROM AQ_BASIC_DWXX_RYZSB
+	<where>
+			RECORD_STATUS != '9'
+			<if test="id != null and id != '' ">
+				AND ID = #{id,jdbcType=VARCHAR}
+			</if>
+			<if test="ryid != null and ryid != '' ">
+				AND RYID = #{ryid,jdbcType=VARCHAR}
+			</if>
+			
+	</where>
+  </select>
+</mapper>

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

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.web.mappers.WxcgtjcxMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.WxcgtjcxModel" >
+    <id column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
+    <result column="TEXT" property="bz" jdbcType="VARCHAR" />
+    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
+    
+    <result column="SL" property="sl" jdbcType="VARCHAR" />
+    <result column="RJ" property="rj" jdbcType="DECIMAL" />
+    <result column="XHGS" property="xhgs" jdbcType="DECIMAL" />
+
+    <result column="WXSL" property="wxsl" jdbcType="VARCHAR" />
+    <result column="HZ" property="hz" jdbcType="VARCHAR" />
+    <result column="QYLX" property="qylx" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.WxcgtjcxModel">
+		SELECT 
+			J.GKJYR,
+			G.TEXT, 
+			J.BYZD1,
+			(SELECT "SUM"(C.CGGS) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+				AS SL,
+			(SELECT "SUM"(C.CGRJ) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+				AS RJ,
+			(SELECT WM_CONCAT('0'||C.CGRJ||'*'||SUM(C.CGGS)||'个') FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID
+				GROUP BY C.CGRJ
+			) AS XHGS,
+			(SELECT WM_CONCAT(T.WXHWMCBH||':'||NVL(SUM(T.ZYSL),0)||'吨') FROM AQ_BASIC_DWXX_WXHWGKZYSBD T 
+					WHERE (T.RECORD_STATUS = 2 OR T.RECORD_STATUS = 10) AND T.QXZYSJ IS NULL AND T.ZYDW=J."ID" 
+					GROUP BY T.WXHWMCBH) AS HZ,  
+			(SELECT "SUM"(C.ZDWXYCGGS) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+				AS WXSL,
+			J.QYLX
+		FROM AQ_BASIC_DWXX_JYRJCXX J
+		LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.VAL = J.SZD
+	<where>
+			J.STATE != '9'
+			<if test="szd != null and szd != '' ">
+				AND J.SZD =#{szd,jdbcType=VARCHAR}
+			</if>
+			<if test="qylx != null and qylx != '' ">
+				AND J.QYLX = #{qylx,jdbcType=VARCHAR}
+			</if>
+	</where>
+  </select>
+
+  
+</mapper>