add endDate,startDate
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 5s
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 5s
This commit is contained in:
parent
d52680c23f
commit
fd7833a592
4 changed files with 19 additions and 3 deletions
|
|
@ -280,6 +280,8 @@ export class UserController extends Controller {
|
||||||
@Query() status?: Status,
|
@Query() status?: Status,
|
||||||
@Query() responsibleDistrictId?: string,
|
@Query() responsibleDistrictId?: string,
|
||||||
@Query() activeBranchOnly?: boolean,
|
@Query() activeBranchOnly?: boolean,
|
||||||
|
@Query() startDate?: Date,
|
||||||
|
@Query() endDate?: Date,
|
||||||
) {
|
) {
|
||||||
return this.getUserByCriteria(
|
return this.getUserByCriteria(
|
||||||
req,
|
req,
|
||||||
|
|
@ -291,6 +293,8 @@ export class UserController extends Controller {
|
||||||
status,
|
status,
|
||||||
responsibleDistrictId,
|
responsibleDistrictId,
|
||||||
activeBranchOnly,
|
activeBranchOnly,
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,6 +86,8 @@ export class TaskController extends Controller {
|
||||||
@Query() pageSize = 30,
|
@Query() pageSize = 30,
|
||||||
@Query() assignedByUserId?: string,
|
@Query() assignedByUserId?: string,
|
||||||
@Query() taskOrderStatus?: TaskOrderStatus,
|
@Query() taskOrderStatus?: TaskOrderStatus,
|
||||||
|
@Query() startDate?: Date,
|
||||||
|
@Query() endDate?: Date,
|
||||||
) {
|
) {
|
||||||
return this.getTaskOrderListByCriteria(
|
return this.getTaskOrderListByCriteria(
|
||||||
req,
|
req,
|
||||||
|
|
@ -94,6 +96,8 @@ export class TaskController extends Controller {
|
||||||
pageSize,
|
pageSize,
|
||||||
assignedByUserId,
|
assignedByUserId,
|
||||||
taskOrderStatus,
|
taskOrderStatus,
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -106,9 +110,9 @@ export class TaskController extends Controller {
|
||||||
@Query() pageSize = 30,
|
@Query() pageSize = 30,
|
||||||
@Query() assignedUserId?: string,
|
@Query() assignedUserId?: string,
|
||||||
@Query() taskOrderStatus?: TaskOrderStatus,
|
@Query() taskOrderStatus?: TaskOrderStatus,
|
||||||
@Body() body?: { code?: string[] },
|
|
||||||
@Query() startDate?: Date,
|
@Query() startDate?: Date,
|
||||||
@Query() endDate?: Date,
|
@Query() endDate?: Date,
|
||||||
|
@Body() body?: { code?: string[] },
|
||||||
) {
|
) {
|
||||||
const where = {
|
const where = {
|
||||||
taskOrderStatus,
|
taskOrderStatus,
|
||||||
|
|
|
||||||
|
|
@ -121,6 +121,8 @@ export class CreditNoteController extends Controller {
|
||||||
@Query() query: string = "",
|
@Query() query: string = "",
|
||||||
@Query() quotationId?: string,
|
@Query() quotationId?: string,
|
||||||
@Query() creditNoteStatus?: CreditNoteStatus,
|
@Query() creditNoteStatus?: CreditNoteStatus,
|
||||||
|
@Query() startDate?: Date,
|
||||||
|
@Query() endDate?: Date,
|
||||||
) {
|
) {
|
||||||
return await this.getCreditNoteListByCriteria(
|
return await this.getCreditNoteListByCriteria(
|
||||||
req,
|
req,
|
||||||
|
|
@ -129,6 +131,8 @@ export class CreditNoteController extends Controller {
|
||||||
query,
|
query,
|
||||||
quotationId,
|
quotationId,
|
||||||
creditNoteStatus,
|
creditNoteStatus,
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -142,9 +146,9 @@ export class CreditNoteController extends Controller {
|
||||||
@Query() query: string = "",
|
@Query() query: string = "",
|
||||||
@Query() quotationId?: string,
|
@Query() quotationId?: string,
|
||||||
@Query() creditNoteStatus?: CreditNoteStatus,
|
@Query() creditNoteStatus?: CreditNoteStatus,
|
||||||
@Body() body?: {},
|
|
||||||
@Query() startDate?: Date,
|
@Query() startDate?: Date,
|
||||||
@Query() endDate?: Date,
|
@Query() endDate?: Date,
|
||||||
|
@Body() body?: {},
|
||||||
) {
|
) {
|
||||||
const where = {
|
const where = {
|
||||||
OR: queryOrNot<Prisma.CreditNoteWhereInput[]>(query, [
|
OR: queryOrNot<Prisma.CreditNoteWhereInput[]>(query, [
|
||||||
|
|
|
||||||
|
|
@ -168,6 +168,8 @@ export class DebitNoteController extends Controller {
|
||||||
@Query() payCondition?: PayCondition,
|
@Query() payCondition?: PayCondition,
|
||||||
@Query() includeRegisteredBranch?: boolean,
|
@Query() includeRegisteredBranch?: boolean,
|
||||||
@Query() code?: string,
|
@Query() code?: string,
|
||||||
|
@Query() startDate?: Date,
|
||||||
|
@Query() endDate?: Date,
|
||||||
) {
|
) {
|
||||||
return await this.getDebitNoteListByCriteria(
|
return await this.getDebitNoteListByCriteria(
|
||||||
req,
|
req,
|
||||||
|
|
@ -179,6 +181,8 @@ export class DebitNoteController extends Controller {
|
||||||
payCondition,
|
payCondition,
|
||||||
includeRegisteredBranch,
|
includeRegisteredBranch,
|
||||||
code,
|
code,
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -195,9 +199,9 @@ export class DebitNoteController extends Controller {
|
||||||
@Query() payCondition?: PayCondition,
|
@Query() payCondition?: PayCondition,
|
||||||
@Query() includeRegisteredBranch?: boolean,
|
@Query() includeRegisteredBranch?: boolean,
|
||||||
@Query() code?: string,
|
@Query() code?: string,
|
||||||
@Body() body?: {},
|
|
||||||
@Query() startDate?: Date,
|
@Query() startDate?: Date,
|
||||||
@Query() endDate?: Date,
|
@Query() endDate?: Date,
|
||||||
|
@Body() body?: {},
|
||||||
) {
|
) {
|
||||||
const where = {
|
const where = {
|
||||||
OR: queryOrNot<Prisma.QuotationWhereInput[]>(query, [
|
OR: queryOrNot<Prisma.QuotationWhereInput[]>(query, [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue