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

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

@@ -46,11 +46,11 @@
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-    delete from T_YJPT_GQ
+    delete from AQ_DWXX_GQ
     where ID = #{uuid,jdbcType=DECIMAL}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.web.model.GqModel" >
-    insert into T_YJPT_GQ (ID, SZD, SSGK, GQMC, GQSZSYLX, GQMJ, LYMJ, SYFW, SYMJ, GQGHMJ, GHLYMJ,
+    insert into AQ_DWXX_GQ (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,
@@ -71,7 +71,7 @@
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.GqModel" >
-    update T_YJPT_GQ
+    update AQ_DWXX_GQ
     set SZD = #{szd,jdbcType=VARCHAR},
       SSGK = #{ssgk,jdbcType=DECIMAL},
       GQMC = #{gqmc,jdbcType=VARCHAR},
@@ -114,7 +114,7 @@
    	 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
+		GKAQV2.AQ_DWXX_GQ
 	WHEREID = #{uuid,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
@@ -122,12 +122,12 @@
    	 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
+		GKAQV2.AQ_DWXX_GQ
   </select>
   <select id="selectByInfo" resultMap="ComboBoxMap" parameterType="com.xt.js.gkaq.web.model.GqModel">
   	SELECT ID, GQMC
 	FROM
-		GKAQV2.T_YJPT_GQ
+		GKAQV2.AQ_DWXX_GQ
 	<where>
 			<if test="szd != null and szd != '' ">
 				SZD = #{szd,jdbcType=VARCHAR}

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

@@ -182,7 +182,7 @@
 		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
+		LEFT JOIN AQ_DWXX_GQ GQ ON GQ.ID = JYRU.SSGQ
 		<where>
 			JYRU.RECORD_STATUS != 9
 			<if test="szd != null and szd != ''">

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

@@ -71,7 +71,7 @@
 				GROUP BY T.WXHWMCBH) AS HZ,  
 		J.QYLX
 	FROM AQ_DWXX_JYRJCXX J
-	LEFT JOIN T_YJPT_GQ GQ ON GQ."ID" = J.SZGQ
+	LEFT JOIN AQ_DWXX_GQ GQ ON GQ."ID" = J.SZGQ
 	LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.VAL = J.SZD
 		
 	<where>

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

@@ -37,7 +37,7 @@
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-    delete from T_YJPT_GQ
+    delete from AQ_BASIC_DWXX_WXHWPMB
     where ID = #{id,jdbcType=DECIMAL}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.web.model.WxhwModel" >
@@ -55,7 +55,7 @@
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.WxhwModel" >
-    update T_YJPT_GQ
+    update AQ_BASIC_DWXX_WXHWPMB
     set BH = #{bh,jdbcType=VARCHAR},
       MCHSM = #{mchsm,jdbcType=VARCHAR},
       YWMC = #{ywmc,jdbcType=VARCHAR},

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

@@ -31,6 +31,20 @@
     <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
+  
+  <resultMap id="BaseResultInfoMap" type="com.xt.js.gkaq.web.model.zdhqdExtendModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="ZDMC" property="zdmc" jdbcType="VARCHAR" />
+    <result column="GKJYR" property="gkjyr" jdbcType="VARCHAR" />
+    <result column="ZDFL" property="zdfl" jdbcType="VARCHAR" />
+    <result column="FBRQ" property="fbrq" jdbcType="TIMESTAMP" />
+    <result column="XDRQ" property="xdrq" jdbcType="TIMESTAMP" />
+    <result column="LXR" property="lxr" jdbcType="VARCHAR" />
+    <result column="LXDH" property="lxdh" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="GQMC" property="gqmc" jdbcType="VARCHAR" />
+   
+  </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_GLZD
     where ID = #{id,jdbcType=VARCHAR}
@@ -99,4 +113,47 @@
     CREATE_TIME, UPDATE_USER, UPDATE_TIME
     from AQ_GLZD
   </select>
+  
+  <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.zdhqdExtendModel">
+	  	SELECT 
+			ZD.ID,
+			ZD.ZDMC,
+			J.GKJYR,
+			C.TEXT AS ZDFL,
+			ZD.FBRQ,
+			ZD.XDRQ,
+			ZD.LXR,
+			ZD.LXDH,
+			CO.TEXT AS SZD,
+			GQ.GQMC
+		FROM AQ_GLZD ZD
+			LEFT JOIN AQ_DWXX_JYRJCXX J ON J.ID = ZD.QYMC
+			LEFT JOIN AQ_BASIC_FRAME_CODE C ON C.VAL = ZD.ZDFL
+			LEFT JOIN AQ_BASIC_FRAME_CODE CO ON CO.VAL = ZD.SZD
+			LEFT JOIN AQ_DWXX_GQ GQ ON GQ.ID = ZD.SZGQ
+		<where>
+			ZD.STATE != 9
+			<if test="szd != null and szd != ''">
+				AND ZD.SZD = #{szd,jdbcType=VARCHAR}
+			</if>
+			<if test="gqmc != null and gqmc != '' ">
+				AND ZD.SZGQ = #{gqmc,jdbcType=VARCHAR}
+			</if>
+			<if test="gkjyr != null and gkjyr != ''">
+				AND J.GKJYR LIKE CONCAT(CONCAT('%', #{gkjyr, jdbcType=VARCHAR}),'%')
+			</if>
+			<if test="zdfl != null and zdfl != ''">
+				AND ZD.ZDFL = #{zdfl,jdbcType=VARCHAR}
+			</if>
+			<if test="xdrq != null and xdrq != ''">
+				AND <![CDATA[ZD.XDRQ >= "TO_TIMESTAMP"(#{xdrq,jdbcType=TIMESTAMP},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
+			</if>
+			<if test="fbrq != null and fbrq != ''">
+				AND <![CDATA[ZD.XDRQ <= "TO_TIMESTAMP"(#{fbrq,jdbcType=TIMESTAMP},'yyyy-MM-dd hh24:mi:ss:ff9')]]>
+			</if>
+			<if test="zdmc != null and zdmc != ''">
+				AND ZD.ZDMC LIKE CONCAT(CONCAT('%', #{zdmc, jdbcType=VARCHAR}),'%')
+			</if>
+		</where>
+  </select>
 </mapper>