migration and #2317(2)

src/controllers/ProfileEmployeeTempController.ts

@@ -1537,7 +1537,7 @@ export class ProfileEmployeeTempController extends Controller {
     let query = await this.profileRepo
       .createQueryBuilder("profileEmployee")
       .leftJoinAndSelect("profileEmployee.posLevelTemp", "posLevelTemp")
-      .leftJoinAndSelect("profileEmployee.posType", "posType")
+      .leftJoinAndSelect("profileEmployee.posTypeTemp", "posTypeTemp")
       .leftJoinAndSelect("profileEmployee.current_holderTemps", "current_holderTemps")
       .leftJoinAndSelect("profileEmployee.profileEmployeeEmployment", "profileEmployeeEmployment")
       .leftJoinAndSelect("current_holderTemps.positions", "positions")
@@ -1606,7 +1606,7 @@ export class ProfileEmployeeTempController extends Controller {
       )
       .andWhere(
         posType != undefined && posType != null && posType != ""
-          ? "posType.posTypeName LIKE :keyword1"
+          ? "posTypeTemp.posTypeName LIKE :keyword1"
           : "1=1",
         {
           keyword1: `${posType}`,
@@ -1709,10 +1709,11 @@ export class ProfileEmployeeTempController extends Controller {
           citizenId: _data.citizenId,
           // posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName,
           posLevel: _data.posLevelTemp == null ? null : _data.posLevelTemp.posLevelName,
-          posType: _data.posType == null ? null : _data.posType.posTypeName,
+          // posType: _data.posType == null ? null : _data.posType.posTypeName,
-          posTypeShortName: _data.posType == null ? null : _data.posType.posTypeShortName,
+          posType: _data.posTypeTemp == null ? null : _data.posTypeTemp.posTypeName,
-          posLevelId: _data.posLevel == null ? null : _data.posLevel.id,
+          posTypeShortName: _data.posTypeTemp == null ? null : _data.posTypeTemp.posTypeShortName,
-          posTypeId: _data.posType == null ? null : _data.posType.id,
+          posLevelId: _data.posLevelTemp == null ? null : _data.posLevelTemp.id,
+          posTypeId: _data.posTypeTemp == null ? null : _data.posTypeTemp.id,
           positionId: _data.positionIdTemp,
           posmasterId: _data.posmasterIdTemp,
           position: _data.position,

src/entities/EmployeePosType.ts

@@ -39,6 +39,9 @@ export class EmployeePosType extends EntityBase {
 
   @OneToMany(() => ProfileEmployee, (profile) => profile.posType)
   profiles: ProfileEmployee[];
+
+  @OneToMany(() => ProfileEmployee, (profile) => profile.posTypeTemp)
+  profilesTemp: ProfileEmployee[];
 }
 
 export class CreateEmployeePosType {

src/entities/ProfileEmployee.ts

@@ -796,6 +796,10 @@ export class ProfileEmployee extends EntityBase {
   @JoinColumn({ name: "posLevelIdTemp" })
   posLevelTemp: EmployeePosLevel;
 
+  @ManyToOne(() => EmployeePosType, (v) => v.profilesTemp)
+  @JoinColumn({ name: "posTypeIdTemp" })
+  posTypeTemp: EmployeePosType;
+
   @ManyToOne(() => EmployeePosType, (v) => v.profiles)
   posType: EmployeePosType;
 

src/migration/1771470195684-add_relation_posTypeTemp.ts

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