supervision-spring.git

			@@ -10,6 +10,8 @@
			import cn.flightfeather.supervision.common.utils.Constant
			import cn.flightfeather.supervision.common.utils.DateUtil
			import cn.flightfeather.supervision.common.utils.UUIDGenerator
			import cn.flightfeather.supervision.domain.ds1.entity.Scense
			import cn.flightfeather.supervision.domain.ds1.mapper.ScenseMapper
			import cn.flightfeather.supervision.domain.ds1.repository.SceneRep
			import cn.flightfeather.supervision.domain.ds1.repository.SubTaskRep
			import cn.flightfeather.supervision.domain.ds1.repository.TaskRep
			@@ -19,6 +21,8 @@
			import org.springframework.beans.factory.annotation.Autowired
			import org.springframework.stereotype.Service
			import tk.mybatis.mapper.entity.Example
			import java.time.LocalDateTime
			import java.time.ZoneId
			import java.util.*
			import kotlin.collections.ArrayList

			@@ -28,6 +32,7 @@
			private val taskRep: TaskRep,
			private val subTaskRep: SubTaskRep,
			private val sceneRep: SceneRep,
			private val scenseMapper: ScenseMapper,
			) : TaskService {

			@Autowired
			@@ -320,7 +325,7 @@
			return taskVoList
			}

			override fun getDayTask(taskId: String, userId: String?, userType: String): List<DayTaskProgressVo> {
			override fun getDayTask(taskId: String, userId: String?, userType: String, sceneTypeId: String?): List<DayTaskProgressVo> {
			val resultList = ArrayList<DayTaskProgressVo>()

			// 获取总任务下所有日任务
			@@ -332,29 +337,37 @@

			// 获取总任务下所有的子任务
			val subTasks = subTaskRep.findAll(Subtask().apply { tguid = taskId })
			if (subTasks.isEmpty()) return emptyList()
			// 获取所有子任务涉及的巡查场景信息
			val sceneList = scenseMapper.selectByExample(Example(Scense::class.java).apply {
			createCriteria().andIn("guid", subTasks.map { it?.scenseid })
			})

			//根据sql条件查询
			dayTasks.forEach {t->
			dayTasks.forEach { t ->
			// 筛选当前日任务下的子任务
			val filterSubTasks = subTasks.filter {s->
			s?.tsguid == t?.tguid
			val filterSubTasks = subTasks.filter { s ->
			val scene = sceneList.find { it?.guid == s?.scenseid }
			s?.tsguid == t?.tguid && (sceneTypeId.isNullOrBlank() \|\| scene?.typeid.toString() == sceneTypeId)
			}
			// 获取当日所有的问题
			val subTaskIds = filterSubTasks.map { fs-> fs?.stguid }
			val subTaskIds = filterSubTasks.map { fs -> fs?.stguid }
			val problemList = if (subTaskIds.isNotEmpty()) {
			problemListMapper.selectByExample(Example(Problemlist::class.java).apply {
			createCriteria().andIn("stguid", subTaskIds)
			})
			} else{
			} else {
			emptyList()
			}

			/ 总巡查量统计 /
			// 子任务总数
			val total = filterSubTasks.size
			// 子任务完成数
			val complete = filterSubTasks.count {fs->
			val complete = filterSubTasks.count { fs ->
			fs?.status == Constant.TaskProgress.RUNINGSTATUS3.text
			}

			/ 总问题整改率统计 /
			// 总问题数和总整改数
			val totalProblemNum = problemList.size
			@@ -362,7 +375,7 @@

			/ 每个人的巡查量问题整改率 /
			val userProgressMap = mutableMapOf<String, ProgressPerUserPerDay>()
			filterSubTasks.forEach fst@ { fst->
			filterSubTasks.forEach fst@{ fst ->
			fst ?: return@fst
			// fixme 2025.11.30 由于监管APP的bug，导致用户可以不选择执行人员直接创建任务，所以暂时将没有执行人员的任务定义为匿名用户
			if (fst.executorguids.isNullOrBlank()) {
			@@ -373,7 +386,7 @@
			val ids = fst.executorguids?.split("#") ?: return@fst
			val names = fst.executorrealtimes?.split("#") ?: return@fst
			// 筛选每个子任务下的问题
			val proList = problemList.filter { p-> p?.stguid == fst.stguid }
			val proList = problemList.filter { p -> p?.stguid == fst.stguid }
			for (i in ids.indices) {
			val key = ids[i]
			if (!userProgressMap.containsKey(key)) {
			@@ -386,16 +399,28 @@
			// 单人巡查量累计
			// 当多个人一起执行同一任务时，平分巡查量
			this.totalTaskNum += 1.0 / ids.size
			if (fst.status== Constant.TaskProgress.RUNINGSTATUS3.text)
			this.completeTaskNum += 1.0 / ids.size
			if (fst.status == Constant.TaskProgress.RUNINGSTATUS3.text) {
			}
			this.completeTaskNum += 1.0 / ids.size

			// 单人整改率累计（评分）
			this.totalProblemNum += proList.size.toDouble() / ids.size
			this.changedProblemNum += proList.filter { it.ischanged == true }.size.toDouble() / ids.size
			this.changedProblemNumOnTime += proList.filter {
			// 是否在同一天内整改
			val _changedDate = it.changedtime?.let { c->
			LocalDateTime.ofInstant(c.toInstant(), ZoneId.systemDefault()).toLocalDate()
			}
			val _proDate = it.time?.let { t->
			LocalDateTime.ofInstant(t.toInstant(), ZoneId.systemDefault()).toLocalDate()
			}
			val isSameDay = _changedDate?.equals(_proDate)
			it.ischanged == true && (isSameDay ?: false)
			}.size.toDouble() / ids.size
			this.efficientChangedProNum += proList.filter {
			// 整改耗时（天）
			val day = ((it.changedtime?.time ?: 0L) - (it?.time?.time ?: 0L)).div(1000 * 60 * 60 * 24)
			it.ischanged == true && day <= 1
			it.ischanged == true && day <= 2
			}.size.toDouble() / ids.size
			// 此处先累计巡查时长，最后再根据任务数量平均
			this.avgInspectionTime +=
			@@ -414,9 +439,9 @@
			var changed = 0
			//审核是否完成
			var check = true
			filterSubTasks.forEach {fs ->
			filterSubTasks.forEach { fs ->
			// 筛选每个子任务下的问题未整改数
			problemList.filter { p-> p?.stguid == fs?.stguid }.onEach { pro ->
			problemList.filter { p -> p?.stguid == fs?.stguid }.onEach { pro ->
			// 当存在至少一个问题没有审核时，当日审核状态为未审核
			if (pro.extension3 == Constant.PROBLEM_UNCHECKED \|\| pro.extension3 == Constant.CHANGE_UNCHECKED) {
			check = false
			@@ -430,8 +455,8 @@
			}

			resultList.add(DayTaskProgressVo().apply {
			this.guid =t?.tguid
			this.date =t?.starttime
			this.guid = t?.tguid
			this.date = t?.starttime
			this.tsGuid = taskId
			this.totalTaskNum = total
			this.completeTaskNum = complete