wangzhe 2 سال پیش
والد
کامیت
57c9d802e1

+ 1 - 1
test-api/src/main/java/com/sooka/model/bo/Guiji_gas4_Zenner_meter_reading_infor_Bean.java

@@ -22,5 +22,5 @@ public class Guiji_gas4_Zenner_meter_reading_infor_Bean extends BaseBean_Guiji {
     String D_JFH_SKDATE;//收款日期
     String VC_JFD_SKTYPE;//缴费类型(1-冲预付 2-预存调整 3-收本期气费 4-退款 5-后付费充值)
 
-//    VC_JFD_USERGUID, N_JFD_BEFORENUM, N_JFD_LASTNUM, N_JFD_BEFOREAMOUNT, N_JFD_AMOUNT, N_JFD_LASTAMOUNT, VC_JFD_INVOICE, VC_JFH_SKPERSON, D_JFH_SKDATE, VC_JFD_SKTYPE
+//    GUID, VC_JFD_USERGUID, N_JFD_BEFORENUM, N_JFD_LASTNUM, N_JFD_BEFOREAMOUNT, N_JFD_AMOUNT, N_JFD_LASTAMOUNT, VC_JFD_INVOICE, VC_JFH_SKPERSON, D_JFH_SKDATE, VC_JFD_SKTYPE
 }

+ 57 - 50
test-api/src/main/java/com/sooka/service/impl/Guiji_Gas_ServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.sooka.base.BaseApi;
 import com.sooka.base.BaseService;
@@ -35,7 +36,8 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas1_Zenner_user_infor_Bean bean = new Guiji_gas1_Zenner_user_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
             bean.setGUID(Data.getString("GUID"));
@@ -83,10 +85,11 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas2_Zenner_gas_meter_infor_Bean bean= new Guiji_gas2_Zenner_gas_meter_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("GUID"));
+            bean.setGUID(Data.getString("GUID"));
             bean.setVC_MI_USERGUID(Data.getString("VC_MI_USERGUID"));
             bean.setVC_MI_NO(Data.getString("VC_MI_NO"));
             bean.setVC_MI_CARDNO(Data.getString("VC_MI_CARDNO"));
