From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 17 十二月 2024 11:41:00 +0800
Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem1.kt | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem1.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem1.kt
index 65548c0..dee972b 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem1.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem1.kt
@@ -1,6 +1,7 @@
package cn.flightfeather.supervision.business.autooutput.score.wharf
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
@@ -33,7 +34,7 @@
* 1.闂閮ㄥ垎鏁存敼鎴栦笉鍙婃椂鎻愪緵鏉愭枡
* 2.闂鏃犳暣鏀�
*/
- 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)
@@ -44,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(1)
+ changed < total -> listOf(0)
else -> null
}
}
--
Gitblit v1.9.3