From 497475defd5d0ebf90ae6a8e2b080a16d78043ab Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 23 九月 2022 17:49:34 +0800
Subject: [PATCH] 2022.9.23
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/OnLineQuestionServiceImpl.kt | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/OnLineQuestionServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/OnLineQuestionServiceImpl.kt
index d9fba46..053434b 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/OnLineQuestionServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/OnLineQuestionServiceImpl.kt
@@ -137,7 +137,7 @@
fileIndustry = IndustryType.getNameByValue(it.mfFileIndustry)
itemType = EnElementType.getNameByValue(it.mfEpItemType)
- itemSubType = EnElementSubType.getNameByValue(it.mfEpItemSubtype)
+ itemSubType = EnElementSubType.getSubType(it.mfEpItemType, it.mfEpItemSubtype)
fileUrl = it.mfFileUrl
val keyList = it.mfKeywordLv1.split("銆�")
for (i in keyList.indices) {
@@ -247,7 +247,7 @@
// fileIndustry = IndustryType.getNameByValue(it.mfFileIndustry)
itemType = EnElementType.getNameByValue(it.cqKind)
- itemSubType = EnElementSubType.getNameByValue(it.cqSubkind)
+ itemSubType = EnElementSubType.getSubType(it.cqKind, it.cqSubkind)
// fileUrl = it.mfFileUrl
// val keyList = it.mfKeywordLv1.split("銆�")
// for (i in keyList.indices) {
@@ -258,6 +258,10 @@
// }
// }
time = it.cqCreateTime
+ punish = it.cqIsPunish
+ illegal = it.cqIsIllegal
+ shotSpot = it.cqIsShotspot
+ supervise = it.cqIsSupervise
})
}
response.success = true
@@ -296,7 +300,7 @@
// fileIndustry = IndustryType.getNameByValue(it.mfFileIndustry)
itemType = EnElementType.getNameByValue(it.ecEpItemType)
- itemSubType = EnElementSubType.getNameByValue(it.ecEpItemSubtype)
+ itemSubType = EnElementSubType.getSubType(it.ecEpItemType, it.ecEpItemSubtype)
imgUrl = it.ecAppendixUrl?.split(";")?.get(0)
time = it.ecCreateTime
@@ -339,7 +343,7 @@
mfMgtLevel = ManageLevelType.getNameByValue(it.mfMgtLevel)
mfFileType = ConsultFileType.getNameByValue(it.mfFileType)
mfEpItemType = EnElementType.getNameByValue(it.mfEpItemType)
- mfEpItemSubtype = EnElementSubType.getNameByValue(it.mfEpItemSubtype)
+ mfEpItemSubtype = EnElementSubType.getSubType(it.mfEpItemType, it.mfEpItemSubtype)
mfSaveType = FileSaveType.getNameByValue(it.mfSaveType)
}
result.add(vo)
@@ -356,7 +360,7 @@
mfMgtLevel = ManageLevelType.getNameByValue(it.mfMgtLevel)
mfFileType = ConsultFileType.getNameByValue(it.mfFileType)
mfEpItemType = EnElementType.getNameByValue(it.mfEpItemType)
- mfEpItemSubtype = EnElementSubType.getNameByValue(it.mfEpItemSubtype)
+ mfEpItemSubtype = EnElementSubType.getSubType(it.mfEpItemType, it.mfEpItemSubtype)
mfSaveType = FileSaveType.getNameByValue(it.mfSaveType)
}
}
@@ -390,7 +394,7 @@
BeanUtils.copyProperties(it, vo)
vo.apply {
cqKind = EnElementType.getNameByValue(it.cqKind)
- cqSubkind = EnElementSubType.getNameByValue(it.cqSubkind)
+ cqSubkind = EnElementSubType.getSubType(it.cqKind, it.cqSubkind)
}
if (answers.isNotEmpty()) {
@@ -427,7 +431,7 @@
typeId = ConsultResultType.TYPE4.value
typeName = ConsultResultType.TYPE4.des
itemType = EnElementType.getNameByValue(it.cqKind)
- itemSubType = EnElementSubType.getNameByValue(it.cqSubkind)
+ itemSubType = EnElementSubType.getSubType(it.cqKind, it.cqSubkind)
time = it.cqCreateTime
})
@@ -435,7 +439,7 @@
// BeanUtils.copyProperties(it, vo)
// vo.apply {
// cqKind = EnElementType.getNameByValue(it.cqKind)
-// cqSubkind = EnElementSubType.getNameByValue(it.cqSubkind)
+// cqSubkind = EnElementSubType.getSubType(it.ecEpItemType, it.cqSubkind)
// }
//
// if (answers.isNotEmpty()) {
@@ -453,7 +457,7 @@
BeanUtils.copyProperties(it, result)
result.apply {
cqKind = EnElementType.getNameByValue(it.cqKind)
- cqSubkind = EnElementSubType.getNameByValue(it.cqSubkind)
+ cqSubkind = EnElementSubType.getSubType(it.cqKind, it.cqSubkind)
}
}
@@ -481,7 +485,7 @@
BeanUtils.copyProperties(it, vo)
vo.apply {
ecEpItemType = EnElementType.getNameByValue(it.ecEpItemType)
- ecEpItemSubtype = EnElementSubType.getNameByValue(it.ecEpItemSubtype)
+ ecEpItemSubtype = EnElementSubType.getSubType(it.ecEpItemType, it.ecEpItemSubtype)
ecType = EnforceCaseType.getNameByValue(it.ecType)
}
result.add(vo)
@@ -495,7 +499,7 @@
BeanUtils.copyProperties(it, result)
result.apply {
ecEpItemType = EnElementType.getNameByValue(it.ecEpItemType)
- ecEpItemSubtype = EnElementSubType.getNameByValue(it.ecEpItemSubtype)
+ ecEpItemSubtype = EnElementSubType.getSubType(it.ecEpItemType, it.ecEpItemSubtype)
ecType = EnforceCaseType.getNameByValue(it.ecType)
}
}
--
Gitblit v1.9.3