From a5cdbf569067822e3232d2177b8a9aac1ed95b69 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 29 五月 2024 17:32:00 +0800
Subject: [PATCH] 1. 修改自评逻辑中，问题整改的判断方式为已整改并且整改审核通过； 2. 新增评估详情获取接口;
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem8.kt | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem8.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem8.kt
index b66e538..b5abf84 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem8.kt
+++ b/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
}
}
--
Gitblit v1.9.3