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

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

@@ -114,11 +114,11 @@
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-    delete from AQ_BASIC_DWXX_BW
+    delete from AQ_DWXX_BW
     where ID = #{id,jdbcType=DECIMAL}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.web.model.GqModel" >
-    insert into AQ_BASIC_DWXX_BW (ID,SZD,SZGQ,QYMC,MTMC,BWMC,BWSX,BWSZSX,FWLX,TCNF,JGXS,SCLX,JGYSNF,
+    insert into AQ_DWXX_BW (ID,SZD,SZGQ,QYMC,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,
@@ -176,7 +176,7 @@
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.GqModel" >
-    update AQ_BASIC_DWXX_BW
+    update AQ_DWXX_BW
     set SZD = #{szd,jdbcType=VARCHAR},
       	SZGQ = #{szgq,jdbcType=DECIMAL},
 		QYMC = #{qymc,jdbcType=DECIMAL}, 
@@ -234,7 +234,7 @@
 		  SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
 		  BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,JTJGISDYIDH,HCKPNL,ZWBWYT,SMID,BWDM,JGXS2
 	FROM
-		GKAQV2.AQ_BASIC_DWXX_BW
+		GKAQV2.AQ_DWXX_BW
 	WHERE ID = #{id,jdbcType=DECIMAL}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
@@ -244,14 +244,14 @@
 		  SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
 		  BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,JTJGISDYIDH,HCKPNL,ZWBWYT,SMID,BWDM,JGXS2
 	FROM
-		GKAQV2.AQ_BASIC_DWXX_BW
+		GKAQV2.AQ_DWXX_BW
   </select>
   <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.GqModel">
 	  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,
 			 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
-	  FROM GKAQV2.AQ_BASIC_DWXX_BW B
+	  FROM GKAQV2.AQ_DWXX_BW B
 	  LEFT JOIN T_YJPT_GQ_MT M ON B.MTMC = M."ID"
 	<where>
 			B.RECORD_STATUS != '9'

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

@@ -50,11 +50,11 @@
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-    delete from AQ_BASIC_DWXX_CK
+    delete from AQ_DWXX_CK
     where ID = #{id,jdbcType=DECIMAL}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.web.model.CkModel" >
-    insert into AQ_BASIC_DWXX_CK (ID,SSJYR,SZD,GQ,MT,QYMC,CKMC,WXPCK,CKYT,CKGS,YTHGCGRJ,
+    insert into AQ_DWXX_CK (ID,SSJYR,SZD,GQ,MT,QYMC,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,
@@ -100,7 +100,7 @@
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.CkModel" >
-    update AQ_BASIC_DWXX_CK
+    update AQ_DWXX_CK
     set SSJYR = #{ssjyr,jdbcType=DECIMAL},
     	SZD = #{szd,jdbcType=VARCHAR}, 
       	GQ = #{gq,jdbcType=DECIMAL}, 
@@ -148,7 +148,7 @@
 		SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
 		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT
 	FROM
-		AQ_BASIC_DWXX_CK
+		AQ_DWXX_CK
 	WHERE ID = #{id,jdbcType=DECIMAL}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
@@ -159,7 +159,7 @@
 		SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
 		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT
 	FROM
-		AQ_BASIC_DWXX_CK
+		AQ_DWXX_CK
   </select>
   <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.CkModel">
 	 SELECT 
@@ -169,7 +169,7 @@
 		SFTB,TBZT,TBDYID,QYLB,SSQY,RECORD_CODE,
 		BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,ZWCKYT
 	FROM
-		AQ_BASIC_DWXX_CK
+		AQ_DWXX_CK
 	<where>
 			RECORD_STATUS != '9'
 			<if test="id != null and id != '' ">

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

@@ -45,11 +45,11 @@
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-    delete from AQ_BASIC_DWXX_DC
+    delete from AQ_DWXX_DC
     where ID = #{id,jdbcType=DECIMAL}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.web.model.DcModel" >
-    insert into AQ_BASIC_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,QYMC,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=DECIMAL},
@@ -92,7 +92,7 @@
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.DcModel" >
-    update AQ_BASIC_DWXX_DC
+    update AQ_DWXX_DC
     set SZD = #{szd,jdbcType=VARCHAR}, 
 		 SZGQ = #{szgq,jdbcType=VARCHAR}, 
 		 QYMC = #{qymc,jdbcType=DECIMAL}, 
@@ -136,7 +136,7 @@
 		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
-		AQ_BASIC_DWXX_DC
+		AQ_DWXX_DC
 	WHERE ID = #{id,jdbcType=DECIMAL}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
@@ -145,7 +145,7 @@
 		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
-		AQ_BASIC_DWXX_DC
+		AQ_DWXX_DC
   </select>
   <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.DcModel">
 	 SELECT
@@ -153,7 +153,7 @@
 		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
-		AQ_BASIC_DWXX_DC
+		AQ_DWXX_DC
 	<where>
 			RECORD_STATUS != '9'
 			<if test="id != null and id != '' ">

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

@@ -18,39 +18,39 @@
 
   <select id="selectByInfo" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.TjcxModel">
 		SELECT J.GKJYR,
-			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+			(SELECT "SUM"(1) FROM AQ_DWXX_BW B 
 							 WHERE B.ZYHBWFL ='10000026' AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1')
 			AS SYHGMT,
-			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+			(SELECT "SUM"(1) FROM AQ_DWXX_BW B 
 							 WHERE B.WXPBW='Y' AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
 			AS WXHW, 
-			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+			(SELECT "SUM"(1) FROM AQ_DWXX_BW B 
 							 WHERE B.WXPBW='N' AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
 			AS PH,
-			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+			(SELECT "SUM"(1) FROM AQ_DWXX_BW B 
 							 WHERE B.ZYHBWFL='10000023' AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
 			AS JZX,
-			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+			(SELECT "SUM"(1) FROM AQ_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 AQ_BASIC_DWXX_BW B 
+			(SELECT "SUM"(1) FROM AQ_DWXX_BW B 
 							 WHERE <![CDATA["TO_NUMBER"(B.SJKPNL) >= 0.1 AND "TO_NUMBER"(B.SJKPNL) < 1]]> 
 							 AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
 			AS WDYX,
-			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+			(SELECT "SUM"(1) FROM AQ_DWXX_BW B 
 					WHERE <![CDATA["TO_NUMBER"(B.SJKPNL) >=0.01 AND "TO_NUMBER"(B.SJKPNL) < 0.1]]>
 					 AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
 					AS QD,
-			(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW B 
+			(SELECT "SUM"(1) FROM AQ_DWXX_BW B 
 					WHERE <![CDATA["TO_NUMBER"(B.SJKPNL) <0.01]]> AND B.QYMC = J."ID" AND B.RECORD_STATUS = '1') 
 			AS QDYX,
-			(SELECT "SUM"(C.CGGS) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+			(SELECT "SUM"(C.CGGS) FROM AQ_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
 			AS SL,
-			(SELECT "SUM"(C.ZDWXYCGGS) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+			(SELECT "SUM"(C.ZDWXYCGGS) FROM AQ_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
 			AS WXSJ,
-			(SELECT "SUM"(C.CGRJ) FROM AQ_BASIC_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
+			(SELECT "SUM"(C.CGRJ) FROM AQ_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
 			AS RL
-		FROM AQ_BASIC_DWXX_JYRJCXX J
+		FROM AQ_DWXX_JYRJCXX J
 	<where>
 			J.STATE != '9'
 			<if test="szd != null and szd != '' ">

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

@@ -63,11 +63,11 @@
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from AQ_BASIC_DWXX_JYRDRYXX
+    delete from AQ_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,
+    insert into AQ_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)
@@ -113,7 +113,7 @@
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.JyrUserModel" >
-    update AQ_BASIC_DWXX_JYRDRYXX
+    update AQ_DWXX_JYRDRYXX
     set 
     	XM = #{xm,jdbcType=VARCHAR},    
     	XB = #{xb,jdbcType=VARCHAR},    
@@ -160,7 +160,7 @@
 		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
+		AQ_DWXX_JYRDRYXX
 	WHERE ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
@@ -169,7 +169,7 @@
 		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
+		AQ_DWXX_JYRDRYXX
   </select>
   <select id="selectByInfo" resultMap="BaseResultInfoMap" parameterType="com.xt.js.gkaq.web.model.JyrUserModel">
 		SELECT
@@ -177,8 +177,8 @@
 			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"
+			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

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

@@ -22,14 +22,14 @@
 		J.GKJYR,
 		G.TEXT, 
 		J.BYZD1,
-		(SELECT WM_CONCAT(BWMC) AS MC FROM AQ_BASIC_DWXX_BW 
+		(SELECT WM_CONCAT(BWMC) AS MC FROM AQ_DWXX_BW 
 				WHERE RECORD_STATUS = '1' AND QYMC = J."ID") AS BWMC, 
-		(SELECT "SUM"(1) FROM AQ_BASIC_DWXX_BW  B 
+		(SELECT "SUM"(1) FROM AQ_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 AQ_BASIC_DWXX_BW  B 
+		(SELECT "SUM"(1) FROM AQ_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 AQ_BASIC_DWXX_WXHWGKZYSBD T 
+		(SELECT NVL(SUM(T.ZYSL),0) FROM AQ_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="szd != null and szd != ''">
 					AND T.ZYDD=#{szd,jdbcType=VARCHAR}
@@ -41,7 +41,7 @@
 					<![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 AQ_BASIC_DWXX_WXHWGKZYSBD T 
+		(SELECT NVL(SUM(T.TEU),0) FROM AQ_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="szd != null and szd != ''">
 					AND T.ZYDD=#{szd,jdbcType=VARCHAR}
@@ -54,10 +54,10 @@
 				</if>
 				) AS JZXTTL,
 		GQ.GQMC,
-		(SELECT WM_CONCAT(B.HCKPNL||'*'||COUNT(ROWNUM)) AS S FROM AQ_BASIC_DWXX_BW B 
+		(SELECT WM_CONCAT(B.HCKPNL||'*'||COUNT(ROWNUM)) AS S FROM AQ_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 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 
+		(SELECT GKWXHWZYFZBH FROM AQ_DWXX_JYRJCXX WHERE STATE != '9' AND ID = J."ID") AS SFFZ,
+		(SELECT WM_CONCAT(T.WXHWMCBH||':'||NVL(SUM(T.ZYSL),0)||'吨') FROM AQ_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="szd != null and szd != ''">
 					AND T.ZYDD=#{szd,jdbcType=VARCHAR}
@@ -70,7 +70,7 @@
 				</if>
 				GROUP BY T.WXHWMCBH) AS HZ,  
 		J.QYLX
-	FROM AQ_BASIC_DWXX_JYRJCXX J
+	FROM AQ_DWXX_JYRJCXX J
 	LEFT JOIN T_YJPT_GQ GQ ON GQ."ID" = J.SZGQ
 	LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.VAL = J.SZD
 		

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

@@ -36,11 +36,11 @@
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    DELETE from AQ_BASIC_DWXX_RYZSB
+    DELETE from AQ_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,
+    insert into AQ_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},
@@ -72,7 +72,7 @@
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.RyzsbModel" >
-    update AQ_BASIC_DWXX_RYZSB
+    update AQ_DWXX_RYZSB
     set SZD = #{szd,jdbcType=VARCHAR},  
       	ZSNR = #{zsnr,jdbcType=VARCHAR}, 
 		RYID = #{ryid,jdbcType=VARCHAR}, 
@@ -105,7 +105,7 @@
 			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
+			AQ_DWXX_RYZSB
 	WHERE ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
@@ -113,13 +113,13 @@
 			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
+			AQ_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
+	  FROM AQ_DWXX_RYZSB
 	<where>
 			RECORD_STATUS != '9'
 			<if test="id != null and id != '' ">

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

@@ -20,20 +20,20 @@
 			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) 
+			(SELECT "SUM"(C.CGGS) FROM AQ_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) 
+			(SELECT "SUM"(C.CGRJ) FROM AQ_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
+			(SELECT WM_CONCAT('0'||C.CGRJ||'*'||SUM(C.CGGS)||'个') FROM AQ_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 
+			(SELECT WM_CONCAT(T.WXHWMCBH||':'||NVL(SUM(T.ZYSL),0)||'吨') FROM AQ_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) 
+			(SELECT "SUM"(C.ZDWXYCGGS) FROM AQ_DWXX_CG C WHERE C.RECORD_STATUS = '1' AND C.DWMC = J.ID) 
 				AS WXSL,
 			J.QYLX
-		FROM AQ_BASIC_DWXX_JYRJCXX J
+		FROM AQ_DWXX_JYRJCXX J
 		LEFT JOIN AQ_BASIC_FRAME_CODE G ON G.VAL = J.SZD
 	<where>
 			J.STATE != '9'