chamomind/jws-backend
chamomind/jws-backend
7
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

search startDate and endDate

Browse source
This commit is contained in:
Kanjana 2025-04-17 13:41:22 +07:00
parent ee610c5686
commit 0aba9f9865
20 changed files with 123 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/07-task-controller.ts
View file

@ -42,7 +42,7 @@ import {
listFile,
setFile,
} from "../utils/minio";
import { queryOrNot } from "../utils/relation";
import { queryOrNot, whereDateQuery } from "../utils/relation";
const MANAGE_ROLES = ["system", "head_of_admin", "admin", "document_checker"];
@ -107,6 +107,8 @@ export class TaskController extends Controller {
@Query() assignedUserId?: string,
@Query() taskOrderStatus?: TaskOrderStatus,
@Body() body?: { code?: string[] },
@Query() startDate?: Date,
@Query() endDate?: Date,
) {
const where = {
taskOrderStatus,
@ -125,6 +127,7 @@ export class TaskController extends Controller {
{ contactName: { contains: query, mode: "insensitive" } },
{ contactTel: { contains: query, mode: "insensitive" } },
]),
...whereDateQuery(startDate, endDate),
} satisfies Prisma.TaskOrderWhereInput;
const [result, total] = await prisma.$transaction([
@ -979,6 +982,8 @@ export class UserTaskController extends Controller {
@Query() page = 1,
@Query() pageSize = 30,
@Query() userTaskStatus?: UserTaskStatus,
@Query() startDate?: Date,
@Query() endDate?: Date,
) {
const where = {
taskList: {
@ -1025,6 +1030,7 @@ export class UserTaskController extends Controller {
{ contactName: { contains: query, mode: "insensitive" } },
{ contactTel: { contains: query, mode: "insensitive" } },
]),
...whereDateQuery(startDate, endDate),
} satisfies Prisma.TaskOrderWhereInput;
const [result, total] = await prisma.$transaction([