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/domain/ds1/repository/EvaluationRuleRep.kt | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRuleRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRuleRep.kt
index dd40759..21704a3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRuleRep.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRuleRep.kt
@@ -2,7 +2,9 @@
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.domain.ds1.entity.Evaluationrule
+import cn.flightfeather.supervision.domain.ds1.entity.Evaluationsubrule2
import cn.flightfeather.supervision.domain.ds1.mapper.EvaluationruleMapper
+import cn.flightfeather.supervision.domain.ds1.mapper.EvaluationsubruleMapper2
import cn.flightfeather.supervision.lightshare.vo.AreaEvaVo
import org.springframework.stereotype.Repository
import tk.mybatis.mapper.entity.Example
@@ -13,12 +15,14 @@
@Repository
class EvaluationRuleRep(
private val evaluationruleMapper: EvaluationruleMapper,
+ private val evaluationsubruleMapper2: EvaluationsubruleMapper2,
private val sceneRep: SceneRep,
) {
/**
* 鏍规嵁鍙傛暟鏌ヨ鎬昏鍒�
* @param areaEvaVo 鏌ヨ鍙傛暟
+ * @return
*/
fun findBaseRule(areaEvaVo: AreaEvaVo): List<Evaluationrule?> {
return evaluationruleMapper.selectByExample(Example(Evaluationrule::class.java).apply {
@@ -32,11 +36,22 @@
})
}
+ /**
+ * 鏍规嵁宸℃煡浠诲姟id鎵惧埌瀵瑰簲鑷姩璇勪及瑙勫垯
+ * @param subTaskId
+ * @return
+ */
fun findAutoEvaluationRule(subTaskId:String): Evaluationrule? {
val scene = sceneRep.findBySubTask(subTaskId)
return findAutoEvaluationRule(Constant.SceneType.getByValue(scene?.typeid.toString()))
}
+ /**
+ * 鏍规嵁鍦烘櫙绫诲瀷鎵惧埌鑷姩璇勪及瑙勫垯
+ * 鑷姩璇勪及瑙勫垯鍙傛暟[Evaluationrule.tasktypeid] = 99
+ * @param sceneType
+ * @return
+ */
fun findAutoEvaluationRule(sceneType: Constant.SceneType): Evaluationrule? {
return evaluationruleMapper.selectOne(Evaluationrule().apply {
scensetypeid = sceneType.value.toByteOrNull()
@@ -44,4 +59,16 @@
})
}
+ /**
+ * 鏍规嵁鎬昏鍒檌d鎵惧埌瀛愯鍒�
+ * @param ruleId
+ * @return
+ */
+ fun findSubRule(ruleId: String?): List<Evaluationsubrule2> {
+ return evaluationsubruleMapper2.selectByExample(Example(Evaluationsubrule2::class.java).apply {
+ createCriteria().andEqualTo("erguid", ruleId)
+ orderBy("ertype").orderBy("displayid")
+ })
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3