hrms-bangkok/hrms-api-kpi
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ค้นหาสถานะ

Browse source
This commit is contained in:
Kittapath 2024-05-09 15:20:49 +07:00
parent 427fc8a142
commit 9a85609e93
4 changed files with 45 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/controllers/KpiSpecialController.ts
View file

@ -162,21 +162,21 @@ export class kpiSpecialController extends Controller {
keyword?: string | null; keyword?: string | null;
}, },
) { ) {
let condition: any = {}; // let condition: any = {};
if (requestBody.keyword !== undefined && requestBody.keyword !== "") { // if (requestBody.keyword !== undefined && requestBody.keyword !== "") {
condition = { // condition = {
where: [ // where: [
{ // {
including: Like(`%${requestBody.keyword}%`), // including: Like(`%${requestBody.keyword}%`),
includingName: Like(`%${requestBody.keyword}%`), // includingName: Like(`%${requestBody.keyword}%`),
}, // },
], // ],
}; // };
} // }
const [kpiSpecial, total] = await AppDataSource.getRepository(KpiSpecial) const [kpiSpecial, total] = await AppDataSource.getRepository(KpiSpecial)
.createQueryBuilder("kpiSpecial") .createQueryBuilder("kpiSpecial")
.andWhere(condition) // .andWhere(condition)
.andWhere(requestBody.year ? "kpiSpecial.year LIKE :year" : "1=1", { .andWhere(requestBody.year ? "kpiSpecial.year LIKE :year" : "1=1", {
year: `%${requestBody.year}%`, year: `%${requestBody.year}%`,
}) })

18
src/controllers/KpiUserEvaluationController.ts
View file

@ -58,6 +58,9 @@ export class KpiUserEvaluationController extends Controller {
@Query("pageSize") pageSize: number = 10, @Query("pageSize") pageSize: number = 10,
@Query("kpiPeriodId") kpiPeriodId?: string, @Query("kpiPeriodId") kpiPeriodId?: string,
@Query("keyword") keyword?: string, @Query("keyword") keyword?: string,
@Query("status") status?: string,
@Query("results") results?: string,
@Query("reqedit") reqedit?: string,
) { ) {
let profileId: any = null; let profileId: any = null;
await new CallAPI() await new CallAPI()
@ -73,6 +76,21 @@ export class KpiUserEvaluationController extends Controller {
.andWhere(kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", { .andWhere(kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", {
kpiPeriodId: kpiPeriodId, kpiPeriodId: kpiPeriodId,
}) })
.andWhere(status != null && status != undefined ? "evaluationStatus LIKE :status" : "1=1", {
status: status,
})
.andWhere(
results != null && results != undefined ? "evaluationResults LIKE :results" : "1=1",
{
results: results,
},
)
.andWhere(
reqedit != null && reqedit != undefined ? "evaluationReqEdit LIKE :reqedit" : "1=1",
{
reqedit: reqedit,
},
)
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.orWhere("kpiUserEvaluation.evaluatorId LIKE :profileId", { qb.orWhere("kpiUserEvaluation.evaluatorId LIKE :profileId", {

2
src/entities/kpiUserEvaluation.ts
View file

@ -88,7 +88,7 @@ export class KpiUserEvaluation extends EntityBase {
nullable: true, nullable: true,
length: 40, length: 40,
comment: "คำขอแก้ไข", comment: "คำขอแก้ไข",
default: "NEW", default: null,
}) })
evaluationReqEdit: string; evaluationReqEdit: string;

14
src/migration/1715242826033-update_table_kpiSpecial_date_nullable1.ts Normal file
View file

@ -0,0 +1,14 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableKpiSpecialDateNullable11715242826033 implements MigrationInterface {
name = 'UpdateTableKpiSpecialDateNullable11715242826033'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationReqEdit\` \`evaluationReqEdit\` varchar(40) NULL COMMENT 'คำขอแก้ไข'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationReqEdit\` \`evaluationReqEdit\` varchar(40) NULL COMMENT 'คำขอแก้ไข' DEFAULT 'NEW'`);
}
}