forked from ITStudio_OUC/itstudio_manager
V1.0.0
All backend function is available
This commit is contained in:
@@ -7,7 +7,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "club.itstudio"
|
||||
version = "0.1.1"
|
||||
version = "1.0.0"
|
||||
description = "itmanager"
|
||||
|
||||
java {
|
||||
|
||||
+5
-5
@@ -3,8 +3,8 @@ package club.itstudio.itmanager.service.impl
|
||||
import club.itstudio.itmanager.entity.dto.BorrowRecord
|
||||
import club.itstudio.itmanager.mapper.BorrowRecordMapper
|
||||
import club.itstudio.itmanager.service.BorrowRecordService
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem
|
||||
import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
|
||||
import org.slf4j.LoggerFactory
|
||||
@@ -39,14 +39,14 @@ class BorrowRecordServiceImpl : ServiceImpl<BorrowRecordMapper, BorrowRecord>(),
|
||||
page.addOrder(OrderItem.desc("created_at"))
|
||||
page(page)
|
||||
} else {
|
||||
val wrapper = KtQueryWrapper(BorrowRecord())
|
||||
val wrapper = QueryWrapper<BorrowRecord>()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.like(BorrowRecord::borrower, keyword)
|
||||
wrapper.like("borrower", keyword)
|
||||
}
|
||||
if (!status.isNullOrBlank()) {
|
||||
wrapper.eq(BorrowRecord::status, status)
|
||||
wrapper.eq("status", status)
|
||||
}
|
||||
wrapper.orderByDesc(BorrowRecord::createdAt)
|
||||
wrapper.orderByDesc("created_at")
|
||||
page(page, wrapper)
|
||||
}
|
||||
}
|
||||
|
||||
+10
-9
@@ -3,6 +3,7 @@ package club.itstudio.itmanager.service.impl
|
||||
import club.itstudio.itmanager.entity.dto.FinanceRecord
|
||||
import club.itstudio.itmanager.mapper.FinanceRecordMapper
|
||||
import club.itstudio.itmanager.service.FinanceRecordService
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
|
||||
import org.slf4j.LoggerFactory
|
||||
@@ -42,29 +43,29 @@ class FinanceRecordServiceImpl : ServiceImpl<FinanceRecordMapper, FinanceRecord>
|
||||
) {
|
||||
page(page)
|
||||
} else {
|
||||
val wrapper = ktQuery()
|
||||
val wrapper = QueryWrapper<FinanceRecord>()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.and {
|
||||
it.like(FinanceRecord::recordNo, keyword)
|
||||
.or().like(FinanceRecord::vendor, keyword)
|
||||
.or().like(FinanceRecord::note, keyword)
|
||||
it.like("record_no", keyword)
|
||||
.or().like("vendor", keyword)
|
||||
.or().like("note", keyword)
|
||||
}
|
||||
}
|
||||
if (!type.isNullOrBlank()) {
|
||||
wrapper.eq(FinanceRecord::type, type)
|
||||
wrapper.eq("type", type)
|
||||
}
|
||||
if (!start.isNullOrBlank() && !end.isNullOrBlank()) {
|
||||
wrapper.apply("occurred_at BETWEEN {0} AND {1}", start, end)
|
||||
} else if (!start.isNullOrBlank()) {
|
||||
wrapper.ge(FinanceRecord::occurredAt, start)
|
||||
wrapper.ge("occurred_at", start)
|
||||
} else if (!end.isNullOrBlank()) {
|
||||
wrapper.le(FinanceRecord::occurredAt, end)
|
||||
wrapper.le("occurred_at", end)
|
||||
}
|
||||
if (!vendor.isNullOrBlank()) {
|
||||
wrapper.eq(FinanceRecord::vendor, vendor)
|
||||
wrapper.eq("vendor", vendor)
|
||||
}
|
||||
if (itemId != null) {
|
||||
wrapper.eq(FinanceRecord::relatedItemId, itemId)
|
||||
wrapper.eq("related_item_id", itemId)
|
||||
}
|
||||
page(page, wrapper)
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package club.itstudio.itmanager.service.impl
|
||||
import club.itstudio.itmanager.entity.dto.Item
|
||||
import club.itstudio.itmanager.mapper.ItemMapper
|
||||
import club.itstudio.itmanager.service.ItemService
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
|
||||
import org.slf4j.LoggerFactory
|
||||
@@ -25,15 +26,15 @@ class ItemServiceImpl : ServiceImpl<ItemMapper, Item>(), ItemService {
|
||||
if (keyword.isNullOrBlank() && status.isNullOrBlank()) {
|
||||
page(page)
|
||||
} else {
|
||||
val wrapper = ktQuery()
|
||||
val wrapper = QueryWrapper<Item>()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.and {
|
||||
it.like(Item::name, keyword)
|
||||
.or().like(Item::code, keyword)
|
||||
it.like("name", keyword)
|
||||
.or().like("code", keyword)
|
||||
}
|
||||
}
|
||||
if (!status.isNullOrBlank()) {
|
||||
wrapper.eq(Item::status, status)
|
||||
wrapper.eq("status", status)
|
||||
}
|
||||
page(page, wrapper)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user