2026.4.7

feiyu02

9 天以前 85ef942e7195abeb71466b7159c3ee30161e1e54

 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt

@@ -1,7 +1,6 @@
package cn.flightfeather.supervision.lightshare.service.impl

import cn.flightfeather.supervision.business.autooutput.score.AopEvaluation
import cn.flightfeather.supervision.common.exception.BizException
import cn.flightfeather.supervision.domain.ds1.entity.*
import cn.flightfeather.supervision.domain.ds1.mapper.*
import cn.flightfeather.supervision.common.utils.Constant
@@ -104,7 +103,7 @@
        return subtaskVoList
    }

    override fun findByDayTaskID(dayTaskId: String, userId: String, userType: String): List<Subtask> {
    override fun findByDayTaskID(dayTaskId: String, userId: String, userType: String): List<SubtaskVo> {
        val example = Example(Subtask::class.java)
        val criteria = example.createCriteria()
        criteria.andEqualTo("tsguid", dayTaskId)
@@ -115,11 +114,13 @@
            )
        }
        example.orderBy("name")
        val result = subtaskMapper.selectByExample(example).apply {
            forEach breaking@{
        val result = subtaskMapper.selectByExample(example).map {
            val vo = SubtaskVo()
            BeanUtils.copyProperties(it, vo)
            vo
        }.onEach {
                //已审核提示
                it.remark = Constant.PROBLEM_CHECK_PASS

                problemlistMapper.selectByExample(Example(Problemlist::class.java).apply {
                    createCriteria().andEqualTo("stguid", it.stguid)
                    and(
@@ -130,9 +131,13 @@
                    //子任务中有问题未审核时，设置未审核提示
                    if (problem.extension3 == Constant.PROBLEM_UNCHECKED) {
                        it.remark = Constant.PROBLEM_UNCHECKED
                        return@breaking
                    }
                }

            // 场景类型
            scenseMapper.selectByPrimaryKey(it.scenseid)?.let { s->
                it.sceneTypeId = s.typeid
                it.sceneTypeName = s.type
            }
        }
        return result