@@ -137,19 +140,20 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas3_Zenner_gas_purchase_infor_Bean bean = new Guiji_gas3_Zenner_gas_purchase_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("GUID"));
-            bean.setId(Data.getString("VC_SG_USERGUID"));
-            bean.setId(Data.getString("N_SG_BEFOREAMOUNT"));
-            bean.setId(Data.getString("N_SG_SHOULDAMOUNT"));
-            bean.setId(Data.getString("N_SG_FACTAMOUNT"));
-            bean.setId(Data.getString("N_SG_LASTAMOUNT"));
-            bean.setId(Data.getString("VC_SG_IVNO"));
-            bean.setId(Data.getString("VC_SG_OPCODE"));
-            bean.setId(Data.getString("D_SG_SALEDATE"));
-            bean.setId(Data.getString("VC_SG_SALEORBACK"));
+            bean.setGUID(Data.getString("GUID"));
+            bean.setVC_SG_USERGUID(Data.getString("VC_SG_USERGUID"));
+            bean.setN_SG_BEFOREAMOUNT(Data.getString("N_SG_BEFOREAMOUNT"));
+            bean.setN_SG_SHOULDAMOUNT(Data.getString("N_SG_SHOULDAMOUNT"));
+            bean.setN_SG_FACTAMOUNT(Data.getString("N_SG_FACTAMOUNT"));
+            bean.setN_SG_LASTAMOUNT(Data.getString("N_SG_LASTAMOUNT"));
+            bean.setVC_SG_IVNO(Data.getString("VC_SG_IVNO"));
+            bean.setVC_SG_OPCODE(Data.getString("VC_SG_OPCODE"));
+            bean.setD_SG_SALEDATE(Data.getString("D_SG_SALEDATE"));
+            bean.setVC_SG_SALEORBACK(Data.getString("VC_SG_SALEORBACK"));
             if (bean.getCd_operation().equals("I")) {
                 guiji_gas_mapper.add_guiji_gas_Zenner_gas_purchase_infor(bean);
                 guiji_gas_mapper2.add_guiji_gas_Zenner_gas_purchase_infor(bean);
@@ -185,20 +189,21 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas4_Zenner_meter_reading_infor_Bean bean = new Guiji_gas4_Zenner_meter_reading_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("GUID"));
-            bean.setId(Data.getString("VC_JFD_USERGUID"));
-            bean.setId(Data.getString("N_JFD_BEFORENUM"));
-            bean.setId(Data.getString("N_JFD_LASTNUM"));
-            bean.setId(Data.getString("N_JFD_BEFOREAMOUNT"));
-            bean.setId(Data.getString("N_JFD_AMOUNT"));
-            bean.setId(Data.getString("N_JFD_LASTAMOUNT"));
-            bean.setId(Data.getString("VC_JFD_INVOICE"));
-            bean.setId(Data.getString("VC_JFH_SKPERSON"));
-            bean.setId(Data.getString("D_JFH_SKDATE"));
-            bean.setId(Data.getString("VC_JFD_SKTYPE"));
+            bean.setGUID(Data.getString("GUID"));
+            bean.setVC_JFD_USERGUID(Data.getString("VC_JFD_USERGUID"));
+            bean.setN_JFD_BEFORENUM(Data.getString("N_JFD_BEFORENUM"));
+            bean.setN_JFD_LASTNUM(Data.getString("N_JFD_LASTNUM"));
+            bean.setN_JFD_BEFOREAMOUNT(Data.getString("N_JFD_BEFOREAMOUNT"));
+            bean.setN_JFD_AMOUNT(Data.getString("N_JFD_AMOUNT"));
+            bean.setN_JFD_LASTAMOUNT(Data.getString("N_JFD_LASTAMOUNT"));
+            bean.setVC_JFD_INVOICE(Data.getString("VC_JFD_INVOICE"));
+            bean.setVC_JFH_SKPERSON(Data.getString("VC_JFH_SKPERSON"));
+            bean.setD_JFH_SKDATE(Data.getString("D_JFH_SKDATE"));
+            bean.setVC_JFD_SKTYPE(Data.getString("VC_JFD_SKTYPE"));
             if (bean.getCd_operation().equals("I")) {
                 guiji_gas_mapper.add_guiji_gas_Zenner_meter_reading_infor(bean);
                 guiji_gas_mapper2.add_guiji_gas_Zenner_meter_reading_infor(bean);
@@ -234,10 +239,11 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas5_Aofe_user_infor_Bean bean = new Guiji_gas5_Aofe_user_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
+//            bean.setId(Data.getString("id"));
             if (bean.getCd_operation().equals("I")) {
                 guiji_gas_mapper.add_guiji_gas_Aofe_user_infor(bean);
                 guiji_gas_mapper2.add_guiji_gas_Aofe_user_infor(bean);
@@ -273,10 +279,11 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas6_Aofe_gas_meter_infor_Bean bean= new Guiji_gas6_Aofe_gas_meter_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
+//            bean.setId(Data.getString("id"));
             if (bean.getCd_operation().equals("I")) {
                 guiji_gas_mapper.add_guiji_gas_Aofe_gas_meter_infor(bean);
                 guiji_gas_mapper2.add_guiji_gas_Aofe_gas_meter_infor(bean);
@@ -312,10 +319,11 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas7_Aofe_gas_purchase_infor_Bean bean = new Guiji_gas7_Aofe_gas_purchase_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
+//            bean.setId(Data.getString("id"));
             if (bean.getCd_operation().equals("I")) {
                 guiji_gas_mapper.add_guiji_gas_Aofe_gas_purchase_infor(bean);
                 guiji_gas_mapper2.add_guiji_gas_Aofe_gas_purchase_infor(bean);
@@ -351,10 +359,11 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas8_Aofe_meter_reading_infor_Bean bean = new Guiji_gas8_Aofe_meter_reading_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
+//            bean.setId(Data.getString("id"));
             if (bean.getCd_operation().equals("I")) {
                 guiji_gas_mapper.add_guiji_gas_Aofe_meter_reading_infor(bean);
                 guiji_gas_mapper2.add_guiji_gas_Aofe_meter_reading_infor(bean);
@@ -390,10 +399,10 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas9_qinchuan_user_infor_Bean bean = new Guiji_gas9_qinchuan_user_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
             bean.setC_UserName(Data.getString("C_UserName"));
             bean.setC_Telphone(Data.getString("C_Telphone"));
             bean.setC_AddrInfo(Data.getString("C_AddrInfo"));
@@ -434,10 +443,10 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas10_SC_user_infor_Bean bean = new Guiji_gas10_SC_user_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
             bean.setUserName(Data.getString("userName"));
             bean.setUserPhone(Data.getString("userPhone"));
             bean.setUserAddr(Data.getString("userAddr"));
@@ -478,10 +487,10 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas11_SC_gas_meter_infor_Bean bean= new Guiji_gas11_SC_gas_meter_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
             bean.setTrademark(Data.getString("trademark"));
             bean.setProductType(Data.getString("productType"));
             bean.setObsolescence(Data.getString("obsolescence"));
@@ -523,10 +532,10 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas12_SC_gas_purchase_infor_Bean bean = new Guiji_gas12_SC_gas_purchase_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
             bean.setTradeTime(Data.getString("tradeTime"));
             bean.setTradeAmount(Data.getString("tradeAmount"));
             bean.setTradeMoney(Data.getString("tradeMoney"));
@@ -566,10 +575,10 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas13_SC_meter_reading_infor_Bean bean = new Guiji_gas13_SC_meter_reading_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
             bean.setReadNow(Data.getString("readNow"));
             bean.setReadLast(Data.getString("readLast"));
             bean.setUseAmount(Data.getString("useAmount"));
@@ -610,10 +619,8 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas14_XinKer_user_infor_Bean bean = new Guiji_gas14_XinKer_user_infor_Bean();
             initBaseGuijiBean(str, bean);
-
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
             bean.setName(Data.getString("Name"));
             bean.setSex(Data.getString("Sex"));
             bean.setPhone(Data.getString("Phone"));
@@ -653,10 +660,10 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas15_XinKer_acceptance_infor_Bean bean= new Guiji_gas15_XinKer_acceptance_infor_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
             bean.setNumber(Data.getString("Number"));
             bean.setDatetime(Data.getString("Datetime"));
             bean.setAcceptor(Data.getString("Acceptor"));
@@ -700,10 +707,10 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
 
             Guiji_gas16_XinKer_disposition_info_Bean bean = new Guiji_gas16_XinKer_disposition_info_Bean();
             initBaseGuijiBean(str, bean);
-
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-            bean.setId(Data.getString("id"));
             bean.setClerkOrdering(Data.getString("ClerkOrdering"));
             bean.setDateTime(Data.getString("DateTime"));
             bean.setWorker(Data.getString("Worker"));

+ 44 - 20
test-api/src/main/resources/mapper/Guiji_Gas_Mapper.xml

@@ -17,16 +17,19 @@
     <insert id="add_guiji_gas_Zenner_user_infor" parameterType="com.sooka.model.bo.Guiji_gas1_Zenner_user_infor_Bean">
         insert into t_guiji_gas_zenner_user_infor (
         <include refid="global_name"></include>
-        VC_UI_CODE, VC_UI_NAME, VC_UI_STATE, VC_UI_ADDR, VC_UI_TEL, VC_UI_IDNO, VC_UI_REMARK, N_UI_BEFOREAMOUNT, N_UI_LASTAMOUNT)
+        GUID, VC_UI_CODE, VC_UI_NAME, VC_UI_STATE, VC_UI_ADDR, VC_UI_TEL, VC_UI_IDNO, VC_UI_REMARK, N_UI_BEFOREAMOUNT, N_UI_LASTAMOUNT)
         values (
         <include refid="global_value"></include>
-        #{VC_UI_CODE}, #{VC_UI_NAME}, #{VC_UI_STATE}, #{VC_UI_ADDR}, #{VC_UI_TEL}, #{VC_UI_IDNO} , #{VC_UI_REMARK}, #{N_UI_BEFOREAMOUNT}, #{N_UI_LASTAMOUNT})
+        #{GUID}, #{VC_UI_CODE}, #{VC_UI_NAME}, #{VC_UI_STATE}, #{VC_UI_ADDR}, #{VC_UI_TEL}, #{VC_UI_IDNO} , #{VC_UI_REMARK}, #{N_UI_BEFOREAMOUNT}, #{N_UI_LASTAMOUNT})
     </insert>
 
     <update id="update_guiji_gas_Zenner_user_infor" parameterType="com.sooka.model.bo.Guiji_gas1_Zenner_user_infor_Bean">
         update t_guiji_gas_zenner_user_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
+            </if>
             <if test="VC_UI_CODE != null and VC_UI_CODE != ''">
                 VC_UI_CODE = #{VC_UI_CODE},
             </if>
@@ -62,16 +65,19 @@
     <insert id="add_guiji_gas_Zenner_gas_meter_infor" parameterType="com.sooka.model.bo.Guiji_gas2_Zenner_gas_meter_infor_Bean">
         insert into t_guiji_gas_zenner_gas_meter_infor (
         <include refid="global_name"></include>
-        VC_MI_USERGUID, VC_MI_NO, VC_MI_CARDNO, VC_MI_DIRECTION, VC_MI_TIMA, VC_MI_CHAOBIAO, N_MI_BASECOUNT, N_MI_BASELEAVE, VC_MI_STATE, I_MI_SALECOUNT, I_MI_WLSALECOUNT, I_MI_FILLCARDCOUNT, VC_MI_REMARK, I_MI_REPORTCOUNT, D_MI_CREATETIME)
+        GUID, VC_MI_USERGUID, VC_MI_NO, VC_MI_CARDNO, VC_MI_DIRECTION, VC_MI_TIMA, VC_MI_CHAOBIAO, N_MI_BASECOUNT, N_MI_BASELEAVE, VC_MI_STATE, I_MI_SALECOUNT, I_MI_WLSALECOUNT, I_MI_FILLCARDCOUNT, VC_MI_REMARK, I_MI_REPORTCOUNT, D_MI_CREATETIME)
         values (
         <include refid="global_value"></include>
-        #{VC_MI_USERGUID}, #{VC_MI_NO}, #{VC_MI_CARDNO}, #{VC_MI_DIRECTION}, #{VC_MI_TIMA}, #{VC_MI_CHAOBIAO}, #{N_MI_BASECOUNT}, #{N_MI_BASELEAVE}, #{VC_MI_STATE}, #{I_MI_SALECOUNT}, #{I_MI_WLSALECOUNT}, #{I_MI_FILLCARDCOUNT}, #{VC_MI_REMARK}, #{I_MI_REPORTCOUNT}, #{D_MI_CREATETIME})
+        #{GUID},#{VC_MI_USERGUID}, #{VC_MI_NO}, #{VC_MI_CARDNO}, #{VC_MI_DIRECTION}, #{VC_MI_TIMA}, #{VC_MI_CHAOBIAO}, #{N_MI_BASECOUNT}, #{N_MI_BASELEAVE}, #{VC_MI_STATE}, #{I_MI_SALECOUNT}, #{I_MI_WLSALECOUNT}, #{I_MI_FILLCARDCOUNT}, #{VC_MI_REMARK}, #{I_MI_REPORTCOUNT}, #{D_MI_CREATETIME})
     </insert>
 
     <update id="update_guiji_gas_Zenner_gas_meter_infor" parameterType="com.sooka.model.bo.Guiji_gas2_Zenner_gas_meter_infor_Bean">
         update t_guiji_gas_zenner_gas_meter_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
+            </if>
             <if test="VC_MI_USERGUID != null and VC_MI_USERGUID != ''">
                 VC_MI_USERGUID = #{VC_MI_USERGUID},
             </if>
@@ -125,16 +131,19 @@
     <insert id="add_guiji_gas_Zenner_gas_purchase_infor" parameterType="com.sooka.model.bo.Guiji_gas3_Zenner_gas_purchase_infor_Bean">
         insert into t_guiji_gas_zenner_gas_purchase_infor (
         <include refid="global_name"></include>
-        VC_SG_USERGUID, N_SG_BEFOREAMOUNT, N_SG_SHOULDAMOUNT, N_SG_FACTAMOUNT, N_SG_LASTAMOUNT, VC_SG_IVNO, VC_SG_OPCODE, D_SG_SALEDATE, VC_SG_SALEORBACK)
+        GUID, VC_SG_USERGUID, N_SG_BEFOREAMOUNT, N_SG_SHOULDAMOUNT, N_SG_FACTAMOUNT, N_SG_LASTAMOUNT, VC_SG_IVNO, VC_SG_OPCODE, D_SG_SALEDATE, VC_SG_SALEORBACK)
         values (
         <include refid="global_value"></include>
-        #{VC_SG_USERGUID}, #{N_SG_BEFOREAMOUNT}, #{N_SG_SHOULDAMOUNT}, #{N_SG_FACTAMOUNT}, #{N_SG_LASTAMOUNT}, #{VC_SG_IVNO}, #{VC_SG_OPCODE}, #{D_SG_SALEDATE}, #{VC_SG_SALEORBACK})
+        #{GUID}, #{VC_SG_USERGUID}, #{N_SG_BEFOREAMOUNT}, #{N_SG_SHOULDAMOUNT}, #{N_SG_FACTAMOUNT}, #{N_SG_LASTAMOUNT}, #{VC_SG_IVNO}, #{VC_SG_OPCODE}, #{D_SG_SALEDATE}, #{VC_SG_SALEORBACK})
     </insert>
 
     <update id="update_guiji_gas_Zenner_gas_purchase_infor" parameterType="com.sooka.model.bo.Guiji_gas3_Zenner_gas_purchase_infor_Bean">
         update t_guiji_gas_zenner_gas_purchase_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
+            </if>
             <if test="VC_SG_USERGUID != null and VC_SG_USERGUID != ''">
                 VC_SG_USERGUID = #{VC_SG_USERGUID},
             </if>
@@ -170,33 +179,48 @@
     <insert id="add_guiji_gas_Zenner_meter_reading_infor" parameterType="com.sooka.model.bo.Guiji_gas4_Zenner_meter_reading_infor_Bean">
         insert into t_guiji_gas_zenner_meter_reading_infor (
         <include refid="global_name"></include>
-        year, month, economyType, number, yearOnYear, cityProportion)
+        GUID, VC_JFD_USERGUID, N_JFD_BEFORENUM, N_JFD_LASTNUM, N_JFD_BEFOREAMOUNT, N_JFD_AMOUNT, N_JFD_LASTAMOUNT, VC_JFD_INVOICE, VC_JFH_SKPERSON, D_JFH_SKDATE, VC_JFD_SKTYPE)
         values (
         <include refid="global_value"></include>
-        #{year}, #{month}, #{economyType}, #{number}, #{yearOnYear}, #{cityProportion})
+        #{GUID}, #{VC_JFD_USERGUID}, #{N_JFD_BEFORENUM}, #{N_JFD_LASTNUM}, #{N_JFD_BEFOREAMOUNT}, #{N_JFD_AMOUNT}, #{N_JFD_LASTAMOUNT}, #{VC_JFD_INVOICE}, #{VC_JFH_SKPERSON}, #{D_JFH_SKDATE}, #{VC_JFD_SKTYPE})
     </insert>
 
     <update id="update_guiji_gas_Zenner_meter_reading_infor" parameterType="com.sooka.model.bo.Guiji_gas4_Zenner_meter_reading_infor_Bean">
         update t_guiji_gas_zenner_meter_reading_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
-            <if test="year != null and year != ''">
-                year = #{year},
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
             </if>
-            <if test="month != null and month != ''">
-                month = #{month},
+            <if test="VC_JFD_USERGUID != null and VC_JFD_USERGUID != ''">
+                VC_JFD_USERGUID = #{VC_JFD_USERGUID},
             </if>
-            <if test="economyType != null and economyType != ''">
-                economyType = #{economyType},
+            <if test="N_JFD_BEFORENUM != null and N_JFD_BEFORENUM != ''">
+                N_JFD_BEFORENUM = #{N_JFD_BEFORENUM},
             </if>
-            <if test="number != null and number != ''">
-                number = #{number},
+            <if test="N_JFD_LASTNUM != null and N_JFD_LASTNUM != ''">
+                N_JFD_LASTNUM = #{N_JFD_LASTNUM},
             </if>
-            <if test="yearOnYear != null and yearOnYear != ''">
-                yearOnYear = #{yearOnYear},
+            <if test="N_JFD_BEFOREAMOUNT != null and N_JFD_BEFOREAMOUNT != ''">
+                N_JFD_BEFOREAMOUNT = #{N_JFD_BEFOREAMOUNT},
             </if>
-            <if test="cityProportion != null and cityProportion != ''">
-                cityProportion = #{cityProportion},
+            <if test="N_JFD_AMOUNT != null and N_JFD_AMOUNT != ''">
+                N_JFD_AMOUNT = #{N_JFD_AMOUNT},
+            </if>
+            <if test="N_JFD_LASTAMOUNT != null and N_JFD_LASTAMOUNT != ''">
+                N_JFD_LASTAMOUNT = #{N_JFD_LASTAMOUNT},
+            </if>
+            <if test="VC_JFD_INVOICE != null and VC_JFD_INVOICE != ''">
+                VC_JFD_INVOICE = #{VC_JFD_INVOICE},
+            </if>
+            <if test="VC_JFH_SKPERSON != null and VC_JFH_SKPERSON != ''">
+                VC_JFH_SKPERSON = #{VC_JFH_SKPERSON},
+            </if>
+            <if test="D_JFH_SKDATE != null and D_JFH_SKDATE != ''">
+                D_JFH_SKDATE = #{D_JFH_SKDATE},
+            </if>
+            <if test="VC_JFD_SKTYPE != null and VC_JFD_SKTYPE != ''">
+                VC_JFD_SKTYPE = #{VC_JFD_SKTYPE},
             </if>
         </trim>
         where id = #{id}

+ 44 - 20
test-api/src/main/resources/mapper/Guiji_Gas_Mapper2.xml

@@ -17,16 +17,19 @@
     <insert id="add_guiji_gas_Zenner_user_infor" parameterType="com.sooka.model.bo.Guiji_gas1_Zenner_user_infor_Bean">
         insert into t_guiji_gas_zenner_user_infor (
         <include refid="global_name"></include>
-        VC_UI_CODE, VC_UI_NAME, VC_UI_STATE, VC_UI_ADDR, VC_UI_TEL, VC_UI_IDNO, VC_UI_REMARK, N_UI_BEFOREAMOUNT, N_UI_LASTAMOUNT)
+        GUID, VC_UI_CODE, VC_UI_NAME, VC_UI_STATE, VC_UI_ADDR, VC_UI_TEL, VC_UI_IDNO, VC_UI_REMARK, N_UI_BEFOREAMOUNT, N_UI_LASTAMOUNT)
         values (
         <include refid="global_value"></include>
-        #{VC_UI_CODE}, #{VC_UI_NAME}, #{VC_UI_STATE}, #{VC_UI_ADDR}, #{VC_UI_TEL}, #{VC_UI_IDNO} , #{VC_UI_REMARK}, #{N_UI_BEFOREAMOUNT}, #{N_UI_LASTAMOUNT})
+        #{GUID}, #{VC_UI_CODE}, #{VC_UI_NAME}, #{VC_UI_STATE}, #{VC_UI_ADDR}, #{VC_UI_TEL}, #{VC_UI_IDNO} , #{VC_UI_REMARK}, #{N_UI_BEFOREAMOUNT}, #{N_UI_LASTAMOUNT})
     </insert>
 
     <update id="update_guiji_gas_Zenner_user_infor" parameterType="com.sooka.model.bo.Guiji_gas1_Zenner_user_infor_Bean">
         update t_guiji_gas_zenner_user_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
+            </if>
             <if test="VC_UI_CODE != null and VC_UI_CODE != ''">
                 VC_UI_CODE = #{VC_UI_CODE},
             </if>
@@ -62,16 +65,19 @@
     <insert id="add_guiji_gas_Zenner_gas_meter_infor" parameterType="com.sooka.model.bo.Guiji_gas2_Zenner_gas_meter_infor_Bean">
         insert into t_guiji_gas_zenner_gas_meter_infor (
         <include refid="global_name"></include>
-        VC_MI_USERGUID, VC_MI_NO, VC_MI_CARDNO, VC_MI_DIRECTION, VC_MI_TIMA, VC_MI_CHAOBIAO, N_MI_BASECOUNT, N_MI_BASELEAVE, VC_MI_STATE, I_MI_SALECOUNT, I_MI_WLSALECOUNT, I_MI_FILLCARDCOUNT, VC_MI_REMARK, I_MI_REPORTCOUNT, D_MI_CREATETIME)
+        GUID, VC_MI_USERGUID, VC_MI_NO, VC_MI_CARDNO, VC_MI_DIRECTION, VC_MI_TIMA, VC_MI_CHAOBIAO, N_MI_BASECOUNT, N_MI_BASELEAVE, VC_MI_STATE, I_MI_SALECOUNT, I_MI_WLSALECOUNT, I_MI_FILLCARDCOUNT, VC_MI_REMARK, I_MI_REPORTCOUNT, D_MI_CREATETIME)
         values (
         <include refid="global_value"></include>
-        #{VC_MI_USERGUID}, #{VC_MI_NO}, #{VC_MI_CARDNO}, #{VC_MI_DIRECTION}, #{VC_MI_TIMA}, #{VC_MI_CHAOBIAO}, #{N_MI_BASECOUNT}, #{N_MI_BASELEAVE}, #{VC_MI_STATE}, #{I_MI_SALECOUNT}, #{I_MI_WLSALECOUNT}, #{I_MI_FILLCARDCOUNT}, #{VC_MI_REMARK}, #{I_MI_REPORTCOUNT}, #{D_MI_CREATETIME})
+        #{GUID},#{VC_MI_USERGUID}, #{VC_MI_NO}, #{VC_MI_CARDNO}, #{VC_MI_DIRECTION}, #{VC_MI_TIMA}, #{VC_MI_CHAOBIAO}, #{N_MI_BASECOUNT}, #{N_MI_BASELEAVE}, #{VC_MI_STATE}, #{I_MI_SALECOUNT}, #{I_MI_WLSALECOUNT}, #{I_MI_FILLCARDCOUNT}, #{VC_MI_REMARK}, #{I_MI_REPORTCOUNT}, #{D_MI_CREATETIME})
     </insert>
 
     <update id="update_guiji_gas_Zenner_gas_meter_infor" parameterType="com.sooka.model.bo.Guiji_gas2_Zenner_gas_meter_infor_Bean">
         update t_guiji_gas_zenner_gas_meter_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
+            </if>
             <if test="VC_MI_USERGUID != null and VC_MI_USERGUID != ''">
                 VC_MI_USERGUID = #{VC_MI_USERGUID},
             </if>
@@ -125,16 +131,19 @@
     <insert id="add_guiji_gas_Zenner_gas_purchase_infor" parameterType="com.sooka.model.bo.Guiji_gas3_Zenner_gas_purchase_infor_Bean">
         insert into t_guiji_gas_zenner_gas_purchase_infor (
         <include refid="global_name"></include>
-        VC_SG_USERGUID, N_SG_BEFOREAMOUNT, N_SG_SHOULDAMOUNT, N_SG_FACTAMOUNT, N_SG_LASTAMOUNT, VC_SG_IVNO, VC_SG_OPCODE, D_SG_SALEDATE, VC_SG_SALEORBACK)
+        GUID, VC_SG_USERGUID, N_SG_BEFOREAMOUNT, N_SG_SHOULDAMOUNT, N_SG_FACTAMOUNT, N_SG_LASTAMOUNT, VC_SG_IVNO, VC_SG_OPCODE, D_SG_SALEDATE, VC_SG_SALEORBACK)
         values (
         <include refid="global_value"></include>
-        #{VC_SG_USERGUID}, #{N_SG_BEFOREAMOUNT}, #{N_SG_SHOULDAMOUNT}, #{N_SG_FACTAMOUNT}, #{N_SG_LASTAMOUNT}, #{VC_SG_IVNO}, #{VC_SG_OPCODE}, #{D_SG_SALEDATE}, #{VC_SG_SALEORBACK})
+        #{GUID}, #{VC_SG_USERGUID}, #{N_SG_BEFOREAMOUNT}, #{N_SG_SHOULDAMOUNT}, #{N_SG_FACTAMOUNT}, #{N_SG_LASTAMOUNT}, #{VC_SG_IVNO}, #{VC_SG_OPCODE}, #{D_SG_SALEDATE}, #{VC_SG_SALEORBACK})
     </insert>
 
     <update id="update_guiji_gas_Zenner_gas_purchase_infor" parameterType="com.sooka.model.bo.Guiji_gas3_Zenner_gas_purchase_infor_Bean">
         update t_guiji_gas_zenner_gas_purchase_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
+            </if>
             <if test="VC_SG_USERGUID != null and VC_SG_USERGUID != ''">
                 VC_SG_USERGUID = #{VC_SG_USERGUID},
             </if>
@@ -170,33 +179,48 @@
     <insert id="add_guiji_gas_Zenner_meter_reading_infor" parameterType="com.sooka.model.bo.Guiji_gas4_Zenner_meter_reading_infor_Bean">
         insert into t_guiji_gas_zenner_meter_reading_infor (
         <include refid="global_name"></include>
-        year, month, economyType, number, yearOnYear, cityProportion)
+        GUID, VC_JFD_USERGUID, N_JFD_BEFORENUM, N_JFD_LASTNUM, N_JFD_BEFOREAMOUNT, N_JFD_AMOUNT, N_JFD_LASTAMOUNT, VC_JFD_INVOICE, VC_JFH_SKPERSON, D_JFH_SKDATE, VC_JFD_SKTYPE)
         values (
         <include refid="global_value"></include>
-        #{year}, #{month}, #{economyType}, #{number}, #{yearOnYear}, #{cityProportion})
+        #{GUID}, #{VC_JFD_USERGUID}, #{N_JFD_BEFORENUM}, #{N_JFD_LASTNUM}, #{N_JFD_BEFOREAMOUNT}, #{N_JFD_AMOUNT}, #{N_JFD_LASTAMOUNT}, #{VC_JFD_INVOICE}, #{VC_JFH_SKPERSON}, #{D_JFH_SKDATE}, #{VC_JFD_SKTYPE})
     </insert>
 
     <update id="update_guiji_gas_Zenner_meter_reading_infor" parameterType="com.sooka.model.bo.Guiji_gas4_Zenner_meter_reading_infor_Bean">
         update t_guiji_gas_zenner_meter_reading_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
-            <if test="year != null and year != ''">
-                year = #{year},
+            <if test="GUID != null and GUID != ''">
+                GUID = #{GUID},
             </if>
-            <if test="month != null and month != ''">
-                month = #{month},
+            <if test="VC_JFD_USERGUID != null and VC_JFD_USERGUID != ''">
+                VC_JFD_USERGUID = #{VC_JFD_USERGUID},
             </if>
-            <if test="economyType != null and economyType != ''">
-                economyType = #{economyType},
+            <if test="N_JFD_BEFORENUM != null and N_JFD_BEFORENUM != ''">
+                N_JFD_BEFORENUM = #{N_JFD_BEFORENUM},
             </if>
-            <if test="number != null and number != ''">
-                number = #{number},
+            <if test="N_JFD_LASTNUM != null and N_JFD_LASTNUM != ''">
+                N_JFD_LASTNUM = #{N_JFD_LASTNUM},
             </if>
-            <if test="yearOnYear != null and yearOnYear != ''">
-                yearOnYear = #{yearOnYear},
+            <if test="N_JFD_BEFOREAMOUNT != null and N_JFD_BEFOREAMOUNT != ''">
+                N_JFD_BEFOREAMOUNT = #{N_JFD_BEFOREAMOUNT},
             </if>
-            <if test="cityProportion != null and cityProportion != ''">
-                cityProportion = #{cityProportion},
+            <if test="N_JFD_AMOUNT != null and N_JFD_AMOUNT != ''">
+                N_JFD_AMOUNT = #{N_JFD_AMOUNT},
+            </if>
+            <if test="N_JFD_LASTAMOUNT != null and N_JFD_LASTAMOUNT != ''">
+                N_JFD_LASTAMOUNT = #{N_JFD_LASTAMOUNT},
+            </if>
+            <if test="VC_JFD_INVOICE != null and VC_JFD_INVOICE != ''">
+                VC_JFD_INVOICE = #{VC_JFD_INVOICE},
+            </if>
+            <if test="VC_JFH_SKPERSON != null and VC_JFH_SKPERSON != ''">
+                VC_JFH_SKPERSON = #{VC_JFH_SKPERSON},
+            </if>
+            <if test="D_JFH_SKDATE != null and D_JFH_SKDATE != ''">
+                D_JFH_SKDATE = #{D_JFH_SKDATE},
+            </if>
+            <if test="VC_JFD_SKTYPE != null and VC_JFD_SKTYPE != ''">
+                VC_JFD_SKTYPE = #{VC_JFD_SKTYPE},
             </if>
         </trim>
         where id = #{id}