fix: 修改普通交限入库规则,首尾相接数据不入库

This commit is contained in:
2023-06-25 16:49:25 +08:00
parent a5e964efbb
commit e9af1785f8
7 changed files with 73 additions and 28 deletions

View File

@@ -13,7 +13,7 @@ class ImportConfig {
var checked : Boolean = true
val preProcess: ImportPreProcess = ImportPreProcess()
fun transformProperties(renderEntity: RenderEntity): RenderEntity {
fun transformProperties(renderEntity: RenderEntity): RenderEntity? {
val transformList = tableMap[renderEntity.code.toString()]?.transformer
if (transformList.isNullOrEmpty()) {
return renderEntity
@@ -31,6 +31,7 @@ class ImportConfig {
// 如果key和value都为空说明当前数据需要增加一个新字段
if (key.isNullOrEmpty()&&value.isNullOrEmpty()&&!renderEntity.properties.containsKey(keylib)) {
renderEntity.properties[keylib] = valuelib
continue
}
// 开始解析key和value并对数据进行匹配
m@ for (k in processKeyOrValue(key)) {
@@ -54,7 +55,12 @@ class ImportConfig {
callByParams[methodParams[index+1]] = value
}
}
method.callBy(callByParams)
when(val result = method.callBy(callByParams)) { // 如果方法返回的数据类型是boolean且返回为false则该数据不处理
is Boolean ->
if (!result) {
return null
}
}
} else {
renderEntity.properties[keylib] = valuelib
}
@@ -77,7 +83,12 @@ class ImportConfig {
callByParams[methodParams[index+1]] = value
}
}
method.callBy(callByParams)
when(val result = method.callBy(callByParams)) {
is Boolean ->
if (!result) {
return null
}
}
} else {
renderEntity.properties[keylib] = valuelib
}