18034727885
2026-06-22 4e78ed2746f18662c1e7178ca6e0705583a19e0f
修复问题
2个文件已修改
26 ■■■■■ 已修改文件
app/src/main/java/com/xw/yunwei/ui/task/accident/handle/AccidentProcessActivity.kt 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/xw/yunwei/ui/task/accident/handle/AccidentProcessVM.kt 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/xw/yunwei/ui/task/accident/handle/AccidentProcessActivity.kt
@@ -62,7 +62,9 @@
        fun getParams(model: TaskAccidentModel?): Bundle {
            return bundleOf(
                Key.ID to model?.id,
                Key.DATA to model?.taskTypeId
                Key.DATA to model?.errorTypeList?.joinToString { it ->
                    (it.child ?: emptyList()).map { it.id }.joinToString()
                }
            )
        }
    }
@@ -84,7 +86,7 @@
            resources.getColor(R.color.white),
            "shape_blue_5_bg_4"
        )
        viewModel.getTypeList{
        viewModel.getTypeList {
            binding.tvAccidentFilter.text =
                if (viewModel.getSelectType().isEmpty()) "" else "选好了"
        }
app/src/main/java/com/xw/yunwei/ui/task/accident/handle/AccidentProcessVM.kt
@@ -42,9 +42,7 @@
    var taskId = 0L
    /**
     * 任务类型ID
     * 任务类别为2时:对应数据字典,多个逗号分割
     * 任务类别为1时:枚举值 1-9
     * 任务类型ID 组id|子id1, 子id2, 子id3...
     */
    var taskTypeId: String? = null
@@ -230,17 +228,19 @@
            block()
        } else {
            launchRequest {
                taskRepository.getTypeList()?.forEachIndexed { index, type ->
                taskRepository.getTypeList()?.also { it ->
                    runOnMainThread {
                        categories.clear()
                        val items = mutableListOf<Item>()
                        type.child?.forEach {
                            items.add(Item(it.id ?: 0L, it.errorName ?: ""))
                        it.mapIndexed { index, type ->
                            val items = mutableListOf<Item>()
                            type.child?.forEach {
                                items.add(Item(it.id ?: 0L, it.errorName ?: ""))
                            }
                            categories.add(Category(index, type.errorName ?: "", items))
                        }
                        categories.add(Category(index, type.errorName ?: "", items))
                        val ids = taskTypeId?.split(", ") ?: emptyList()
                        categories.forEach { it ->
                            it.items.forEach {
                        categories.forEach { category ->
                            category.items.forEach {
                                it.isSelected = ids.contains(it.id.toString())
                            }
                        }