市燃气 奥枫

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

@@ -340,7 +340,21 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
             bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-//            bean.setId(Data.getString("id"));
+            bean.setF_userid(Data.getString("f_userid"));
+            bean.setF_userstate(Data.getString("f_userstate"));
+            bean.setF_state(Data.getString("f_state"));
+            bean.setF_username(Data.getString("f_username"));
+            bean.setF_idnumber(Data.getString("f_idnumber"));
+            bean.setF_phone(Data.getString("f_phone"));
+            bean.setF_yytdepa(Data.getString("f_yytdepa"));
+            bean.setF_yytoper(Data.getString("f_yytoper"));
+            bean.setF_yytdate(Data.getString("f_yytdate"));
+            bean.setF_dateofopening(Data.getString("f_dateofopening"));
+            bean.setF_filiale(Data.getString("f_filiale"));
+            bean.setF_fengongsinum(Data.getString("f_fengongsinum"));
+            bean.setF_usertype(Data.getString("f_usertype"));
+            bean.setF_districtname(Data.getString("f_districtname"));
+            bean.setF_address(Data.getString("f_address"));
             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);
@@ -380,7 +394,13 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
             bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-//            bean.setId(Data.getString("id"));
+            bean.setF_userid(Data.getString("f_userid"));
+            bean.setF_gaswatchbrand(Data.getString("f_gaswatchbrand"));
+            bean.setF_metertype(Data.getString("f_metertype"));
+            bean.setF_aliasname(Data.getString("f_aliasname"));
+            bean.setF_gasmeterstyle(Data.getString("f_gasmeterstyle"));
+            bean.setF_meternumber(Data.getString("f_meternumber"));
+            bean.setF_cardid(Data.getString("f_cardid"));
             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);
@@ -420,7 +440,35 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
             bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-//            bean.setId(Data.getString("id"));
+            bean.setF_userid(Data.getString("f_userid"));
+            bean.setF_username(Data.getString("f_username"));
+            bean.setF_usertype(Data.getString("f_usertype"));
+            bean.setF_zhye(Data.getString("f_zhye"));
+            bean.setF_benqizhye(Data.getString("f_benqizhye"));
+            bean.setF_gasmeterstyle(Data.getString("f_gasmeterstyle"));
+            bean.setF_pregas(Data.getString("f_pregas"));
+            bean.setF_preamount(Data.getString("f_preamount"));
+            bean.setF_payment(Data.getString("f_payment"));
+            bean.setF_upbuynum(Data.getString("f_upbuynum"));
+            bean.setF_sgnetwork(Data.getString("f_sgnetwork"));
+            bean.setF_sgoperator(Data.getString("f_sgoperator"));
+            bean.setF_deliverydate(Data.getString("f_deliverydate"));
+            bean.setF_deliverytime(Data.getString("f_deliverytime"));
+            bean.setF_filiale(Data.getString("f_filiale"));
+            bean.setF_fengongsinum(Data.getString("f_fengongsinum"));
+            bean.setF_payfeetype(Data.getString("f_payfeetype"));
+            bean.setF_payfeevalid(Data.getString("f_payfeevalid"));
+            bean.setF_times(Data.getString("f_times"));
+            bean.setF_stairtype(Data.getString("f_stairtype"));
+            bean.setF_stair1price(Data.getString("f_stair1price"));
+            bean.setF_stair1amount(Data.getString("f_stair1amount"));
+            bean.setF_stair1fee(Data.getString("f_stair1fee"));
+            bean.setF_stair2price(Data.getString("f_stair2price"));
+            bean.setF_stair2amount(Data.getString("f_stair2amount"));
+            bean.setF_stair2fee(Data.getString("f_stair2fee"));
+            bean.setF_stair3price(Data.getString("f_stair3price"));
+            bean.setF_stair3amount(Data.getString("f_stair3amount"));
+            bean.setF_stair3fee(Data.getString("f_stair3fee"));
             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);
