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" />