Browse Source

qc default template fix

master
kelvin.yau 3 weeks ago
parent
commit
37fb77ad39
2 changed files with 12 additions and 2 deletions
  1. +10
    -1
      src/main/java/com/ffii/fpsms/modules/master/entity/QcCategoryRepository.kt
  2. +2
    -1
      src/main/java/com/ffii/fpsms/modules/master/service/QcCategoryService.kt

+ 10
- 1
src/main/java/com/ffii/fpsms/modules/master/entity/QcCategoryRepository.kt View File

@@ -31,6 +31,15 @@ interface QcCategoryRepository : AbstractRepository<QcCategory, Long> {
"""
)
fun findQcCategoryInfoByItemIdAndType(itemId: Long, type: String): QcCategoryInfo?;
fun findQcCategoryInfoByIsDefault(isDefault: Boolean): QcCategoryInfo?;

@Query(
"""
SELECT qcc FROM QcCategory qcc
WHERE qcc.isDefault = :isDefault AND qcc.deleted = false
ORDER BY qcc.id ASC
"""
)
fun findQcCategoryInfoByIsDefault(isDefault: Boolean): List<QcCategoryInfo>;

// fun findByItemIdAndType(itemId: Long, type: String): QcCategory?;
}

+ 2
- 1
src/main/java/com/ffii/fpsms/modules/master/service/QcCategoryService.kt View File

@@ -44,7 +44,8 @@ open class QcCategoryService(
else null
//
if (result == null) { // Use Default Template
result = qcCategoryRepository.findQcCategoryInfoByIsDefault(true)
val defaultTemplates = qcCategoryRepository.findQcCategoryInfoByIsDefault(true)
result = defaultTemplates.firstOrNull()
}
}
return result;


Loading…
Cancel
Save