@@ -460,7 +508,28 @@ public class Guiji_Gas_ServiceImpl extends BaseService implements Guiji_Gas_Serv
             bean.setId(jsonObject.getString("id"));
             JSONObject Data = bean.getData();
             bean.setStr(str);
-//            bean.setId(Data.getString("id"));
+            bean.setF_userid(Data.getString("f_userid"));
+            bean.setF_username(Data.getString("f_username"));
+            bean.setF_usertype(Data.getString("f_usertype"));
+            bean.setF_districtname(Data.getString("f_districtname"));
+            bean.setF_address(Data.getString("f_address"));
+            bean.setF_filiale(Data.getString("f_filiale"));
+            bean.setF_network(Data.getString("f_network"));
+            bean.setF_operator(Data.getString("f_operator"));
+            bean.setOughtamount(Data.getString("oughtamount"));
+            bean.setOughtfee(Data.getString("oughtfee"));
+            bean.setLastrecord(Data.getString("lastrecord"));
+            bean.setLastinputgasnum(Data.getString("lastinputgasnum"));
+            bean.setF_inputdate(Data.getString("f_inputdate"));
+            bean.setScinputdate(Data.getString("scinputdate"));
+            bean.setF_handdate(Data.getString("f_handdate"));
+            bean.setShifoujiaofei(Data.getString("shifoujiaofei"));
+            bean.setF_endjfdate(Data.getString("f_endjfdate"));
+            bean.setF_state(Data.getString("f_state"));
+            bean.setF_sellid(Data.getString("f_sellid"));
+            bean.setF_zhinajin(Data.getString("f_zhinajin"));
+            bean.setF_zhinajindate(Data.getString("f_zhinajindate"));
+            bean.setF_zhinajintianshu(Data.getString("f_zhinajintianshu"));
             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);

test-api/src/main/resources/mapper/Guiji_Gas_Mapper.xml

