From 3b85a43146c7addc8b0b4ab2b93d9d5f5fd2b69b Mon Sep 17 00:00:00 2001
From: chenglifeng <clf_cheng@163.com>
Date: Mon, 4 Nov 2024 18:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=AE=A1=E9=87=8F=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=87=8Citem=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/project/survey/model/MeasureBean.kt  |  3 ++-
 .../ui/pointmeasure/PointMeasureListActivity.kt   |  4 +++-
 .../adapter/PointMeasureListAdapter.kt            | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/project/survey/model/MeasureBean.kt b/app/src/main/java/com/project/survey/model/MeasureBean.kt
index 2265714..14d4f34 100644
--- a/app/src/main/java/com/project/survey/model/MeasureBean.kt
+++ b/app/src/main/java/com/project/survey/model/MeasureBean.kt
@@ -68,5 +68,6 @@ data class MeasureBean(
     val GCJL_LCMC: String?, //流程名称（工程计量）
     val GCJL_BDLSH: String?, //流程编号
     val GCJL_JLNR: String?, //计量内容
-    val BD_CLGZ_GCJL_ID: String
+    val BD_CLGZ_GCJL_ID: String,
+    val GCJL_WORKSTATUS: String? //状态
 )
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 07bf80f..f8c37bf 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
@@ -143,7 +143,9 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
             adapter.getItem(position)?.let { bean ->
                 val workId =
                     if (type == Constants.TYPE_BD_CLJH) bean.BD_CLJH_ID else bean.BD_CLGZ_GCJL_ID
-                if ("待执行" == bean.CLJH_WORKSTATUS || bean.CLJH_WORKSTATUS.isNullOrBlank()) {
+                val status =
+                    if (type == Constants.TYPE_BD_CLJH) bean.CLJH_WORKSTATUS else bean.GCJL_WORKSTATUS
+                if ("待执行" == status || status.isNullOrBlank()) {
                     viewModel.updateMeasureWorkStatus(workId, type, "执行中")
                 }
                 PointSurveyNewActivity.start(type, workId)
diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt
index f7f4929..e8baa64 100644
--- a/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt
+++ b/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt
@@ -2,7 +2,6 @@ package com.project.survey.ui.pointmeasure.adapter
 
 import android.content.Context
 import android.view.ViewGroup
-import android.widget.TextView
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.project.survey.R
@@ -41,8 +40,11 @@ class PointMeasureListAdapter(val type: String) : BaseQuickAdapter<MeasureBean,
                     "执行中" == item.CLJH_WORKSTATUS || "待执行" == item.CLJH_WORKSTATUS || item.CLJH_WORKSTATUS.isNullOrBlank()
                 )
         } else {
-            holder.setEnabled(R.id.tvStopMeasure, true)
-                .setEnabled(R.id.tvEnterMeasure, true)
+            holder.setEnabled(R.id.tvStopMeasure, "执行中" == item.GCJL_WORKSTATUS)
+                .setEnabled(
+                    R.id.tvEnterMeasure,
+                    "执行中" == item.GCJL_WORKSTATUS || "待执行" == item.GCJL_WORKSTATUS || item.GCJL_WORKSTATUS.isNullOrBlank()
+                )
         }
     }
 
@@ -77,8 +79,11 @@ class PointMeasureListAdapter(val type: String) : BaseQuickAdapter<MeasureBean,
                             "执行中" == item.CLJH_WORKSTATUS || "待执行" == item.CLJH_WORKSTATUS || item.CLJH_WORKSTATUS.isNullOrBlank()
                         )
                 } else {
-                    holder.setEnabled(R.id.tvStopMeasure, true)
-                        .setEnabled(R.id.tvEnterMeasure, true)
+                    holder.setEnabled(R.id.tvStopMeasure, "执行中" == item.GCJL_WORKSTATUS)
+                        .setEnabled(
+                            R.id.tvEnterMeasure,
+                            "执行中" == item.GCJL_WORKSTATUS || "待执行" == item.GCJL_WORKSTATUS || item.GCJL_WORKSTATUS.isNullOrBlank()
+                        )
                 }
             }
         }