sale-client 4.3.63 → 4.3.65

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Mar 09 11:40:35 CST 2026
+#Wed May 13 15:19:48 CST 2026
 gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://123.180.154.5:31467/', 'http://123.180.154.5:31467/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -50,12 +50,12 @@ var devConfig = {
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
-      // '/api/af-revenue': {
-      //   pathRewrite: {
-      //     '/api/af-revenue': '/af-revenue'
-      //   },
-      //   target: "http://localhost:8080"
-      // },
+      '/api/af-revenue': {
+        pathRewrite: {
+          '/api/af-revenue': '/'
+        },
+        target: "http://localhost:9026"
+      },
       '/api': {
         target: serverRul
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.3.63",
+  "version": "4.3.65",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/jinhong/InsuranceTemp.vue

@@ -110,31 +110,26 @@ export default {
     if (this.row.f_ins_stop_date && this.row.f_ins_stop_date > Util.toStandardTimeString()) {
       this.model.f_ins_start_date = this.row.f_ins_stop_date
     } else {
-      this.model.f_ins_start_date = Util.toStandardTimeString()
+      // 获取明天 00:00:00 的标准时间
+      let tomorrow = new Date()
+      tomorrow.setDate(tomorrow.getDate() + 1)
+      let year = tomorrow.getFullYear()
+      let month = (tomorrow.getMonth() + 1).toString().padStart(2, '0')
+      let date = tomorrow.getDate().toString().padStart(2, '0')
+      // 固定时间 00:00:00
+      let nextDayTime = `${year}-${month}-${date} 00:00:00`
+      this.model.f_ins_start_date = nextDayTime
     }
   },
   watch: {
     'model.f_ins_start_date' (val) {
       if (val && this.model.f_salecount) {
         let tx = new Date(val)
-        let tmp = {
-          year: tx.getFullYear(),
-          month: tx.getMonth() + 1,
-          day: tx.getDate()
-        }
-        let tmpdate = new Date((tmp.year + (this.model.f_salecount - 0)) + '-' + (tmp.month < 10 ? '0' + tmp.month : tmp.month) + '-' + (tmp.day < 10 ? '0' + tmp.day : tmp.day))
-        let date
-        if (tmp.month < (tmpdate.getMonth() + 1)) {
-          date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000 * 2)
-        } else {
-          date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000)
-        }
-        let jt = {
-          year: date.getFullYear(),
-          month: date.getMonth() + 1,
-          day: date.getDate()
-        }
-        this.model.f_expiration_date = jt.year + '-' + (jt.month < 10 ? '0' + jt.month : jt.month) + '-' + (jt.day < 10 ? '0' + jt.day : jt.day)
+        // 核心：年份 +1，保持月日不变，时间 00:00:00
+        let nextYear = tx.getFullYear() + this.model.f_salecount
+        let month = (tx.getMonth() + 1).toString().padStart(2, '0')
+        let day = tx.getDate().toString().padStart(2, '0')
+        this.model.f_expiration_date = `${nextYear}-${month}-${day} 00:00:00`
       }
     },
     'model.f_money' (val) {
@@ -148,24 +143,11 @@ export default {
         this.f_salecount.dctest = false
       } else if (val && this.model.f_ins_start_date) {
         let tx = new Date(this.model.f_ins_start_date)
-        let tmp = {
-          year: tx.getFullYear(),
-          month: tx.getMonth() + 1,
-          day: tx.getDate()
-        }
-        let tmpdate = new Date((tmp.year + (val - 0)) + '-' + (tmp.month < 10 ? '0' + tmp.month : tmp.month) + '-' + (tmp.day < 10 ? '0' + tmp.day : tmp.day))
-        let date
-        if (tmp.month < (tmpdate.getMonth() + 1)) {
-          date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000 * 2)
-        } else {
-          date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000)
-        }
-        let jt = {
-          year: date.getFullYear(),
-          month: date.getMonth() + 1,
-          day: date.getDate()
-        }
-        this.model.f_expiration_date = jt.year + '-' + (jt.month < 10 ? '0' + jt.month : jt.month) + '-' + (jt.day < 10 ? '0' + jt.day : jt.day)
+        let nextYear = tx.getFullYear() + Number(val)
+        let month = (tx.getMonth() + 1).toString().padStart(2, '0')
+        let day = tx.getDate().toString().padStart(2, '0')
+        // 结束日期 = 下一年同一天 00:00:00
+        this.model.f_expiration_date = `${nextYear}-${month}-${day} 00:00:00`
         this.f_salecount.dctest = true
       } else {
         this.f_salecount.dctest = true

package/src/filiale/liaoyuan/ChangeMeter.vue

@@ -184,10 +184,10 @@
         </div>
       </div>
       <div style="text-align:right;height:auto;">
-        <button class="button_search" type="button" v-if="!config.hasAudit"  @click="confirmbefore(confirm)" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
+        <button class="button_search" type="button" v-if="!config.hasAudit"  @click="confirmbefore('confirm')" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
         >确认
         </button>
-        <button class="button_search" type="button" v-if="config.hasAudit" @click="confirmbefore(audit)" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
+        <button class="button_search" type="button" v-if="config.hasAudit" @click="confirmbefore('audit')" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
         >发起审核
         </button>
         <button class="button_clear" type="button" @click="clean()" >取消
@@ -355,7 +355,7 @@ export default {
           return
         }
       }