@@ -420,33 +420,60 @@
     <insert id="add_guiji_gas_Aofe_user_infor" parameterType="com.sooka.model.bo.Guiji_gas5_Aofe_user_infor_Bean">
         insert into t_guiji_gas_aofe_user_infor (
         <include refid="global_name"></include>
-        plantName, plantAddress, plantHectare, produceTons, produceValue, plantYear)
+        f_userid, f_userstate, f_state, f_username, f_idnumber, f_phone, f_yytdepa, f_yytoper, f_yytdate, f_dateofopening, f_filiale, f_fengongsinum, f_usertype, f_districtname, f_address)
         values (
         <include refid="global_value"></include>
-        #{plantName}, #{plantAddress}, #{plantHectare}, #{produceTons}, #{produceValue}, #{plantYear})
+        #{f_userid}, #{f_userstate}, #{f_state}, #{f_username}, #{f_idnumber}, #{f_phone}, #{f_yytdepa}, #{f_yytoper}, #{f_yytdate}, #{f_dateofopening}, #{f_filiale}, #{f_fengongsinum}, #{f_usertype}, #{f_districtname}, #{f_address})
     </insert>
 
     <update id="update_guiji_gas_Aofe_user_infor" parameterType="com.sooka.model.bo.Guiji_gas5_Aofe_user_infor_Bean">
         update t_guiji_gas_aofe_user_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
-            <if test="plantName != null and plantName != ''">
-                plantName = #{plantName},
+            <if test="f_userid != null and f_userid != ''">
+                f_userid = #{f_userid},
             </if>
-            <if test="plantAddress != null and plantAddress != ''">
-                plantAddress = #{plantAddress},
+            <if test="f_userstate != null and f_userstate != ''">
+                f_userstate = #{f_userstate},
             </if>
-            <if test="plantHectare != null and plantHectare != ''">
-                plantHectare = #{plantHectare},
+            <if test="f_state != null and f_state != ''">
+                f_state = #{f_state},
             </if>
-            <if test="produceTons != null and produceTons != ''">
-                produceTons = #{produceTons},
+            <if test="f_username != null and f_username != ''">
+                f_username = #{f_username},
             </if>
-            <if test="produceValue != null and produceValue != ''">
-                produceValue = #{produceValue},
+            <if test="f_idnumber != null and f_idnumber != ''">
+                f_idnumber = #{f_idnumber},
             </if>
-            <if test="plantYear != null and plantYear != ''">
-                plantYear = #{plantYear},
+            <if test="f_phone != null and f_phone != ''">
+                f_phone = #{f_phone},
+            </if>
+            <if test="f_yytdepa != null and f_yytdepa != ''">
+                f_yytdepa = #{f_yytdepa},
+            </if>
+            <if test="f_yytoper != null and f_yytoper != ''">
+                f_yytoper = #{f_yytoper},
+            </if>
+            <if test="f_yytdate != null and f_yytdate != ''">
+                f_yytdate = #{f_yytdate},
+            </if>
+            <if test="f_dateofopening != null and f_dateofopening != ''">
+                f_dateofopening = #{f_dateofopening},
+            </if>
+            <if test="f_filiale != null and f_filiale != ''">
+                f_filiale = #{f_filiale},
+            </if>
+            <if test="f_fengongsinum != null and f_fengongsinum != ''">
+                f_fengongsinum = #{f_fengongsinum},
+            </if>
+            <if test="f_usertype != null and f_usertype != ''">
+                f_usertype = #{f_usertype},
+            </if>
+            <if test="f_districtname != null and f_districtname != ''">
+                f_districtname = #{f_districtname},
+            </if>
+            <if test="f_address != null and f_address != ''">
+                f_address = #{f_address},
             </if>
         </trim>
         where id = #{id}
@@ -456,36 +483,36 @@
     <insert id="add_guiji_gas_Aofe_gas_meter_infor" parameterType="com.sooka.model.bo.Guiji_gas6_Aofe_gas_meter_infor_Bean">
         insert into t_guiji_gas_aofe_gas_meter_infor (
         <include refid="global_name"></include>
-        platformName, constructingUnit, constructingDate, platformAddress, platformAddressExt, platformLevel, platformType)
+        f_userid, f_gaswatchbrand, f_metertype, f_aliasname, f_gasmeterstyle, f_meternumber, f_cardid)
         values (
         <include refid="global_value"></include>
-        #{platformName}, #{constructingUnit}, #{constructingDate}, #{platformAddress}, #{platformAddressExt}, #{platformLevel}, #{platformType})
+        #{f_userid}, #{f_gaswatchbrand}, #{f_metertype}, #{f_aliasname}, #{f_gasmeterstyle}, #{f_meternumber}, #{f_cardid})
     </insert>
 
     <update id="update_guiji_gas_Aofe_gas_meter_infor" parameterType="com.sooka.model.bo.Guiji_gas6_Aofe_gas_meter_infor_Bean">
         update t_guiji_gas_aofe_gas_meter_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
-            <if test="platformName != null and platformName != ''">
-                platformName = #{platformName},
+            <if test="f_userid != null and f_userid != ''">
+                f_userid = #{f_userid},
             </if>
-            <if test="constructingUnit != null and constructingUnit != ''">
-                constructingUnit = #{constructingUnit},
+            <if test="f_gaswatchbrand != null and f_gaswatchbrand != ''">
+                f_gaswatchbrand = #{f_gaswatchbrand},
             </if>
-            <if test="constructingDate != null and constructingDate != ''">
-                constructingDate = #{constructingDate},
+            <if test="f_metertype != null and f_metertype != ''">
+                f_metertype = #{f_metertype},
             </if>
-            <if test="platformAddress != null and platformAddress != ''">
-                platformAddress = #{platformAddress},
+            <if test="f_aliasname != null and f_aliasname != ''">
+                f_aliasname = #{f_aliasname},
             </if>
-            <if test="platformAddressExt != null and platformAddressExt != ''">
-                platformAddressExt = #{platformAddressExt},
+            <if test="f_gasmeterstyle != null and f_gasmeterstyle != ''">
+                f_gasmeterstyle = #{f_gasmeterstyle},
             </if>
-            <if test="platformLevel != null and platformLevel != ''">
-                platformLevel = #{platformLevel},
+            <if test="f_meternumber != null and f_meternumber != ''">
+                f_meternumber = #{f_meternumber},
             </if>
-            <if test="platformType != null and platformType != ''">
-                platformType = #{platformType},
+            <if test="f_cardid != null and f_cardid != ''">
+                f_cardid = #{f_cardid},
             </if>
         </trim>
         where id = #{id}
@@ -495,36 +522,102 @@
     <insert id="add_guiji_gas_Aofe_gas_purchase_infor" parameterType="com.sooka.model.bo.Guiji_gas7_Aofe_gas_purchase_infor_Bean">
         insert into t_guiji_gas_aofe_gas_purchase_infor (
         <include refid="global_name"></include>
-        projectName, projectOrgName, projectAddress, projectStatus, projectTotalInvestment, projectStart, projectEnd)
+        f_userid, f_username, f_usertype, f_zhye, f_benqizhye, f_gasmeterstyle, f_pregas, f_preamount, f_payment, f_upbuynum, f_sgnetwork, f_sgoperator, f_deliverydate, f_deliverytime, f_filiale, f_fengongsinum, f_payfeetype, f_payfeevalid, f_times, f_stairtype, f_stair1price, f_stair1amount, f_stair1fee, f_stair2price, f_stair2amount, f_stair2fee, f_stair3price, f_stair3amount, f_stair3fee)
         values (
         <include refid="global_value"></include>
-        #{projectName}, #{projectOrgName}, #{projectAddress}, #{projectStatus}, #{projectTotalInvestment}, #{projectStart}, #{projectEnd})
+        #{f_userid}, #{f_username}, #{f_usertype}, #{f_zhye}, #{f_benqizhye}, #{f_gasmeterstyle}, #{f_pregas}, #{f_preamount}, #{f_payment}, #{f_upbuynum}, #{f_sgnetwork}, #{f_sgoperator}, #{f_deliverydate}, #{f_deliverytime}, #{f_filiale}, #{f_fengongsinum}, #{f_payfeetype}, #{f_payfeevalid}, #{f_times}, #{f_stairtype}, #{f_stair1price}, #{f_stair1amount}, #{f_stair1fee}, #{f_stair2price}, #{f_stair2amount}, #{f_stair2fee}, #{f_stair3price}, #{f_stair3amount}, #{f_stair3fee})
     </insert>
 
     <update id="update_guiji_gas_Aofe_gas_purchase_infor" parameterType="com.sooka.model.bo.Guiji_gas7_Aofe_gas_purchase_infor_Bean">
         update t_guiji_gas_aofe_gas_purchase_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
-            <if test="projectName != null and projectName != ''">
-                projectName = #{projectName},
+            <if test="f_userid != null and f_userid != ''">
+                f_userid = #{f_userid},
+            </if>
+            <if test="f_username != null and f_username != ''">
+                f_username = #{f_username},
+            </if>
+            <if test="f_usertype != null and f_usertype != ''">
+                f_usertype = #{f_usertype},
+            </if>
+            <if test="f_zhye != null and f_zhye != ''">
+                f_zhye = #{f_zhye},
+            </if>
+            <if test="f_benqizhye != null and f_benqizhye != ''">
+                f_benqizhye = #{f_benqizhye},
+            </if>
+            <if test="f_gasmeterstyle != null and f_gasmeterstyle != ''">
+                f_gasmeterstyle = #{f_gasmeterstyle},
+            </if>
+            <if test="f_pregas != null and f_pregas != ''">
+                f_pregas = #{f_pregas},
+            </if>
+            <if test="f_preamount != null and f_preamount != ''">
+                f_preamount = #{f_preamount},
+            </if>
+            <if test="f_payment != null and f_payment != ''">
+                f_payment = #{f_payment},
+            </if>
+            <if test="f_upbuynum != null and f_upbuynum != ''">
+                f_upbuynum = #{f_upbuynum},
+            </if>
+            <if test="f_sgnetwork != null and f_sgnetwork != ''">
+                f_sgnetwork = #{f_sgnetwork},
+            </if>
+            <if test="f_sgoperator != null and f_sgoperator != ''">
+                f_sgoperator = #{f_sgoperator},
+            </if>
+            <if test="f_deliverydate != null and f_deliverydate != ''">
+                f_deliverydate = #{f_deliverydate},
+            </if>
+            <if test="f_deliverytime != null and f_deliverytime != ''">
+                f_deliverytime = #{f_deliverytime},
+            </if>
+            <if test="f_filiale != null and f_filiale != ''">
+                f_filiale = #{f_filiale},
+            </if>
+            <if test="f_fengongsinum != null and f_fengongsinum != ''">
+                f_fengongsinum = #{f_fengongsinum},
             </if>
-            <if test="projectOrgName != null and projectOrgName != ''">
-                projectOrgName = #{projectOrgName},
+            <if test="f_payfeetype != null and f_payfeetype != ''">
+                f_payfeetype = #{f_payfeetype},
             </if>
-            <if test="projectAddress != null and projectAddress != ''">
-                projectAddress = #{projectAddress},
+            <if test="f_payfeevalid != null and f_payfeevalid != ''">
+                f_payfeevalid = #{f_payfeevalid},
             </if>
-            <if test="projectStatus != null and projectStatus != ''">
-                projectStatus = #{projectStatus},
+            <if test="f_times != null and f_times != ''">
+                f_times = #{f_times},
             </if>
-            <if test="projectTotalInvestment != null and projectTotalInvestment != ''">
-                projectTotalInvestment = #{projectTotalInvestment},
+            <if test="f_stairtype != null and f_stairtype != ''">
+                f_stairtype = #{f_stairtype},
             </if>
-            <if test="projectStart != null and projectStart != ''">
-                projectStart = #{projectStart},
+            <if test="f_stair1price != null and f_stair1price != ''">
+                f_stair1price = #{f_stair1price},
             </if>
-            <if test="projectEnd != null and projectEnd != ''">
-                projectEnd = #{projectEnd},
+            <if test="f_stair1amount != null and f_stair1amount != ''">
+                f_stair1amount = #{f_stair1amount},
+            </if>
+            <if test="f_stair1fee != null and f_stair1fee != ''">
+                f_stair1fee = #{f_stair1fee},
+            </if>
+            <if test="f_stair2price != null and f_stair2price != ''">
+                f_stair2price = #{f_stair2price},
+            </if>
+            <if test="f_stair2amount != null and f_stair2amount != ''">
+                f_stair2amount = #{f_stair2amount},
+            </if>
+            <if test="f_stair2fee != null and f_stair2fee != ''">
+                f_stair2fee = #{f_stair2fee},
+            </if>
+            <if test="f_stair3price != null and f_stair3price != ''">
+                f_stair3price = #{f_stair3price},
+            </if>
+            <if test="f_stair3amount != null and f_stair3amount != ''">
+                f_stair3amount = #{f_stair3amount},
+            </if>
+            <if test="f_stair3fee != null and f_stair3fee != ''">
+                f_stair3fee = #{f_stair3fee},
             </if>
         </trim>
         where id = #{id}
@@ -534,33 +627,81 @@
     <insert id="add_guiji_gas_Aofe_meter_reading_infor" parameterType="com.sooka.model.bo.Guiji_gas8_Aofe_meter_reading_infor_Bean">
         insert into t_guiji_gas_aofe_meter_reading_infor (
         <include refid="global_name"></include>
-        year, month, economyType, number, yearOnYear, cityProportion)
+        f_userid, f_username, f_usertype, f_districtname, f_address, f_filiale, f_network, f_operator, oughtamount, oughtfee, lastrecord, lastinputgasnum, f_inputdate, scinputdate, f_handdate, shifoujiaofei, f_endjfdate, f_state, f_sellid, f_zhinajin, f_zhinajindate, f_zhinajintianshu)
         values (
         <include refid="global_value"></include>
-        #{year}, #{month}, #{economyType}, #{number}, #{yearOnYear}, #{cityProportion})
+        #{f_userid}, #{f_username}, #{f_usertype}, #{f_districtname}, #{f_address}, #{f_filiale}, #{f_network}, #{f_operator}, #{oughtamount}, #{oughtfee}, #{lastrecord}, #{lastinputgasnum}, #{f_inputdate}, #{scinputdate}, #{f_handdate}, #{shifoujiaofei}, #{f_endjfdate}, #{f_state}, #{f_sellid}, #{f_zhinajin}, #{f_zhinajindate}, #{f_zhinajintianshu})
     </insert>
 
     <update id="update_guiji_gas_Aofe_meter_reading_infor" parameterType="com.sooka.model.bo.Guiji_gas8_Aofe_meter_reading_infor_Bean">
         update t_guiji_gas_aofe_meter_reading_infor
         <trim prefix="SET" suffixOverrides=",">
             <include refid="update_sql"></include>
-            <if test="year != null and year != ''">
-                year = #{year},
+            <if test="f_userid != null and f_userid != ''">
+                f_userid = #{f_userid},
+            </if>
+            <if test="f_username != null and f_username != ''">
+                f_username = #{f_username},
+            </if>
+            <if test="f_usertype != null and f_usertype != ''">
+                f_usertype = #{f_usertype},
+            </if>
+            <if test="f_districtname != null and f_districtname != ''">
+                f_districtname = #{f_districtname},
+            </if>
+            <if test="f_address != null and f_address != ''">
+                f_address = #{f_address},
+            </if>
+            <if test="f_filiale != null and f_filiale != ''">
+                f_filiale = #{f_filiale},
+            </if>
+            <if test="f_network != null and f_network != ''">
+                f_network = #{f_network},
+            </if>
+            <if test="f_operator != null and f_operator != ''">
+                f_operator = #{f_operator},
+            </if>
+            <if test="oughtamount != null and oughtamount != ''">
+                oughtamount = #{oughtamount},
+            </if>
+            <if test="oughtfee != null and oughtfee != ''">
+                oughtfee = #{oughtfee},
+            </if>
+            <if test="lastrecord != null and lastrecord != ''">
+                lastrecord = #{lastrecord},
+            </if>
+            <if test="lastinputgasnum != null and lastinputgasnum != ''">
+                lastinputgasnum = #{lastinputgasnum},
+            </if>
+            <if test="f_inputdate != null and f_inputdate != ''">
+                f_inputdate = #{f_inputdate},
+            </if>
+            <if test="scinputdate != null and scinputdate != ''">
+                scinputdate = #{scinputdate},
+            </if>
+            <if test="f_handdate != null and f_handdate != ''">
+                f_handdate = #{f_handdate},
+            </if>
+            <if test="shifoujiaofei != null and shifoujiaofei != ''">
+                shifoujiaofei = #{shifoujiaofei},
+            </if>
+            <if test="f_endjfdate != null and f_endjfdate != ''">
+                f_endjfdate = #{f_endjfdate},
             </if>
-            <if test="month != null and month != ''">
-                month = #{month},
+            <if test="f_state != null and f_state != ''">
+                f_state = #{f_state},
             </if>
-            <if test="economyType != null and economyType != ''">
-                economyType = #{economyType},
+            <if test="f_sellid != null and f_sellid != ''">
+                f_sellid = #{f_sellid},
             </if>
-            <if test="number != null and number != ''">
-                number = #{number},
+            <if test="f_zhinajin != null and f_zhinajin != ''">
+                f_zhinajin = #{f_zhinajin},
             </if>
-            <if test="yearOnYear != null and yearOnYear != ''">
-                yearOnYear = #{yearOnYear},
+            <if test="f_zhinajindate != null and f_zhinajindate != ''">
+                f_zhinajindate = #{f_zhinajindate},
             </if>
-            <if test="cityProportion != null and cityProportion != ''">
-                cityProportion = #{cityProportion},
+            <if test="f_zhinajintianshu != null and f_zhinajintianshu != ''">
+                f_zhinajintianshu = #{f_zhinajintianshu},
             </if>
         </trim>
         where id = #{id}