1. 2024.11.08 修复部分bug

feiyu02

2024-11-08 d2727f231319a48019bc3b87439136ab49b97b9b

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

@@ -149,6 +149,7 @@
    @Transactional
    override fun saveList(subtasklist: List<Subtask>): Int {
        subtasklist.forEach {
            if (it.stguid == null) it.stguid = UUIDGenerator.generate16ShortUUID()
            subtaskMapper.insert(it)
        }
        return subtasklist.size
@@ -383,18 +384,21 @@

    override fun findAll(): MutableList<Subtask> = subtaskMapper.selectAll()

    override fun save(subtask: Subtask): Int = subtaskMapper.insert(subtask)
    override fun save(subtask: Subtask): Int {
        if (subtask.stguid == null) subtask.stguid = UUIDGenerator.generate16ShortUUID()
        return subtaskMapper.insert(subtask)
    }

    //更新子任务
    override fun update(subtask: Subtask): Int {
        var res = 0
        //根据子任务guid获取顶层任务
        val toptaskVo = taskService.findByID(subtask.tguid.toString())

//        //根据日期获取日任务
//        val daytaskVo = taskService.findByDate(DateUtil.getDate(subtask.planstarttime)!!)
        val daytaskVo = taskService.findByDate(subtask.tguid!!, DateUtil.getDate(subtask.planstarttime)!!)

        //应该直接根据子任务的日任务id查询日任务
        val daytaskVo = taskService.findByID(subtask.tsguid!!)
//        val daytaskVo = taskService.findByID(subtask.tsguid!!)

        //判断是否有日任务
        if (StringUtil.isEmpty(daytaskVo.tguid)) {
@@ -407,18 +411,18 @@
            task.name = subtask.name
            task.starttime = DateUtil.StringToDate(DateUtil.getDate(subtask.planstarttime)!!.substring(0, 10))
            task.endtime =
                    DateUtil.StringToDate(DateUtil.getDate(subtask.planstarttime)!!.substring(0, 10) + " 23:59:59")
                DateUtil.StringToDate(DateUtil.getDate(subtask.planstarttime)!!.substring(0, 10) + " 23:59:59")
            //****日任务执行状态继承子任务的状态*（修改）***
            task.runingstatus = subtask.status
            //********************************************
            taskService.save(task)
            subtask.tsguid = guid
            subtaskMapper.updateByPrimaryKeySelective(subtask)
            res = subtaskMapper.updateByPrimaryKeySelective(subtask)
        } else {
//            subtask.tsguid = daytaskVo.tguid
            subtask.tsguid = daytaskVo.tguid
            //*（修改）*日任务正在执行，子任务结束，遍历所有其余子任务，都是结束时才将日任务修改为结束****
            if (subtask.status == Constant.TaskProgress.RUNINGSTATUS3.text
                    && daytaskVo.runingstatus == Constant.TaskProgress.RUNINGSTATUS2.text){
                && daytaskVo.runingstatus == Constant.TaskProgress.RUNINGSTATUS2.text){
                val subtaskVolist = findByDayTaskID(daytaskVo.tguid!!)
                var bool = false
                subtaskVolist.forEach {
@@ -439,9 +443,13 @@
            BeanUtils.copyProperties(daytaskVo, daytask)
            taskMapper.updateByPrimaryKeySelective(daytask)
            //****************************************************************************************
            subtaskMapper.updateByPrimaryKeySelective(subtask)
            res = subtaskMapper.updateByPrimaryKeySelective(subtask)
        }
        return res
    }

    override fun changeStatus(subtask: Subtask): Int {
        val res = update(subtask)
        //对已结束的子任务进行自动评分
        if (subtask.status == Constant.TaskProgress.RUNINGSTATUS3.text) {
            val example = Example(Evaluation::class.java)
@@ -453,7 +461,7 @@
            }
        }

        return 1
        return res
    }

    override fun delete(id: String): Int{
@@ -474,15 +482,13 @@
            createCriteria().andEqualTo("tid", topTaskId).andEqualTo("sguid", sceneId)
        })
        mList.forEach {
            if (it.monitornum == null) {
                it.monitornum = 0
            } else {
                it.monitornum = it.monitornum!! - 1
                if (it.monitornum!! < 0) {
                    it.monitornum = 0
                }
            var count = it.extension1?.toIntOrNull() ?: 0
            count--
            if (count < 0) {
                count = 0
            }
            monitorobjectversionMapper.insert(it)
            it.extension1 = count.toString()
            monitorobjectversionMapper.updateByPrimaryKeySelective(it)
        }

        // 同时删除对应问题和巡查记录