-      if (this.model.metermessage.f_meter_type[0] != '机表') {
+      if (this.model.metermessage.f_meter_type[0] == '机表') {
         console.log('进来了')
         if (this.books.data.length > 0) {
           console.log('进来了2')
@@ -410,7 +410,11 @@ export default {
               if (this.model.metermessage.f_meter_type[0] != '机表') {
                 this.$dispatch('refresh')
               } else {
-                this.saveobj(type)
+                if (type === 'confirm') {
+                  this.saveobj()
+                } else {
+                  this.auditData()
+                }
               }
             })
           } else {
@@ -421,6 +425,7 @@ export default {
         if (this.row.f_meter_type.includes('气量卡表') && (this.model.f_using_base_old > (this.row.f_total_gas + this.row.f_initial_base + this.row.f_remanent_gas))) {
           await this.$showMessage(`该表可能存在超用，请确定是否继续进行换表操作！！！,或者取消进入超用收费！`, ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
+              console.log(type)
               if (type === 'confirm') {
                 this.saveobj()
               } else {
@@ -526,6 +531,7 @@ export default {
       for (let row of this.resid) {
         param.push(row.id)
       }
+      data.config.hasArrearsChange = true
       this.model.files = param
       this.$resetpost('api/af-revenue/logic/mobile_changeMeter', data, {
         resolveMsg: null,
@@ -792,11 +798,11 @@ export default {
       )
       console.log('获取到的欠费记录', books)
       this.books = books
-      // 如果是机表验证是否有欠费
-      if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
-        this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
-        this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
-      }
+      // // 如果是机表验证是否有欠费
+      // if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
+      //   this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
+      //   this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+      // }
     }
   },
 

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/jinhong/sale'
+import FilialeSale from './filiale/liaoyuan/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/.history/src/components/charge//346/211/271/351/207/217/346/226/260/345/273/272/346/255/243/345/274/217/346/210/267/346/241/243/346/241/210_/351/224/231/350/257/257/346/217/220/347/244/272/345/242/236/345/212/240/350/241/214/345/217/267_20260409222129.groovy

@@ -1,418 +0,0 @@
-// 功能: 批量新建正式用户档案
-// 版本： 1.0
-// 参数：{"data":{"filepath":"E://files/1.xlsx","f_operator":"admin","f_operatorid":"240728","f_orgid":"453","f_orgname":"临沂公司","f_depid":"1561","f_depname":"河东营业厅"}}
-//
-// 修改时间: 2026-03-09
-// 修改内容: 错误提示增加行号显示，便于定位问题数据，并保存错误信息到t_handerror表
-
-
-log.info("----------------------开始时间{dateTools.getNow2()}------------------------------"),
-//读取传入的excel文件
-allUserInfo = data.datas,
-log.info("===={allUserInfo}"),
-len = 1,
-errorlen = 0,
-// 错误数据集合（用于落表 t_handerror）
-errorData = [],
-// 暂存小区验证信息
-areaExist = {},
-// 暂存气表品牌验证信息
-gasBrandExist = {},
-// 暂存气表型号验证信息
-gasModelExist = {},
-// 暂存气价验证信息
-priceTypeExist = {},
-
-allUserInfo.length()>0:(
-    allUserInfo.each(
-        flag = "1",
-        saveData = {},
-        saveData.t_user_address = {},
-        saveData.t_userinfo = {},
-        saveData.t_userfiles = {},
-        // 错误行基础信息
-        errorrow = {
-            f_operator_type: "批量建档",
-            f_orgid: data.f_orgid,
-            f_orgname: data.f_orgname,
-            f_depid: data.f_depid,
-            f_depname: data.f_depname,
-            f_operator: data.f_operator,
-            f_operatorid: data.f_operatorid
-        },
-        saveData.t_user_address.f_operator = data.userData.currUserName,
-        saveData.t_user_address.f_create_person = data.userData.currUserName,
-        saveData.t_user_address.f_operatorid = data.userData.currUserId,
-        saveData.t_user_address.f_orgid = data.userData.orgId,
-        saveData.t_user_address.f_orgname = data.userData.orgName,
-        saveData.t_user_address.f_depid = data.userData.depId,
-        saveData.t_user_address.f_depname = data.userData.depName,
-
-        saveData.t_user_address.f_building = row.f_building ,
-        saveData.t_user_address.f_unit = row.f_unit,
-        saveData.t_user_address.f_floor =  row.f_floor,
-        saveData.t_user_address.f_room = row.f_room,
-        saveData.t_user_address.f_street = row.f_street,
-        saveData.t_user_address.f_pcd = row.f_pcd,
-
-        saveData.t_user_address.f_residential_area = row.f_residential_area ,
-
-        ENV.tenantName == "aode" :(
-            saveData.t_user_address.f_filiale = data.userData.orgId
-        ),(
-            saveData.t_user_address.f_filiale = data.userData.orgName
-        ),
-        saveData.t_user_address.f_filialeid = data.userData.orgId,
-        saveData.t_user_address.f_create_date = dateTools.getNow2(),
-        saveData.t_user_address.f_comments = "sign",
-        authorizesql = "",
-        //验证地址是否进行导入,如果导入使用导入的地址即可
-        //榆林榆川不进行地址校验
-        ENV.tenantName != "yuchuan2" || ENV.tenantName != "yuchuan" : (
-            //地址不存在需要新建地址
-            queryAreaSql = " select id,f_pcd_id,f_pcd,f_street,f_street_id from t_area where f_residential_area = '{row.f_residential_area}'",
-            // 如果有省市区加上省市区条件
-            row.f_pcd != null && row.f_pcd != "" :(
-                queryAreaSql = "{queryAreaSql} and f_pcd = '{row.f_pcd}'"
-            ),null,
-            // 如果有街道加上街道条件
-            row.f_street != null && row.f_street != "" :(
-                queryAreaSql = "{queryAreaSql} and f_street = '{row.f_street}'"
-            ),null,
-            ENV.tenantName == "aode" :(
-                queryAreaSql = "{queryAreaSql} and f_filialeid = '{data.userData.orgId}'"
-            ),(
-                queryAreaSql = "{queryAreaSql} and f_orgid = '{data.userData.orgId}'"
-            ),
-            areaExist.has(row.f_residential_area) : (
-                newaddressinfo = areaExist.get(row.f_residential_area)
-            ),(
-                newaddressinfo = sql.querySQL("queryAreaSql",queryAreaSql)
-            ),
-            newaddressinfo.length() == 1 : (
-                areaExist.put(row.f_residential_area, newaddressinfo),
-                saveData.t_user_address.f_residential_area_id = newaddressinfo[0].id,
-                saveData.t_user_address.f_pcd_id = newaddressinfo[0].f_pcd_id,
-                saveData.t_user_address.f_pcd = newaddressinfo[0].f_pcd,
-                saveData.t_user_address.f_street_id = newaddressinfo[0].f_street_id,
-                saveData.t_user_address.f_street = newaddressinfo[0].f_street
-            ), newaddressinfo.length() > 1: (
-                flag = "0",
-                errorrow.f_address = saveData.t_user_address.f_residential_area,
-                errorrow.f_operator_date = dateTools.getNow2(),
-                row.f_pcd == null || row.f_pcd || "" : (
-                    errorrow.f_operator_info = "{len}行数据：查询到小区信息不唯一，请完善省市区信息之后重试"
-                ),row.f_street == null || row.f_street || "" : (
-                    errorrow.f_operator_info = "{len}行数据：查询到小区信息不唯一，请完善街道信息之后重试"
-                ),(
-                    errorrow.f_operator_info = "{len}行数据：查询到小区信息不唯一，请检查数据"
-                ),
-                errorData.put(errorrow)
-            ), (
-                flag = "0",
-                errorrow.f_address = row.f_residential_area,
-                errorrow.f_operator_date = dateTools.getNow2(),
-                errorrow.f_operator_info = "{len}行数据：小区不存在，请检查数据（小区名称：{row.f_residential_area}）",
-                errorData.put(errorrow)
-            ),
-            row.f_address== null || row.f_address == "" : (
-                saveData.t_user_address.f_address = "",
-                saveData.t_user_address.f_street != null : (
-                    saveData.t_user_address.f_address = "{saveData.t_user_address.f_address}{saveData.t_user_address.f_street}"
-                ),null,
-                row.f_residential_area != null : (
-                    saveData.t_user_address.f_address = "{saveData.t_user_address.f_address}{row.f_residential_area}"
-                ),null,
-                row.f_building != null : (
-                    saveData.t_user_address.f_building_suffix = row.f_building_suffix != null && row.f_building_suffix != "" : row.f_building_suffix, "栋" ,
-                    saveData.t_user_address.f_address = "{saveData.t_user_address.f_address}{row.f_building}{saveData.t_user_address.f_building_suffix}"
-                ),null,
-                row.f_unit != null : (
-                    saveData.t_user_address.f_unit_suffix = row.f_unit_suffix != null && row.f_unit_suffix != "" : row.f_unit_suffix, "单元" ,
-                    saveData.t_user_address.f_address = "{saveData.t_user_address.f_address}{row.f_unit}{saveData.t_user_address.f_unit_suffix}"
-                ),null,
-                row.f_floor != null : (
-                    saveData.t_user_address.f_floor_suffix =  row.f_floor_suffix != null && row.f_floor_suffix != "" : row.f_floor_suffix, "层" ,
-                    saveData.t_user_address.f_address = "{saveData.t_user_address.f_address}{row.f_floor}{saveData.t_user_address.f_floor_suffix}"
-                ),null,
-                row.f_room != null : (
-                    saveData.t_user_address.f_room_suffix = row.f_room_suffix != null && row.f_room_suffix != "" : row.f_room_suffix, "室" ,
-                    saveData.t_user_address.f_address = "{saveData.t_user_address.f_address}{row.f_room}{saveData.t_user_address.f_room_suffix}"
-                ),null
-            ),null,
-
-            // 验证地址是否重复
-            queryAddress = sql.querySQL("v3_query_sql","
-                 select id from t_user_address
-                 where f_residential_area = '{row.f_residential_area != null : row.f_residential_area , ""}'
-                 {saveData.t_user_address.f_pcd != null : " and f_pcd = '{saveData.t_user_address.f_pcd}'", " and ( f_pcd is null or f_pcd = '')" }
-                 {saveData.t_user_address.f_street != null : " and f_street = '{saveData.t_user_address.f_street}'", " and ( f_street is null or f_street = '')" }
-                 {row.f_unit != null : " and f_unit = '{row.f_unit}'", " and ( f_unit is null or f_unit = '')" }
-                 {row.f_building != null : " and f_building = '{row.f_building}'", " and ( f_building is null or f_building = '')" }
-                 {row.f_floor != null : " and f_floor = '{row.f_floor}'", " and ( f_floor is null or f_floor = '')" }
-                 {row.f_room != null : " and f_room = '{row.f_room}'", " and ( f_room is null or f_room = '')" }
-                 and f_address = '{saveData.t_user_address.f_address}'
-                "
-            ),
-            queryAddress.length() > 0 :(
-                flag = "0",
-                errorrow.f_address = saveData.t_user_address.f_address,
-                errorrow.f_operator_date = dateTools.getNow2(),
-                queryAddress.length() == 1 :(
-                    queryAddress[0].f_userinfo_id == "" ||  queryAddress[0].f_userinfo_id == null :(
-                        saveData.t_user_address.id = queryAddress[0].id
-                    ),(
-                        errorrow.f_operator_info = "{len}行数据：地址已被使用，地址信息：{saveData.t_user_address.f_address}",
-                        errorData.put(errorrow)
-                    )
-                ),(
-                    errorrow.f_operator_info = "{len}行数据：地址重复，地址信息：{saveData.t_user_address.f_address}",
-                    errorData.put(errorrow)
-                )
-            ),null
-        ),null,
-
-        saveData.t_userinfo.f_operator = data.userData.currUserName,
-        saveData.t_userinfo.f_operatorid = data.userData.currUserId,
-        saveData.t_userinfo.f_createfile_date = dateTools.getNow2(),
-        saveData.t_userinfo.f_orgid = data.userData.orgId,
-        saveData.t_userinfo.f_orgname = data.userData.orgName,
-        saveData.t_userinfo.f_depid = data.userData.depId,
-        saveData.t_userinfo.f_depname = data.userData.depName,
-        saveData.t_userinfo.f_operator_record = data.userData.currUserName,
-        saveData.t_userinfo.f_operatorid_record = data.userData.currUserId,
-        saveData.t_userinfo.f_orgid_record = data.userData.orgId,
-        saveData.t_userinfo.f_orgname_record = data.userData.orgName,
-        saveData.t_userinfo.f_depid_record = data.userData.depId,
-        saveData.t_userinfo.f_depname_record = data.userData.depName,
-        saveData.t_userinfo.f_userinfo_id = null,
-        saveData.t_userinfo.f_filialeid = data.userData.orgId,
-        saveData.t_userinfo.f_user_name = row.f_user_name,
-        saveData.t_userinfo.f_user_phone = row.f_user_phone,
-        saveData.t_userinfo.f_userinfo_code = row.f_userinfo_code,
-        saveData.t_userinfo.f_idnumber = row.f_idnumber,
-        saveData.t_userinfo.f_people_num = row.f_people_num,
-        saveData.t_userinfo.f_contract_id = row.f_contract_id,
-        saveData.t_userinfo.f_gas_date = row.f_gas_date,
-        saveData.t_userinfo.f_install_date = row.f_install_date,
-        saveData.t_userinfo.f_install_person = row.f_install_person,
-        saveData.t_userinfo.f_address = saveData.t_user_address.f_address,
-        row.has("f_user_state") && row.f_user_state != null : (
-            saveData.t_userinfo.f_user_state = row.f_user_state
-        ),(
-            saveData.t_userinfo.f_user_state = "正常"
-        ),
-        saveData.t_userinfo.f_credentials = row.f_credentials,
-        row.f_user_name == null:(
-            saveData.t_userinfo.f_user_name = ""
-        ),null,
-        allGasBrand = [],
-
-        row.f_meter_brand != null : (
-            gasBrandExist.has(row.f_meter_brand):(
-                allGasBrand = gasBrandExist.get(row.f_meter_brand)
-            ),(
-                allGasBrand = sql.querySQL("v3_query_sql"," select * from t_gasbrand where cast(id as varchar) = '{row.f_meter_brand}' or f_meter_brand = '{row.f_meter_brand}'")
-            )
-        ),(
-            saveData.t_userinfo.f_user_state != "预备" : (
-                flag = "0",
-                errorrow.f_address = row.f_residential_area,
-                errorrow.f_operator_date = dateTools.getNow2(),
-                errorrow.f_operator_info = "{len}行数据：气表品牌不存在，请检查！（气表品牌：{row.f_meter_brand}）",
-                errorData.put(errorrow)
-            ), null
-        ),
-        allGasModel = [],
-        row.f_meter_style != null && allGasBrand.length()>0:(
-            gasModelExist.has(row.f_meter_style):(
-                allGasModel = gasModelExist.get(row.f_meter_style)
-            ),(
-                allGasModel= sql.querySQL("v3_query_sql"," select id from t_gasmodel where f_gasbrand_id = '{allGasBrand[0].id}' and (cast(id as varchar) = '{row.f_meter_style}' or f_meter_style = '{row.f_meter_style}')  ")
-            )
-        ),(
-            saveData.t_userinfo.f_user_state != "预备" : (
-                flag = "0",
-                errorrow.f_address = row.f_residential_area,
-                errorrow.f_operator_date = dateTools.getNow2(),
-                errorrow.f_operator_info = "{len}行数据：气表型号不存在，请检查！（气表型号：{row.f_meter_style}）",
-                errorData.put(errorrow)
-            ), null
-        ),
-        alladjutable=[],
-        allPriceType =[],
-        ENV.tenantName != "yuchuan2" || ENV.tenantName != "yuchuan" : (
-            row.f_price_name != null:(
-                priceTypeExist.has(row.f_price_name):(
-                    allPriceType = priceTypeExist.get(row.f_price_name)
-                ),(
-                    allPriceType = sql.querySQL("v3_query_sql","
-                        select * from t_stairprice where f_price_name='{row.f_price_name}' and f_state='有效'
-                        and f_filialeid='{data.userData.orgId}'
-                        and (GETDATE()>f_perform_date and GETDATE()<f_end_date)"
-                    )
-                )
-            ),(
-                saveData.t_userinfo.f_user_state != "预备" : (
-                    flag = "0",
-                    errorrow.f_address = row.f_residential_area,
-                    errorrow.f_operator_date = dateTools.getNow2(),
-                    errorrow.f_operator_info = "{len}行数据：未设置气价名称，请检查！（气价名称：{row.f_price_name}）",
-                    errorData.put(errorrow)
-                ), null
-            )
-        ),null,
-        //验证数据
-        allGasBrand.length() == 1:(
-            gasBrandExist.put(row.f_meter_brand, allGasBrand),
-            saveData.t_userfiles.f_gasbrand_id = allGasBrand[0].id,
-            saveData.t_userfiles.f_meter_classify = allGasBrand[0].f_meter_type
-        ),(
-            (saveData.t_userinfo.f_user_state == "预备" && allGasBrand.length() != 1 && row.f_meter_brand != null) || saveData.t_userinfo.f_user_state != "预备": (
-                flag = "0",
-                errorrow.f_address = row.f_residential_area,
-                errorrow.f_operator_date = dateTools.getNow2(),
-                errorrow.f_operator_info = "{len}行数据：气表品牌错误，请检查！（气表品牌：{row.f_meter_brand}）",
-                errorData.put(errorrow)
-            ),null
-        ),
-        allGasModel.length() == 1:(
-            gasModelExist.put(row.f_meter_style, allGasModel),
-            saveData.t_userfiles.f_gasmodel_id = allGasModel[0].id
-        ),(
-            (saveData.t_userinfo.f_user_state == "预备" && allGasModel.length() != 1 && row.f_meter_style != null) || saveData.t_userinfo.f_user_state != "预备" : (
-                flag = "0",
-                errorrow.f_address = row.f_residential_area,
-                errorrow.f_operator_date = dateTools.getNow2(),
-                errorrow.f_operator_info = "{len}行数据：气表型号错误，请检查！（气表型号：{row.f_meter_style}）",
-                errorData.put(errorrow)
-            ),null
-        ),
-        ENV.tenantName != "yuchuan2" || ENV.tenantName != "yuchuan" : (
-            alladjutable.length()==1:(
-            saveData.t_userfiles.f_adjustable_id = alladjutable[0].id
-            ),null,
-            allPriceType.length()==1:(
-                priceTypeExist.put(row.f_price_name, allPriceType),
-                saveData.t_userfiles.f_price_id = allPriceType[0].f_price_id
-            ),(
-                (saveData.t_userinfo.f_user_state == "预备" && allPriceType.length() != 1 && row.f_price_name != null) || saveData.t_userinfo.f_user_state != "预备" : (
-                    flag = "0",
-                    errorrow.f_address = row.f_residential_area,
-                    errorrow.f_operator_date = dateTools.getNow2(),
-                    errorrow.f_operator_info = "{len}行数据：气价不存在或气价类型错误，请检查！（气价名称：{row.f_price_name}）",
-                    errorData.put(errorrow)
-                ),null
-            )
-        ),null,
-        // 表号查询的数据多最后验证表号
-        row.has("f_meternumber") && row.f_meternumber != "" :(
-            meternumberV= sql.querySQL("v3_query_sql","
-                select f_user_id from t_userfiles where f_gasbrand_id='{allGasBrand[0].id}' and f_meternumber = '{row.f_meternumber}'"
-            ),
-            meternumberV.length()>0:(
-                flag = "0",
-                errorrow.f_address = row.f_residential_area,
-                errorrow.f_operator_date = dateTools.getNow2(),
-                errorrow.f_operator_info = "{len}行数据：表号重复，请检查！（表号：{row.f_meternumber}）",
-                errorData.put(errorrow)
-            ),null
-        ),null,
-        ENV.tenantName == "huaran" :(
-            // 验证表计信息是否存在
-            row.has("f_meternumber") && row.f_meternumber != "" : (
-                meterInfo = sql.querySQL("v3_query_sql","
-                    select id from t_meterinfo
-                    where f_meter_brand='{allGasBrand[0].f_meter_brand}' and f_meternumber = '{row.f_meternumber}'"
-                ),
-                meterInfo.length() == 0:(
-                    flag = "0",
-                    errorrow.f_address = row.f_residential_area,
-                    errorrow.f_operator_date = dateTools.getNow2(),
-                    errorrow.f_operator_info = "{len}行数据：表具信息在表计信息中不存在，请检查！（表号：{row.f_meternumber}）",
-                    errorData.put(errorrow)
-                ),null
-            ),null
-        ),null,
-        // 判断flag，如果为1则保存数据，否则记录错误数
-        flag == "1":(
-            saveData.t_userfiles.f_table_state = "正常",
-            saveData.t_userfiles.f_whether_hairpin = "未发",
-            saveData.t_userfiles.f_input_person = data.userData.currUserName,
-            saveData.t_userfiles.f_input_date = dateTools.getNow2(),
-            saveData.t_userfiles.f_card_password = "",
-            saveData.t_userfiles.f_operator = data.userData.currUserName,
-            saveData.t_userfiles.f_operatorid = data.userData.currUserId,
-            saveData.t_userfiles.f_orgid =data.userData.orgId,
-            saveData.t_userfiles.f_orgname =data.userData.orgName,
-            saveData.t_userfiles.f_depid = data.userData.depId,
-            saveData.t_userfiles.f_depname = data.userData.depName,
-            saveData.t_userfiles.f_filialeid = data.userData.orgId,
-            saveData.t_userfiles.f_meternumber = row.f_meternumber,
-            saveData.t_userfiles.f_initial_base = row.f_initial_base,
-            saveData.t_userfiles.f_metertitles = row.f_metertitles,
-            saveData.t_userfiles.f_aroundmeter = row.f_aroundmeter,
-            saveData.t_userfiles.img = {},
-            saveData.t_userfiles.img.content="",
-            saveData.t_userfiles.img.filename="",
-            saveData.t_userfiles.devicesinfo =jsonTools.getArray(),
-            saveData.t_userfiles = saveData.t_userfiles,
-            saveData.t_user_address.f_price_id= saveData.t_userfiles.f_price_id,
-            saveData.t_user_address.f_operate_date = dateTools.getNow2(),
-            row = jsonTools.addJSON(row, saveData)
-        ),(
-            errorlen = errorlen + 1
-        ),
-        //保存地址数据
-        len = len+1
-    )
-),null,
-
-// 批量存储错误数据到 t_handerror（分批插入，每批最多1000条）
-errorData.length()>0:(
-    ENV.tenantName == "aode" :(
-        batchSize = 1000,
-        totalCount = errorData.length(),
-        batchCount = (totalCount + batchSize - 1) / batchSize,
-        log.info("错误数据共{totalCount}条，需要分{batchCount}批插入"),
-        i = 0,
-        batchCount > 0:(
-            batchCount.each(
-                startIdx = i * batchSize,
-                endIdx = (i + 1) * batchSize > totalCount ? totalCount : (i + 1) * batchSize,
-                batchData = errorData.subList(startIdx, endIdx),
-                batchValues = settleToolsAoDe.getAllsomeValue(batchData),
-                batchFields = settleToolsAoDe.getAllsomFields(batchData),
-                log.info("插入第{i+1}批数据，从第{startIdx}条到第{endIdx}条"),
-                sql.execSQL("v3_sql_name","
-                    insert into t_handerror{batchFields} values{batchValues}
-                "),
-                i = i + 1
-            )
-        )
-    ),(
-        batchSize = 1000,
-        totalCount = errorData.length(),
-        batchCount = (totalCount + batchSize - 1) / batchSize,
-        log.info("错误数据共{totalCount}条，需要分{batchCount}批插入"),
-        i = 0,
-        batchCount > 0:(
-            batchCount.each(
-                startIdx = i * batchSize,
-                endIdx = (i + 1) * batchSize > totalCount ? totalCount : (i + 1) * batchSize,
-                batchData = errorData.subList(startIdx, endIdx),
-                batchValues = settleTools.getAllsomeValue(batchData),
-                batchFields = settleTools.getAllsomFields(batchData),
-                log.info("插入第{i+1}批数据，从第{startIdx}条到第{endIdx}条"),
-                sql.execSQL("v3_sql_name","
-                    insert into t_handerror{batchFields} values{batchValues}
-                "),
-                i = i + 1
-            )
-        )
-    )
-),null,
-allCount = allUserInfo.length(),
-successnum = allCount - errorlen,
-log.info("----------------------结束时间{dateTools.getNow2()}------------------------------"),
-throw "批量建档完成！共处理{allCount}条，成功{successnum}条，失败{errorlen}条"