rez_core 2.2.139 → 2.2.141
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/workflow/controller/stage.controller.d.ts +22 -1
- package/dist/module/workflow/repository/stage.repository.js +2 -12
- package/dist/module/workflow/repository/stage.repository.js.map +1 -1
- package/dist/module/workflow/service/stage.service.d.ts +22 -1
- package/dist/module/workflow/service/stage.service.js +2 -24
- package/dist/module/workflow/service/stage.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/workflow/repository/stage.repository.ts +15 -15
- package/src/module/workflow/service/stage.service.ts +50 -49
- package/.vscode/extensions.json +0 -5
|
@@ -8,7 +8,28 @@ export declare class StageController {
|
|
|
8
8
|
stage_group_id: number;
|
|
9
9
|
mapped_entity_id: number;
|
|
10
10
|
mapped_entity_type: string;
|
|
11
|
-
}): Promise<
|
|
11
|
+
}): Promise<{
|
|
12
|
+
name: string;
|
|
13
|
+
fullName: string;
|
|
14
|
+
stage_group_id: number;
|
|
15
|
+
sequence: number;
|
|
16
|
+
description: string;
|
|
17
|
+
id: number;
|
|
18
|
+
entity_type: string;
|
|
19
|
+
status: string;
|
|
20
|
+
parent_type: string;
|
|
21
|
+
parent_id: number;
|
|
22
|
+
code: string;
|
|
23
|
+
created_by: number;
|
|
24
|
+
created_date: Date;
|
|
25
|
+
modified_by: number;
|
|
26
|
+
modified_date: Date;
|
|
27
|
+
enterprise_id: number;
|
|
28
|
+
organization_id: number;
|
|
29
|
+
appcode: string;
|
|
30
|
+
level_id: string;
|
|
31
|
+
level_type: string;
|
|
32
|
+
}[]>;
|
|
12
33
|
getStagesWithGroupName(workflow_id: number, req: Request & {
|
|
13
34
|
user: any;
|
|
14
35
|
}): Promise<any>;
|
|
@@ -67,21 +67,11 @@ let StageRepository = class StageRepository {
|
|
|
67
67
|
g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
|
|
68
68
|
s.*
|
|
69
69
|
FROM cr_wf_stage_group g
|
|
70
|
-
LEFT JOIN cr_wf_stage s ON s.stage_group_id = g.id
|
|
71
|
-
WHERE g.workflow_id = ? AND g.organization_id = ?
|
|
72
|
-
ORDER BY g.id, s.id
|
|
73
|
-
`, [stageGroup.workflow_id, organization_id]);
|
|
74
|
-
const rows2 = await this.dataSource.query(`
|
|
75
|
-
SELECT
|
|
76
|
-
g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
|
|
77
|
-
s.*
|
|
78
|
-
FROM cr_wf_stage_group g
|
|
79
70
|
INNER JOIN cr_wf_stage s ON s.stage_group_id = g.id
|
|
80
|
-
WHERE g.workflow_id = ? AND g.organization_id = ?
|
|
71
|
+
WHERE g.workflow_id = ? AND g.organization_id = ? AND g.id = ?
|
|
81
72
|
ORDER BY g.id, s.id
|
|
82
|
-
`, [stageGroup.workflow_id, organization_id]);
|
|
73
|
+
`, [stageGroup.workflow_id, organization_id, stage_group_id]);
|
|
83
74
|
console.log(rows, '-----------LEFT JOIN----------');
|
|
84
|
-
console.log(rows2, '-----------INNER JOIN----------');
|
|
85
75
|
if (!rows || rows.length === 0) {
|
|
86
76
|
return [];
|
|
87
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stage.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKwB;AAExB,6CAAmD;AACnD,qCAAiD;AACjD,yDAA+C;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAEmB,eAAkC,EAClC,UAAsB;QADtB,oBAAe,GAAf,eAAe,CAAmB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,cAAsB,EAAE,eAAuB;QAC/D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE;SAC9B,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,0BAAiB,CAAC,uBAAuB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;QAGvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC7C,KAAK,EAAE;gBACL,cAAc;gBACd,eAAe;aAChB;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,KAAK;YACR,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,GAAG,cAAc,MAAM,KAAK,CAAC,IAAI,EAAE;SAC9C,CAAC,CAAC,CAAC;QAEJ,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,oCAAoC,CACxC,cAAsB,EACtB,eAAuB;QAEvB,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE;SAC/C,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACtC;;;;;;;;KAQD,EACC,CAAC,UAAU,CAAC,WAAW,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"stage.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKwB;AAExB,6CAAmD;AACnD,qCAAiD;AACjD,yDAA+C;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAEmB,eAAkC,EAClC,UAAsB;QADtB,oBAAe,GAAf,eAAe,CAAmB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,cAAsB,EAAE,eAAuB;QAC/D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE;SAC9B,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,0BAAiB,CAAC,uBAAuB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;QAGvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC7C,KAAK,EAAE;gBACL,cAAc;gBACd,eAAe;aAChB;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,KAAK;YACR,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,GAAG,cAAc,MAAM,KAAK,CAAC,IAAI,EAAE;SAC9C,CAAC,CAAC,CAAC;QAEJ,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,oCAAoC,CACxC,cAAsB,EACtB,eAAuB;QAEvB,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE;SAC/C,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACtC;;;;;;;;KAQD,EACC,CAAC,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,CAAC,CAC1D,CAAC;QAcF,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,gCAAgC,CAAC,CAAC;QAGpD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA1GY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,oBAAK,CAAC,CAAA;qCACU,oBAAU;QACf,oBAAU;GAJ9B,eAAe,CA0G3B"}
|
|
@@ -13,7 +13,28 @@ export declare class StageService extends EntityServiceImpl {
|
|
|
13
13
|
private readonly dataSource;
|
|
14
14
|
private readonly actionService;
|
|
15
15
|
constructor(stageRepository: StageRepository, stageGroupRepository: StageGroupRepository, stageMovementRepo: Repository<StageMovementData>, dataSource: DataSource, actionService: ActionService);
|
|
16
|
-
getAllStage(stage_group_id: number, mapped_entity_id: number, organization_id: number): Promise<
|
|
16
|
+
getAllStage(stage_group_id: number, mapped_entity_id: number, organization_id: number): Promise<{
|
|
17
|
+
name: string;
|
|
18
|
+
fullName: string;
|
|
19
|
+
stage_group_id: number;
|
|
20
|
+
sequence: number;
|
|
21
|
+
description: string;
|
|
22
|
+
id: number;
|
|
23
|
+
entity_type: string;
|
|
24
|
+
status: string;
|
|
25
|
+
parent_type: string;
|
|
26
|
+
parent_id: number;
|
|
27
|
+
code: string;
|
|
28
|
+
created_by: number;
|
|
29
|
+
created_date: Date;
|
|
30
|
+
modified_by: number;
|
|
31
|
+
modified_date: Date;
|
|
32
|
+
enterprise_id: number;
|
|
33
|
+
organization_id: number;
|
|
34
|
+
appcode: string;
|
|
35
|
+
level_id: string;
|
|
36
|
+
level_type: string;
|
|
37
|
+
}[]>;
|
|
17
38
|
updateEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<any>;
|
|
18
39
|
getEntityData(entityType: string, id: number, loggedInUser?: UserData): Promise<BaseEntity | null>;
|
|
19
40
|
deleteEntity(entityType: string, id: number, loggedInUser: UserData): Promise<any>;
|
|
@@ -31,33 +31,11 @@ let StageService = class StageService extends entity_service_impl_service_1.Enti
|
|
|
31
31
|
this.actionService = actionService;
|
|
32
32
|
}
|
|
33
33
|
async getAllStage(stage_group_id, mapped_entity_id, organization_id) {
|
|
34
|
-
const allStageGrpData = await this.stageRepository.
|
|
34
|
+
const allStageGrpData = await this.stageRepository.getAllStage(stage_group_id, organization_id);
|
|
35
35
|
if (allStageGrpData.length === 0) {
|
|
36
36
|
return [];
|
|
37
37
|
}
|
|
38
|
-
|
|
39
|
-
where: {
|
|
40
|
-
mapped_entity_type: 'LEAD',
|
|
41
|
-
mapped_entity_id,
|
|
42
|
-
},
|
|
43
|
-
});
|
|
44
|
-
const stageMovementMap = new Map(stageMovementData.map((s) => [Number(s.stage_action_mapping_id), s]));
|
|
45
|
-
const statusListMaster = await this.dataSource.query(`SELECT id, name
|
|
46
|
-
FROM cr_list_master_items
|
|
47
|
-
WHERE listtype = 'STS' AND organization_id = ?`, [organization_id]);
|
|
48
|
-
const statusMap = new Map(statusListMaster.map((s) => [String(s.id), s.name]));
|
|
49
|
-
const result = [];
|
|
50
|
-
for (const stage of allStageGrpData) {
|
|
51
|
-
stage.status = statusMap.get(String(stage.status)) || stage.status;
|
|
52
|
-
const movement = stageMovementMap.get(Number(stage.id));
|
|
53
|
-
stage.is_current = movement ? movement.is_current === 'Y' : false;
|
|
54
|
-
stage.full_name = `${stage.stage_group_name} - ${stage.name}`;
|
|
55
|
-
result.push(stage);
|
|
56
|
-
if (stage.is_current) {
|
|
57
|
-
break;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
return result;
|
|
38
|
+
return allStageGrpData;
|
|
61
39
|
}
|
|
62
40
|
async updateEntity(entityData, loggedInUser) {
|
|
63
41
|
return await super.updateEntity(entityData, loggedInUser);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stage.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/stage.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAAiD;AACjD,2CAKwB;AACxB,gGAAwF;AAGxF,qEAAiE;AACjE,qCAAiD;AACjD,iFAA4E;AAC5E,6CAAmD;AACnD,qFAAyE;AAGlE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,+CAAiB;IACjD,YACmB,eAAgC,EAChC,oBAA0C,EAE1C,iBAAgD,EAChD,UAAsB,EAEtB,aAA4B;QAE7C,KAAK,EAAE,CAAC;QARS,oBAAe,GAAf,eAAe,CAAiB;QAChC,yBAAoB,GAApB,oBAAoB,CAAsB;QAE1C,sBAAiB,GAAjB,iBAAiB,CAA+B;QAChD,eAAU,GAAV,UAAU,CAAY;QAEtB,kBAAa,GAAb,aAAa,CAAe;IAG/C,CAAC;IAED,KAAK,CAAC,WAAW,CACf,cAAsB,EACtB,gBAAwB,EACxB,eAAuB;QAGvB,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"stage.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/stage.service.ts"],"names":[],"mappings":"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"}
|