eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 国际出港查询页日期参数修正及仓储列表日期显示兜底

Browse Source 
- 统计接口日期参数与列表接口统一为 beginDate/endDate
- 入库/出库时间 substring 前增加长度校验，防止 StringIndexOutOfBoundsException

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
杨建宽
2026-03-05 16:21:44 +08:00
parent b2cc0059b3
commit f628ae64a9
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt
View File

@@ -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 },

4
module_gjc/src/main/res/layout/item_gjc_query_storage.xml
View File

@@ -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 &amp;&amp; String.valueOf(bean.inDate).length() >= 16 ? String.valueOf(bean.inDate).substring(0, 16) : (bean.inDate != null &amp;&amp; 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 &amp;&amp; String.valueOf(bean.outDate).length() >= 16 ? String.valueOf(bean.outDate).substring(0, 16) : (bean.outDate != null &amp;&amp; String.valueOf(bean.outDate).length() > 0 ? String.valueOf(bean.outDate) : `--`)}"
android:textColor="@android:color/black"
android:textSize="14sp" />