From e28a637d58ca39b343ee8bcac0dffc860469a883 Mon Sep 17 00:00:00 2001
From: chenglifeng <clf_cheng@163.com>
Date: Tue, 5 Nov 2024 11:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=87=8F=E8=AE=A1=E5=88=92=E6=8A=A5?=
 =?UTF-8?q?=E9=AA=8C=E5=8D=95web=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/viewmodel/ProjectViewModel.kt       |  2 +-
 .../java/com/project/survey/network/Api.kt    |  2 +-
 .../pointmeasure/PointMeasureListActivity.kt  | 25 +++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt b/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt
index 7b4d742..247a55f 100644
--- a/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt
+++ b/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt
@@ -82,7 +82,7 @@ class ProjectViewModel : BaseViewModel() {
             val res = api.fetchMeasureDataList(
                 tableCode = type,
                 funcCode = if (type == Constants.TYPE_BD_CLJH) Constants.TYPE_BD_CLJH else "${Constants.TYPE_BD_CLGZ_GCJL}_ZB",
-                j_qurey = query,
+                j_query = query,
                 page = page
             )
             if (res.success) {
diff --git a/app/src/main/java/com/project/survey/network/Api.kt b/app/src/main/java/com/project/survey/network/Api.kt
index b2a2fed..c3af843 100644
--- a/app/src/main/java/com/project/survey/network/Api.kt
+++ b/app/src/main/java/com/project/survey/network/Api.kt
@@ -150,7 +150,7 @@ interface Api {
         @Header("projectId") projectId: String = SPUtils.getString(SPConstants.PROJECT_ID),
         @Field("tableCode") tableCode: String,
         @Field("funcCode") funcCode: String,
-        @Field("j_query") j_qurey: String?,
+        @Field("j_query") j_query: String?,
         @Field("page") page: Int,
         @Field("limit") limit: Int = 1000,
         @Field("start") start: Int = 0
diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
index b595728..419b4c7 100644
--- a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
+++ b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
@@ -1,10 +1,14 @@
 package com.project.survey.ui.pointmeasure
 
+import android.net.Uri
 import androidx.activity.viewModels
 import com.afollestad.materialdialogs.MaterialDialog
+import com.bingce.surveyor.agentweb.AgentWebActivity
+import com.project.survey.BuildConfig
 import com.project.survey.R
 import com.project.survey.constants.AdapterConstants
 import com.project.survey.constants.Constants
+import com.project.survey.constants.SPConstants
 import com.project.survey.databinding.ActivityPointMeasureListBinding
 import com.project.survey.extend.smartDismiss
 import com.project.survey.extend.toast
@@ -16,6 +20,7 @@ import com.project.survey.ui.pointmeasure.adapter.PointMeasureListAdapter
 import com.project.survey.ui.pointmeasure.measure.PointSurveyNewActivity
 import com.project.survey.util.ActivityNavUtil
 import com.project.survey.util.LogoutUtil
+import com.project.survey.util.SPUtils
 import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
 
@@ -92,7 +97,7 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
         }
         // 生成报验单
         viewModel.createInspectionReportResponse.observe(this) {
-            toast(it.CLJH_WORKSTATUS)
+            navigation2BaoYanDan(it.BD_CLJH_ID)
         }
         //
         viewModel.updateMeasureWorkStatusResponse.observe(this) {
@@ -120,7 +125,11 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
         // 生成报验单
         adapter.addOnItemChildClickListener(R.id.tvGenerateForm) { adapter, _, position ->
             adapter.getItem(position)?.let { bean ->
-                viewModel.createInspectionReport(bean.BD_CLJH_ID)
+                if ("报验单已生成" == bean.CLJH_WORKSTATUS){
+                    navigation2BaoYanDan(bean.BD_CLJH_ID)
+                } else {
+                    viewModel.createInspectionReport(bean.BD_CLJH_ID)
+                }
             }
         }
         // 结束测量
@@ -157,6 +166,18 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
         viewModel.fetchMeasureDataList(type, 1, searchContent)
     }
 
+    /**
+     * 报验单 Web 页面
+     */
+    private fun navigation2BaoYanDan(workId: String){
+        // http://10.190.183.37/app/micro/func/#/pages/func/form/BD_CLJH/{workId}?authorization={登录token}&appId=2024-1104-1503-4541
+        val token = SPUtils.getString(SPConstants.TOKEN)
+        val url =
+            BuildConfig.BASE_URL + "app/micro/func/#/pages/func/form/BD_CLJH/${workId}?authorization=${token}&appId=2024-1104-1503-4541"
+        AgentWebActivity.navigation2(this, Uri.parse(url))
+    }
+
+
 //    override fun onRefresh(refreshLayout: RefreshLayout) {
 //        currentPage = 1
 //        fetchData()