From f628ae64a986f2b366a9bf1872b452cdf54245b9 Mon Sep 17 00:00:00 2001 From: YANGJIANKUAN Date: Thu, 5 Mar 2026 16:21:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B5=E6=97=A5=E6=9C=9F=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=8A=E4=BB=93=E5=82=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA=E5=85=9C=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统计接口日期参数与列表接口统一为 beginDate/endDate - 入库/出库时间 substring 前增加长度校验，防止 StringIndexOutOfBoundsException Co-Authored-By: Claude Opus 4.6 --- .claude/settings.local.json | 4 +++- .../java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt | 4 ++-- module_gjc/src/main/res/layout/item_gjc_query_storage.xml | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 1f396c9..b126304 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -58,7 +58,9 @@ "WebFetch(domain:m.gainscha.com)", "Bash(git add:*)", "Bash(git commit:*)", - "WebFetch(domain:support.claude.com)" + "WebFetch(domain:support.claude.com)", + "WebFetch(domain:api.apifox.com)", + "Bash(curl:*)" ], "deny": [], "ask": [] diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt index e3afda6..a6ed8fa 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt @@ -119,8 +119,8 @@ class GjcQueryViewModel : BasePageViewModel() { // 构建查询参数（统计接口 - 使用相同的搜索条件） val totalParams = mapOf( - "fdateStart" to flightDateStart.value!!.ifEmpty { null }, - "fdateEnd" to flightDateEnd.value!!.ifEmpty { null }, + "beginDate" to flightDateStart.value!!.ifEmpty { null }, + "endDate" to flightDateEnd.value!!.ifEmpty { null }, "agentCode" to agentId.value!!.ifEmpty { null }, "outState" to outStatus.value!!.ifEmpty { null }, "wbNo" to waybillNo.value!!.ifEmpty { null }, diff --git a/module_gjc/src/main/res/layout/item_gjc_query_storage.xml b/module_gjc/src/main/res/layout/item_gjc_query_storage.xml index f818165..4680a1f 100644 --- a/module_gjc/src/main/res/layout/item_gjc_query_storage.xml +++ b/module_gjc/src/main/res/layout/item_gjc_query_storage.xml @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:layout_weight="1.5" android:gravity="center" - android:text="@{bean.inDate != null ? String.valueOf(bean.inDate).substring(0, 16) : `--`}" + android:text="@{bean.inDate != null && String.valueOf(bean.inDate).length() >= 16 ? String.valueOf(bean.inDate).substring(0, 16) : (bean.inDate != null && String.valueOf(bean.inDate).length() > 0 ? String.valueOf(bean.inDate) : `--`)}" android:textColor="@android:color/black" android:textSize="14sp" /> @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:layout_weight="1.5" android:gravity="center" - android:text="@{bean.outDate != null ? String.valueOf(bean.outDate).substring(0, 16) : `--`}" + android:text="@{bean.outDate != null && String.valueOf(bean.outDate).length() >= 16 ? String.valueOf(bean.outDate).substring(0, 16) : (bean.outDate != null && String.valueOf(bean.outDate).length() > 0 ? String.valueOf(bean.outDate) : `--`)}" android:textColor="@android:color/black" android:textSize="14sp" />