🆗 优化日志打印, 页面显示打卡位置

This commit is contained in:
2025-03-31 10:56:18 +08:00
parent 615eec3b7a
commit 1a06ab6807
3 changed files with 31 additions and 1 deletions

View File

@@ -163,6 +163,17 @@ class HoperunSignController {
monthAttLog.autoDakaBeginTime = autoDaka.beginTime
monthAttLog.autoDakaEndTime = autoDaka.endTime
}
monthAttResult.forEach {
it.actual_area_begin =
if (!it.actual_area_begin.isNullOrBlank()) {
if (it.actual_area_begin == "buqianka") "补签卡" else
area_regex.find(it.actual_area_begin!!)?.groups?.get(0)?.value
} else null
it.actual_area_end = if (!it.actual_area_end.isNullOrBlank()) {
if (it.actual_area_end == "buqianka") "补签卡" else
area_regex.find(it.actual_area_end!!)?.groups?.get(0)?.value
} else null
}
return monthAttResult
}
@@ -374,6 +385,8 @@ class WebResult<T> protected constructor() : java.io.Serializable {
}
}
val area_regex = Regex(".*[\\u4e00-\\u9fa5]|[0-9][\\u4e00-\\u9fa5]")
data class MonthAttLog(
var area_id: String? = null,
var area_id_begin: String? = null,
@@ -390,6 +403,8 @@ data class MonthAttLog(
var yearmonth: String? = null,
var autoDakaBeginTime: String? = null,
var autoDakaEndTime: String? = null,
var actual_area_begin: String? = null,
var actual_area_end: String? = null
)
data class HoperunDakaRequest(