rez_core 2.2.52 → 2.2.53
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/repository/activity-log.repository.d.ts +1 -1
- package/dist/module/workflow/repository/activity-log.repository.js +9 -6
- package/dist/module/workflow/repository/activity-log.repository.js.map +1 -1
- package/dist/module/workflow/repository/stage-group.repository.js +35 -9
- package/dist/module/workflow/repository/stage-group.repository.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/workflow/repository/activity-log.repository.ts +10 -6
- package/src/module/workflow/repository/stage-group.repository.ts +64 -12
|
@@ -3,5 +3,5 @@ import { Repository } from 'typeorm';
|
|
|
3
3
|
export declare class ActivityLogRepository {
|
|
4
4
|
private readonly activityLogRepository;
|
|
5
5
|
constructor(activityLogRepository: Repository<ActivityLog>);
|
|
6
|
-
getAllActivityLog(mapped_entity_type: string, loggedInUser: any): Promise<
|
|
6
|
+
getAllActivityLog(mapped_entity_type: string, loggedInUser: any): Promise<any[]>;
|
|
7
7
|
}
|
|
@@ -22,12 +22,15 @@ let ActivityLogRepository = class ActivityLogRepository {
|
|
|
22
22
|
}
|
|
23
23
|
async getAllActivityLog(mapped_entity_type, loggedInUser) {
|
|
24
24
|
const { organization_id } = loggedInUser;
|
|
25
|
-
return this.activityLogRepository
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
})
|
|
25
|
+
return this.activityLogRepository
|
|
26
|
+
.createQueryBuilder('log')
|
|
27
|
+
.leftJoin('cr_user', 'user', 'log.user_id = user.id')
|
|
28
|
+
.where('log.mapped_entity_type = :mapped_entity_type', {
|
|
29
|
+
mapped_entity_type,
|
|
30
|
+
})
|
|
31
|
+
.andWhere('log.organization_id = :organization_id', { organization_id })
|
|
32
|
+
.addSelect('user.name', 'user_name')
|
|
33
|
+
.getRawMany();
|
|
31
34
|
}
|
|
32
35
|
};
|
|
33
36
|
exports.ActivityLogRepository = ActivityLogRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-log.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/activity-log.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,uEAA4D;AAC5D,qCAAqC;AAErC,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAChC,YAEmB,qBAA8C;QAA9C,0BAAqB,GAArB,qBAAqB,CAAyB;IAC9D,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CAAC,kBAA0B,EAAE,YAAY;QAC9D,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"activity-log.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/activity-log.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,uEAA4D;AAC5D,qCAAqC;AAErC,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAChC,YAEmB,qBAA8C;QAA9C,0BAAqB,GAArB,qBAAqB,CAAyB;IAC9D,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CAAC,kBAA0B,EAAE,YAAY;QAC9D,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QAEzC,OAAO,IAAI,CAAC,qBAAqB;aAC9B,kBAAkB,CAAC,KAAK,CAAC;aACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,uBAAuB,CAAC;aACpD,KAAK,CAAC,8CAA8C,EAAE;YACrD,kBAAkB;SACnB,CAAC;aACD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,eAAe,EAAE,CAAC;aACvE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;aACnC,UAAU,EAAE,CAAC;IAClB,CAAC;CACF,CAAA;AAnBY,sDAAqB;gCAArB,qBAAqB;IAE7B,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACU,oBAAU;GAHzC,qBAAqB,CAmBjC"}
|
|
@@ -49,17 +49,43 @@ let StageGroupRepository = class StageGroupRepository {
|
|
|
49
49
|
return [];
|
|
50
50
|
const stageGroupIds = stageGroups.map((sg) => sg.id);
|
|
51
51
|
const stages = await this.dataSource.query(`
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
52
|
+
SELECT
|
|
53
|
+
cr_wf_stage.*,
|
|
54
|
+
cr_user.name AS created_by_name
|
|
55
|
+
FROM cr_wf_stage
|
|
56
|
+
LEFT JOIN cr_user ON cr_wf_stage.created_by = cr_user.id
|
|
57
|
+
WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
|
|
58
|
+
AND cr_wf_stage.organization_id = ?
|
|
59
|
+
ORDER BY cr_wf_stage.sequence ASC
|
|
60
|
+
`, [...stageGroupIds, organization_id]);
|
|
61
|
+
const stageIds = stages.map((s) => s.id);
|
|
62
|
+
const taskCounts = await this.dataSource.query(`
|
|
63
|
+
SELECT stage_id, COUNT(*) AS task_count
|
|
64
|
+
FROM cr_wf_task_data
|
|
65
|
+
WHERE stage_id IN (${stageIds.map(() => '?').join(',')})
|
|
66
|
+
GROUP BY stage_id
|
|
67
|
+
`, [...stageIds]);
|
|
68
|
+
const meetingCounts = await this.dataSource.query(`
|
|
69
|
+
SELECT stage_id, COUNT(*) AS meeting_count
|
|
70
|
+
FROM cr_lead_meeting
|
|
71
|
+
WHERE stage_id IN (${stageIds.map(() => '?').join(',')})
|
|
72
|
+
GROUP BY stage_id
|
|
73
|
+
`, [...stageIds]);
|
|
74
|
+
const sendCommCounts = await this.dataSource.query(`
|
|
75
|
+
SELECT stage_id, COUNT(*) AS send_comm_count
|
|
76
|
+
FROM cr_lead_communication
|
|
77
|
+
WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND type = 'SEND'
|
|
78
|
+
GROUP BY stage_id
|
|
79
|
+
`, [...stageIds]);
|
|
80
|
+
const taskCountMap = new Map(taskCounts.map((row) => [row.stage_id, row.task_count]));
|
|
81
|
+
const meetingCountMap = new Map(meetingCounts.map((row) => [row.stage_id, row.meeting_count]));
|
|
82
|
+
const sendCommCountMap = new Map(sendCommCounts.map((row) => [row.stage_id, row.send_comm_count]));
|
|
61
83
|
const stageMap = new Map();
|
|
62
84
|
for (const stage of stages) {
|
|
85
|
+
const stageId = Number(stage.id);
|
|
86
|
+
stage.task_count = taskCountMap.get(stageId) || 0;
|
|
87
|
+
stage.meeting_count = meetingCountMap.get(stageId) || 0;
|
|
88
|
+
stage.send_comm_count = sendCommCountMap.get(stageId) || 0;
|
|
63
89
|
if (!stageMap.has(stage.stage_group_id)) {
|
|
64
90
|
stageMap.set(stage.stage_group_id, []);
|
|
65
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stage-group.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage-group.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKwB;AACxB,qEAA0D;AAC1D,6CAAmD;AACnD,qCAAiD;AAG1C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAEmB,oBAA4C,EAC5C,UAAsB;QADtB,yBAAoB,GAApB,oBAAoB,CAAwB;QAC5C,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CAAC,WAAmB,EAAE,eAAuB;QACjE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,4BAAmB,CAAC,yBAAyB,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YAClD,KAAK,EAAE;gBACL,WAAW;gBACX,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,MAAM,IAAI,0BAAiB,CACzB,iDAAiD,CAClD,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,iCAAiC,CACrC,WAAmB,EACnB,eAAuB;QAEvB,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,4BAAmB,CAAC,yBAAyB,CAAC,CAAC;QAC3D,CAAC;QAGD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAC7C,WAAW,EACX,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAGnC,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAErD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACxC;;;;;;
|
|
1
|
+
{"version":3,"file":"stage-group.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage-group.repository.ts"],"names":[],"mappings":"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"}
|