src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem8.kt
@@ -1,6 +1,7 @@
package cn.flightfeather.supervision.business.autooutput.score.restaurant
import cn.flightfeather.supervision.business.autooutput.score.ScoreItem
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
import org.springframework.stereotype.Component
import tk.mybatis.mapper.entity.Example
@@ -29,10 +30,11 @@
    /**
     * 执法检查汇总情况
     * 选项如下:
     *      1.问题部分整改或不及时提供材料
     *      2.问题无整改
     *      1.全部按时整改并及时提交材料
     *      2.问题部分整改或不及时提供材料
     *      3.问题无整改
     */
    override fun otherProblem(size: Int): Int? {
    override fun otherProblem(size: Int): List<Int>? {
        val p = problemlistMapper.selectByExample(Example(Problemlist::class.java).apply {
            createCriteria().andEqualTo("stguid", evaluationScene.subTask.value?.stguid)
//                .andGreaterThanOrEqualTo("time", info.sTime)
@@ -43,13 +45,13 @@
        val total = p.size
        var changed = 0
        p.forEach {
            if (it.ischanged == true) {
            if (it.ischanged == true && it.extension3 == Constant.CHANGE_CHECK_PASS) {
                changed++
            }
        }
        return when {
            changed == 0 && total > 0 -> 1
            changed < total -> 0
            changed == 0 && total > 0 -> listOf(2)
            changed < total -> listOf(1)
            else -> null
        }
    }