From e27f54aa7e10836e2741dc590559e1039fbade78 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 23 七月 2021 15:06:41 +0800
Subject: [PATCH] 1. 创建子任务时，执行用户默认为当前登录用户或执行组中的第一人 2. 修复部分企业类型问题图标错误 3. 新增场景账户自动生成功能
---
app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt
index 72d168b..8dd5971 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt
@@ -1,9 +1,9 @@
package cn.flightfeather.thirdapp.repository
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
-import cn.flightfeather.thirdapp.bean.Task
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Task
import cn.flightfeather.thirdapp.bean.vo.TaskVo
import cn.flightfeather.thirdapp.common.net.ResponseBodyCallBack
import cn.flightfeather.thirdapp.common.net.ResultCallBack
@@ -62,12 +62,12 @@
val resultList = ArrayList<Scense>()
val tempList = sceneDao.getSceneByArea(taskVo.provincecode, taskVo.citycode, taskVo.districtcode)
movList.forEach {m ->
- tempList.forEach s@ {s ->
+ for (s in tempList) {
if (s.guid == m.sguid) {
s.monitorNum = m.monitornum
s.inspectedNum = m.extension1?.toInt() ?: 0
resultList.add(s)
- return@s
+ break
}
}
}
--
Gitblit v1.9.3