1. 多项调整

feiyu02

2024-01-09 c1becf4cbd2e99601ce011c14b8742427249cfb4

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

@@ -8,6 +8,7 @@
import cn.flightfeather.supervision.domain.ds1.mapper.TaskMapper
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.common.utils.DateUtil
import cn.flightfeather.supervision.domain.ds1.repository.TaskRep
import cn.flightfeather.supervision.lightshare.service.EvaluationService
import cn.flightfeather.supervision.lightshare.service.SubtaskService
import cn.flightfeather.supervision.lightshare.service.TaskService
@@ -21,7 +22,7 @@
import kotlin.collections.ArrayList

@Service
class TaskServiceImpl(val taskMapper: TaskMapper) : TaskService {
class TaskServiceImpl(val taskMapper: TaskMapper, private val taskRep: TaskRep,) : TaskService {

    @Autowired
    lateinit var subtaskService: SubtaskService
@@ -222,7 +223,7 @@
//        example.or(
                example.createCriteria().andIsNull("tsguid")
                        .andEqualTo("districtcode", districtCode)
                        .andLessThan("starttime", date)
                        .andLessThanOrEqualTo("starttime", date)
                        .andGreaterThanOrEqualTo("endtime", date)
//        )
        example.orderBy("starttime").desc()
@@ -506,7 +507,7 @@
        val criteria = example.createCriteria()
        //获取用户信息
        val userInfo = userinfoMapper.findOne(guid)
        val districtCode = userInfo.dGuid
        val districtCode = userInfo?.dGuid

        //添加日期过滤

@@ -725,4 +726,7 @@
        return taskProgressVolist
    }

    override fun findTask(areaVo: AreaVo): List<Task?> {
        return taskRep.findTasks(areaVo)
    }
}