|
|
@@ -20,11 +20,7 @@ export function createClassroomDataRoutes(withAuth: WithAuth) {
|
|
|
.orderBy('id', 'desc')
|
|
|
|
|
|
if (search) {
|
|
|
- query = query.where('title', 'like', `%${search}%`)
|
|
|
- }
|
|
|
-
|
|
|
- if (classroomId) {
|
|
|
- query = query.where('classroom_id', classroomId)
|
|
|
+ query = query.where('classroom_no', 'like', `%${search}%`)
|
|
|
}
|
|
|
|
|
|
const total = await query.clone().count()
|
|
|
@@ -80,18 +76,24 @@ export function createClassroomDataRoutes(withAuth: WithAuth) {
|
|
|
const body = await c.req.json()
|
|
|
|
|
|
// 验证必填字段
|
|
|
- const { classroom_id, title, content } = body
|
|
|
- if (!classroom_id || !title || !content) {
|
|
|
- return c.json({ error: '缺少必要的课堂数据信息' }, 400)
|
|
|
+ const { classroom_no, training_date, status } = body
|
|
|
+ if (!classroom_no || !training_date || !status) {
|
|
|
+ return c.json({ error: '教室号、训练日期和状态为必填项' }, 400)
|
|
|
}
|
|
|
|
|
|
// 创建课堂数据
|
|
|
const [id] = await apiClient.database.table('classroom_data').insert({
|
|
|
- classroom_id,
|
|
|
- title,
|
|
|
- content,
|
|
|
- created_at: new Date(),
|
|
|
- updated_at: new Date()
|
|
|
+ classroom_no,
|
|
|
+ training_date,
|
|
|
+ status,
|
|
|
+ holding_stock: body.holding_stock || null,
|
|
|
+ holding_cash: body.holding_cash || null,
|
|
|
+ price: body.price || null,
|
|
|
+ code: body.code || null,
|
|
|
+ spare: body.spare || null,
|
|
|
+ submit_user: body.submit_user || null,
|
|
|
+ created_at: apiClient.database.fn.now(),
|
|
|
+ updated_at: apiClient.database.fn.now()
|
|
|
})
|
|
|
|
|
|
const newData = await apiClient.database.table('classroom_data')
|
|
|
@@ -120,9 +122,9 @@ export function createClassroomDataRoutes(withAuth: WithAuth) {
|
|
|
const body = await c.req.json()
|
|
|
|
|
|
// 验证必填字段
|
|
|
- const { title, content } = body
|
|
|
- if (!title || !content) {
|
|
|
- return c.json({ error: '缺少必要的课堂数据信息' }, 400)
|
|
|
+ const { classroom_no, training_date, status } = body
|
|
|
+ if (!classroom_no || !training_date || !status) {
|
|
|
+ return c.json({ error: '教室号、训练日期和状态为必填项' }, 400)
|
|
|
}
|
|
|
|
|
|
// 检查数据是否存在
|
|
|
@@ -138,9 +140,16 @@ export function createClassroomDataRoutes(withAuth: WithAuth) {
|
|
|
await apiClient.database.table('classroom_data')
|
|
|
.where('id', id)
|
|
|
.update({
|
|
|
- title,
|
|
|
- content,
|
|
|
- updated_at: new Date()
|
|
|
+ classroom_no,
|
|
|
+ training_date,
|
|
|
+ status,
|
|
|
+ holding_stock: body.holding_stock || null,
|
|
|
+ holding_cash: body.holding_cash || null,
|
|
|
+ price: body.price || null,
|
|
|
+ code: body.code || null,
|
|
|
+ spare: body.spare || null,
|
|
|
+ submit_user: body.submit_user || null,
|
|
|
+ updated_at: apiClient.database.fn.now()
|
|
|
})
|
|
|
|
|
|
const updatedData = await apiClient.database.table('classroom_data')
|