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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
Kittapath 2024-05-14 16:48:17 +07:00
commit 291d3199d2
8 changed files with 37 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/OrganizationController.ts
View file

@ -724,6 +724,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgRoot.orgRootFax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
labelName:
orgRoot.orgRootName + " " + orgRoot.orgRootCode + "00" + " " + orgRoot.orgRootShortName,
totalPosition: await this.posMasterRepository.count({
@ -833,6 +834,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgChild1.orgChild1Fax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
labelName:
orgChild1.orgChild1Name +
" " +
@ -947,6 +949,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgChild2.orgChild2Fax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
labelName:
orgChild2.orgChild2Name +
" " +
@ -1064,6 +1067,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgChild3.orgChild3Fax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
labelName:
orgChild3.orgChild3Name +
" " +
@ -1181,6 +1185,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgChild4.orgChild4Fax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
labelName:
orgChild4.orgChild4Name +
" " +

2
src/controllers/ProfileNopaidController.ts
View file

@ -137,7 +137,7 @@ export class ProfileNopaidController extends Controller {
}
@Delete("{nopaidId}")
public async deleteTraning(@Path() nopaidId: string) {
public async deleteNopaid(@Path() nopaidId: string) {
await this.nopaidHistoryRepository.delete({
profileNopaidId: nopaidId,
});

2
src/controllers/ProfileNopaidEmployeeController.ts
View file

@ -122,7 +122,7 @@ export class ProfileNopaidEmployeeController extends Controller {
}
@Delete("{nopaidId}")
public async deleteTraning(@Path() nopaidId: string) {
public async deleteNopaid(@Path() nopaidId: string) {
await this.nopaidHistoryRepository.delete({
profileNopaidId: nopaidId,
});

21
src/controllers/ProfileSalaryEmployeeController.ts
View file

@ -15,15 +15,14 @@ import {
import { AppDataSource } from "../database/data-source";
import {
CreateProfileSalaryEmployee,
ProfileSalary,
UpdateProfileSalary,
} from "../entities/ProfileSalary";
ProfileSalaryEmployee,
UpdateProfileSalaryEmployee,
} from "../entities/ProfileSalaryEmployee";
import HttpSuccess from "../interfaces/http-success";
import HttpStatus from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory";
import { RequestWithUser } from "../middlewares/user";
import { Profile } from "../entities/Profile";
import { ProfileEmployee } from "../entities/ProfileEmployee";
import { LessThan, MoreThan } from "typeorm";
@ -32,13 +31,13 @@ import { LessThan, MoreThan } from "typeorm";
@Security("bearerAuth")
export class ProfileSalaryEmployeeController extends Controller {
private profileRepo = AppDataSource.getRepository(ProfileEmployee);
private salaryRepo = AppDataSource.getRepository(ProfileSalary);
private salaryRepo = AppDataSource.getRepository(ProfileSalaryEmployee);
private salaryHistoryRepo = AppDataSource.getRepository(ProfileSalaryHistory);
@Get("{profileId}")
public async getSalary(@Path() profileId: string) {
const record = await this.salaryRepo.find({
where: { profileEmployeeId: profileId },
where: { profileId: profileId },
order: { order: "ASC" },
});
return new HttpSuccess(record);
@ -57,22 +56,22 @@ export class ProfileSalaryEmployeeController extends Controller {
@Request() req: RequestWithUser,
@Body() body: CreateProfileSalaryEmployee,
) {
if (!body.profileEmployeeId) {
if (!body.profileId) {
throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
}
const profile = await this.profileRepo.findOneBy({ id: body.profileEmployeeId });
const profile = await this.profileRepo.findOneBy({ id: body.profileId });
if (!profile) {
throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
}
const dest_item = await this.salaryRepo.findOne({
where: { profileId: body.profileEmployeeId },
where: { profileId: body.profileId },
order: { order: "DESC" },
});
const data = new ProfileSalary();
const data = new ProfileSalaryEmployee();
const meta = {
order: dest_item == null ? 1 : dest_item.order + 1,
@ -92,7 +91,7 @@ export class ProfileSalaryEmployeeController extends Controller {
@Patch("{salaryId}")
public async editSalary(
@Request() req: RequestWithUser,
@Body() body: UpdateProfileSalary,
@Body() body: UpdateProfileSalaryEmployee,
@Path() salaryId: string,
) {
const record = await this.salaryRepo.findOneBy({ id: salaryId });

6
src/entities/ProfileEmployee.ts
View file

@ -20,6 +20,7 @@ import { ProfileEducation } from "./ProfileEducation";
import { ProfileAbility } from "./ProfileAbility";
import { ProfileOther } from "./ProfileOther";
import { ProfileAvatar } from "./ProfileAvatar";
import { ProfileGovernment } from "./ProfileGovernment";
@Entity("profileEmployee")
export class ProfileEmployee extends EntityBase {
@Column({
@ -243,7 +244,7 @@ export class ProfileEmployee extends EntityBase {
profileNopaids: ProfileNopaid[];
@OneToMany(() => ProfileDiscipline, (v) => v.profileEmployee)
profileDisciplines: ProfileNopaid[];
profileDisciplines: ProfileDiscipline[];
@OneToMany(() => ProfileChangeName, (v) => v.profileEmployee)
profileChangeNames: ProfileChangeName[];
@ -274,6 +275,9 @@ export class ProfileEmployee extends EntityBase {
@OneToMany(() => ProfileEmployeeHistory, (v) => v.profileEmployee)
histories: ProfileEmployeeHistory[];
@OneToMany(() => ProfileGovernment, (v) => v.profileEmployee)
profileGovernment: ProfileGovernment[];
}
@Entity("profileEmployeeHistory")

2
src/entities/ProfileGovernment.ts
View file

@ -62,7 +62,7 @@ export class ProfileGovernment extends EntityBase {
@JoinColumn({ name: "profileId" })
profile: Profile;
@ManyToOne(() => ProfileEmployee, (ProfileEmployee) => ProfileEmployee.profileTrainings)
@ManyToOne(() => ProfileEmployee, (v) => v.profileGovernment)
@JoinColumn({ name: "profileEmployeeId" })
profileEmployee: ProfileEmployee;
}

4
src/entities/ProfileSalary.ts
View file

@ -146,10 +146,6 @@ export class ProfileSalary extends EntityBase {
@ManyToOne(() => Profile, (profile) => profile.profileSalary)
@JoinColumn({ name: "profileId" })
profile: Profile;
@ManyToOne(() => ProfileEmployee, (ProfileEmployee) => ProfileEmployee.profileSalary)
@JoinColumn({ name: "profileEmployeeId" })
profileEmployee: ProfileEmployee;
}
export class CreateProfileSalary {

14
src/migration/1715679161554-update_table_node_add_responsibilit1.ts Normal file
View file

@ -0,0 +1,14 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableNodeAddResponsibilit11715679161554 implements MigrationInterface {
name = 'UpdateTableNodeAddResponsibilit11715679161554'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`profileSalary\` DROP FOREIGN KEY \`FK_f5758428d496b6d2a051c8af92b\``);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`profileSalary\` ADD CONSTRAINT \`FK_f5758428d496b6d2a051c8af92b\` FOREIGN KEY (\`profileEmployeeId\`) REFERENCES \`profileEmployee\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
}