From f565fbc09724992d53ec6632c3e5d1de3325f328 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 11 一月 2024 17:33:44 +0800
Subject: [PATCH] 1. 调整返回接口的异常捕获类为自定义异常类； 2. 修改AreaVo类中时间参数的类型； 3. 新增文档生成任务类型，并新增文档后台生成任务逻辑；
---
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRuleRep.kt | 8 ++++----
1 files changed, 4 insertions(+), 4 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 9014743..30fbccc 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
@@ -20,11 +20,11 @@
return evaluationruleMapper.selectByExample(Example(Evaluationrule::class.java).apply {
createCriteria().andEqualTo("tasktypeid", areaEvaVo.taskTypeId)
.andEqualTo("scensetypeid", areaEvaVo.scensetypeid)
- .andEqualTo("provincecode", areaEvaVo.provincecode)
- .andEqualTo("citycode", areaEvaVo.citycode)
- .andEqualTo("districtcode", areaEvaVo.districtcode)
- .andEqualTo("towncode", areaEvaVo.towncode)
.andEqualTo("isuse", true)
+ and(createCriteria().orEqualTo("provincecode", areaEvaVo.provincecode).orIsNull("provincecode"))
+ and(createCriteria().orEqualTo("citycode", areaEvaVo.citycode).orIsNull("citycode"))
+ and(createCriteria().orEqualTo("districtcode", areaEvaVo.districtcode).orIsNull("districtcode"))
+ and(createCriteria().orEqualTo("towncode", areaEvaVo.towncode).orIsNull("towncode"))
})
}
}
\ No newline at end of file
--
Gitblit v1.9.3