rez_core 2.1.122 → 2.1.124
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/enterprise/repository/school.repository.js +1 -1
- package/dist/module/enterprise/repository/school.repository.js.map +1 -1
- package/dist/module/master/controller/master.controller.js +2 -0
- package/dist/module/master/controller/master.controller.js.map +1 -1
- package/dist/module/user/service/login.service.d.ts +3 -3
- package/dist/module/user/service/login.service.js +10 -9
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/user/service/user.service.js +1 -1
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/module/workflow/controller/workflow-list-master.controller.d.ts +1 -0
- package/dist/module/workflow/controller/workflow-list-master.controller.js +11 -0
- package/dist/module/workflow/controller/workflow-list-master.controller.js.map +1 -1
- package/dist/module/workflow/service/workflow-list-master.service.d.ts +1 -0
- package/dist/module/workflow/service/workflow-list-master.service.js +12 -0
- package/dist/module/workflow/service/workflow-list-master.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/enterprise/repository/school.repository.ts +1 -1
- package/src/module/master/controller/master.controller.ts +1 -1
- package/src/module/user/service/login.service.ts +18 -9
- package/src/module/user/service/user.service.ts +1 -1
- package/src/module/workflow/controller/workflow-list-master.controller.ts +15 -1
- package/src/module/workflow/service/workflow-list-master.service.ts +23 -0
|
@@ -42,7 +42,7 @@ let SchoolRepository = class SchoolRepository {
|
|
|
42
42
|
.andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
|
|
43
43
|
.getRawMany();
|
|
44
44
|
let currentORGLevel_id = hasOrgAccess[0]?.urm_level_id;
|
|
45
|
-
if (hasOrgAccess[0]
|
|
45
|
+
if (hasOrgAccess[0]?.urm_level_id == 1) {
|
|
46
46
|
currentORGLevel_id = org_id;
|
|
47
47
|
}
|
|
48
48
|
if (hasOrgAccess.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAiD;AACjD,2DAAqD;AACrD,yFAAkF;AAG3E,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAEmB,UAAkC,EAClC,UAAsB;QADtB,eAAU,GAAV,UAAU,CAAwB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAChC,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAa;QAClC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAChC,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,MAAc,EAAE,OAAe,EAAE,MAAM;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,0CAAe,CAAC,CAAC;QAEpE,MAAM,YAAY,GAAG,MAAM,YAAY;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;aAC/C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;aAC7D,UAAU,EAAE,CAAC;QAEhB,IAAI,kBAAkB,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC;QACvD,IAAI,YAAY,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ const common_1 = require("@nestjs/common");
|
|
|
17
17
|
const platform_express_1 = require("@nestjs/platform-express");
|
|
18
18
|
const master_service_1 = require("../service/master.service");
|
|
19
19
|
const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
|
|
20
|
+
const jwt_guard_1 = require("../../auth/guards/jwt.guard");
|
|
20
21
|
let MasterController = class MasterController {
|
|
21
22
|
constructor(masterService, entityService) {
|
|
22
23
|
this.masterService = masterService;
|
|
@@ -74,6 +75,7 @@ __decorate([
|
|
|
74
75
|
], MasterController.prototype, "uploadEntityDataXls", null);
|
|
75
76
|
exports.MasterController = MasterController = __decorate([
|
|
76
77
|
(0, common_1.Controller)('master'),
|
|
78
|
+
(0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
|
|
77
79
|
__metadata("design:paramtypes", [master_service_1.MasterService,
|
|
78
80
|
entity_service_impl_service_1.EntityServiceImpl])
|
|
79
81
|
], MasterController);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"master.controller.js","sourceRoot":"","sources":["../../../../src/module/master/controller/master.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AACxB,+DAA2D;AAC3D,8DAA0D;AAI1D,gGAAwF;
|
|
1
|
+
{"version":3,"file":"master.controller.js","sourceRoot":"","sources":["../../../../src/module/master/controller/master.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AACxB,+DAA2D;AAC3D,8DAA0D;AAI1D,gGAAwF;AACxF,2DAAgE;AAIzD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,aAA4B,EAC5B,aAAgC;QADhC,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAmB;IAChD,CAAC;IAIE,AAAN,KAAK,CAAC,mBAAmB,CAAiB,IAAyB;QACjE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,4BAAmB,CAAC,kBAAkB,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;IAIK,AAAN,KAAK,CAAC,mBAAmB,CACP,IAAyB,EAClC,GAA4B;QAEnC,IAAI,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,4BAAmB,CAAC,kBAAkB,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACxE,CAAC;IAIK,AAAN,KAAK,CAAC,mBAAmB,CACF,UAAkB,EACvB,IAAyB,EAClC,GAA4B,EAEnC,iBAAwD;QAExD,IAAI,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGrC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,4BAAmB,CAAC,kBAAkB,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAC9C,IAAI,CAAC,MAAM,EACX,UAAU,EACV,YAAY,EACZ,iBAAiB,CAClB,CAAC;IACJ,CAAC;CACF,CAAA;AAnDY,4CAAgB;AAQrB;IAFL,IAAA,aAAI,EAAC,YAAY,CAAC;IAClB,IAAA,wBAAe,EAAC,IAAA,kCAAe,EAAC,MAAM,CAAC,CAAC;IACd,WAAA,IAAA,qBAAY,GAAE,CAAA;;;;2DAKxC;AAIK;IAFL,IAAA,aAAI,EAAC,YAAY,CAAC;IAClB,IAAA,wBAAe,EAAC,IAAA,kCAAe,EAAC,MAAM,CAAC,CAAC;IAEtC,WAAA,IAAA,qBAAY,GAAE,CAAA;IACd,WAAA,IAAA,YAAG,GAAE,CAAA;;;;2DAOP;AAIK;IAFL,IAAA,aAAI,EAAC,0BAA0B,CAAC;IAChC,IAAA,wBAAe,EAAC,IAAA,kCAAe,EAAC,MAAM,CAAC,CAAC;IAEtC,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,IAAA,qBAAY,GAAE,CAAA;IACd,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,aAAI,EAAC,mBAAmB,CAAC,CAAA;;;;2DAgB3B;2BAlDU,gBAAgB;IAF5B,IAAA,mBAAU,EAAC,QAAQ,CAAC;IACpB,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAGY,8BAAa;QACb,+CAAiB;GAHxC,gBAAgB,CAmD5B"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
+
import { ConfigService } from '@nestjs/config';
|
|
1
2
|
import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
|
|
3
|
+
import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
|
|
4
|
+
import { DataSource, Repository } from 'typeorm';
|
|
2
5
|
import { Role } from '../entity/role.entity';
|
|
3
6
|
import { UserRoleMapping } from '../entity/user-role-mapping.entity';
|
|
4
7
|
import { UserSessionService } from './user-session.service';
|
|
5
8
|
import { UserService } from './user.service';
|
|
6
|
-
import { ConfigService } from '@nestjs/config';
|
|
7
|
-
import { DataSource, Repository } from 'typeorm';
|
|
8
|
-
import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
|
|
9
9
|
export declare class LoginService {
|
|
10
10
|
private readonly userService;
|
|
11
11
|
private userSessionService;
|
|
@@ -14,18 +14,18 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.LoginService = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const config_1 = require("@nestjs/config");
|
|
18
|
+
const typeorm_1 = require("@nestjs/typeorm");
|
|
19
|
+
const global_constant_1 = require("../../../constant/global.constant");
|
|
17
20
|
const organization_repository_1 = require("../../enterprise/repository/organization.repository");
|
|
21
|
+
const list_master_service_1 = require("../../listmaster/service/list-master.service");
|
|
22
|
+
const typeorm_2 = require("typeorm");
|
|
18
23
|
const encryptUtil_service_1 = require("../../../utils/service/encryptUtil.service");
|
|
19
24
|
const role_entity_1 = require("../entity/role.entity");
|
|
20
25
|
const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
|
|
21
26
|
const user_entity_1 = require("../entity/user.entity");
|
|
22
27
|
const user_session_service_1 = require("./user-session.service");
|
|
23
28
|
const user_service_1 = require("./user.service");
|
|
24
|
-
const config_1 = require("@nestjs/config");
|
|
25
|
-
const typeorm_1 = require("@nestjs/typeorm");
|
|
26
|
-
const typeorm_2 = require("typeorm");
|
|
27
|
-
const list_master_service_1 = require("../../listmaster/service/list-master.service");
|
|
28
|
-
const global_constant_1 = require("../../../constant/global.constant");
|
|
29
29
|
let LoginService = class LoginService {
|
|
30
30
|
constructor(userService, userSessionService, configService, userRoleMappingRepository, roleRepo, dataSource, organizationRepository, listMasterService) {
|
|
31
31
|
this.userService = userService;
|
|
@@ -41,7 +41,7 @@ let LoginService = class LoginService {
|
|
|
41
41
|
}
|
|
42
42
|
async login(email, password) {
|
|
43
43
|
const user = await this.userService.findByEmailId(email);
|
|
44
|
-
console.log(user,
|
|
44
|
+
console.log(user, ' user data');
|
|
45
45
|
if (!user) {
|
|
46
46
|
return {
|
|
47
47
|
success: false,
|
|
@@ -50,9 +50,9 @@ let LoginService = class LoginService {
|
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
const userOrgData = await this.organizationRepository.findOrganizationById(user.organization_id);
|
|
53
|
-
console.log(userOrgData,
|
|
53
|
+
console.log(userOrgData, ' user org data');
|
|
54
54
|
const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_ACTIVE, user?.organization_id || 0);
|
|
55
|
-
console.log(resolveStatus,
|
|
55
|
+
console.log(resolveStatus, ' resolve status');
|
|
56
56
|
if (user.status != resolveStatus.id ||
|
|
57
57
|
userOrgData?.status != resolveStatus.id) {
|
|
58
58
|
return {
|
|
@@ -82,8 +82,9 @@ let LoginService = class LoginService {
|
|
|
82
82
|
const defaultAccess = await this.getDefaultAccess(user, roleMappings);
|
|
83
83
|
await this.userService.setLastLevelTypeAndId(user.id, defaultAccess.level_type, defaultAccess.level_id);
|
|
84
84
|
const token = await this.userSessionService.createSession(user, appcode, defaultAccess);
|
|
85
|
+
const resolvedInvitationStatus = await this.listMasterService.getResolvedListCode(global_constant_1.INVITATION_STATUS_ACCEPTED, user?.organization_id || 0);
|
|
85
86
|
if (user.is_firstlogin === 1) {
|
|
86
|
-
user.invitation_status =
|
|
87
|
+
user.invitation_status = resolvedInvitationStatus.id;
|
|
87
88
|
user.is_firstlogin = 0;
|
|
88
89
|
const { password, ...userWithoutPassword } = user;
|
|
89
90
|
await this.userService.updateEntity(userWithoutPassword, user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,iGAAkG;AAClG,oFAAgF;AAChF,uDAA6C;AAC7C,iFAAqE;AACrE,uDAAiD;AACjD,iEAA4D;AAC5D,iDAA6C;
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
54
54
|
userData.password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userData.password || 'Admin@123', this.masterKey, this.masterIv);
|
|
55
55
|
userData.is_firstlogin = 1;
|
|
56
56
|
userData.roles = [];
|
|
57
|
-
userData.invitation_status = resolvedInvitationStatus.id
|
|
57
|
+
userData.invitation_status = resolvedInvitationStatus.id;
|
|
58
58
|
userData.status = resolveStatus.id || 'ACTIVE';
|
|
59
59
|
const savedData = await super.createEntity(userData, loggedInUser);
|
|
60
60
|
const insertPromises = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAA6C;AAC7C,2CAAyE;AACzE,gGAAmF;AAGnF,mEAA+D;AAC/D,oFAAgF;AAChF,0FAAkF;AAClF,uEAI2C;AAE3C,2EAAqE;AACrE,iFAAqE;AAGrE,2CAA+C;AAC/C,0FAAyF;AAEzF,sFAAsF;AAG/E,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD,YACU,cAA8B,EAC9B,sBAA8C,EACrC,iBAAoC,EAC7C,aAA4B,EACnB,qBAA4C,EACtC,WAAyC,EAEhE,iBAAqD;QAErD,KAAK,EAAE,CAAC;QATA,mBAAc,GAAd,cAAc,CAAgB;QAC9B,2BAAsB,GAAtB,sBAAsB,CAAwB;QACrC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,kBAAa,GAAb,aAAa,CAAe;QACnB,0BAAqB,GAArB,qBAAqB,CAAuB;QACrB,gBAAW,GAAX,WAAW,CAAa;QAE/C,sBAAiB,GAAjB,iBAAiB,CAAmB;QAKvD,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QACvD,aAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAHrD,CAAC;IAKD,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B,EAC7B,OAAuB;QAEvB,IAAI,QAAQ,GAAG,UAA2B,CAAC;QAE3C,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CACxD,QAAQ,CAAC,QAAQ,CAElB,CAAC;QACF,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,qCAAqC,EAAE,CAAC;QAC1E,CAAC;QAED,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CACnD,QAAQ,CAAC,MAAM,CAEhB,CAAC;QACF,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC;QAC3E,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CACpE,+BAAa,EACb,YAAY,EAAE,eAAe,IAAI,CAAC,CACnC,CAAC;QAEF,MAAM,wBAAwB,GAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAC9C,wCAAsB,EACtB,YAAY,EAAE,eAAe,IAAI,CAAC,CACnC,CAAC;QAEJ,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACzE,QAAQ,CAAC,QAAQ,GAAG,wCAAkB,CAAC,UAAU,CAC/C,QAAQ,CAAC,QAAQ,IAAI,WAAW,EAChC,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC;QAC3B,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC;QACpB,QAAQ,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,10 @@ let WorkflowListMasterController = class WorkflowListMasterController {
|
|
|
27
27
|
const result = await this.workflowService.getStagesByGroup(body.stage_group_id);
|
|
28
28
|
return result;
|
|
29
29
|
}
|
|
30
|
+
async getModes() {
|
|
31
|
+
const result = await this.workflowService.getModes();
|
|
32
|
+
return result;
|
|
33
|
+
}
|
|
30
34
|
};
|
|
31
35
|
exports.WorkflowListMasterController = WorkflowListMasterController;
|
|
32
36
|
__decorate([
|
|
@@ -45,6 +49,13 @@ __decorate([
|
|
|
45
49
|
__metadata("design:paramtypes", [Object]),
|
|
46
50
|
__metadata("design:returntype", Promise)
|
|
47
51
|
], WorkflowListMasterController.prototype, "getStagesByGroup", null);
|
|
52
|
+
__decorate([
|
|
53
|
+
(0, common_1.Get)('/getModes'),
|
|
54
|
+
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
55
|
+
__metadata("design:type", Function),
|
|
56
|
+
__metadata("design:paramtypes", []),
|
|
57
|
+
__metadata("design:returntype", Promise)
|
|
58
|
+
], WorkflowListMasterController.prototype, "getModes", null);
|
|
48
59
|
exports.WorkflowListMasterController = WorkflowListMasterController = __decorate([
|
|
49
60
|
(0, common_1.Controller)('/workflow-list'),
|
|
50
61
|
__metadata("design:paramtypes", [workflow_list_master_service_1.WorkflowListMasterService])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-list-master.controller.js","sourceRoot":"","sources":["../../../../src/module/workflow/controller/workflow-list-master.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"workflow-list-master.controller.js","sourceRoot":"","sources":["../../../../src/module/workflow/controller/workflow-list-master.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAOwB;AACxB,0FAAoF;AAG7E,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACvC,YAA6B,eAA0C;QAA1C,oBAAe,GAAf,eAAe,CAA2B;IAAG,CAAC;IAIrE,AAAN,KAAK,CAAC,iBAAiB,CAAS,IAA0B;QACxD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,8BAA8B,CACtE,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAIK,AAAN,KAAK,CAAC,gBAAgB,CAAS,IAAgC;QAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CACxD,IAAI,CAAC,cAAc,CACpB,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAIK,AAAN,KAAK,CAAC,QAAQ;QACZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACrD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA3BY,oEAA4B;AAKjC;IAFL,IAAA,aAAI,EAAC,oBAAoB,CAAC;IAC1B,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACC,WAAA,IAAA,aAAI,GAAE,CAAA;;;;qEAK9B;AAIK;IAFL,IAAA,aAAI,EAAC,mBAAmB,CAAC;IACzB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACA,WAAA,IAAA,aAAI,GAAE,CAAA;;;;oEAK7B;AAIK;IAFL,IAAA,YAAG,EAAC,WAAW,CAAC;IAChB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;;;;4DAIvB;uCA1BU,4BAA4B;IADxC,IAAA,mBAAU,EAAC,gBAAgB,CAAC;qCAEmB,wDAAyB;GAD5D,4BAA4B,CA2BxC"}
|
|
@@ -42,6 +42,18 @@ let WorkflowListMasterService = class WorkflowListMasterService extends entity_s
|
|
|
42
42
|
const results = await this.dataSource.query(`SELECT id, full_name FROM cr_wf_stage WHERE stage_group_id = ?`, [stageGroupId]);
|
|
43
43
|
return results;
|
|
44
44
|
}
|
|
45
|
+
async getModes() {
|
|
46
|
+
const modeLists = await this.dataSource.query(`SELECT id FROM cr_list_master WHERE type = 'MOD'`);
|
|
47
|
+
if (modeLists.length === 0)
|
|
48
|
+
return [];
|
|
49
|
+
const listIds = modeLists.map((item) => item.id);
|
|
50
|
+
const modes = await this.dataSource.query(`
|
|
51
|
+
SELECT id, name
|
|
52
|
+
FROM cr_list_master_items
|
|
53
|
+
WHERE list_id IN (${listIds.map(() => '?').join(',')})
|
|
54
|
+
`, listIds);
|
|
55
|
+
return modes;
|
|
56
|
+
}
|
|
45
57
|
};
|
|
46
58
|
exports.WorkflowListMasterService = WorkflowListMasterService;
|
|
47
59
|
exports.WorkflowListMasterService = WorkflowListMasterService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-list-master.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/workflow-list-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,gGAAwF;AACxF,qCAAqC;AAG9B,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,+CAAiB;IAC9D,YAA6B,UAAsB;QACjD,KAAK,EAAE,CAAC;QADmB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAC,OAAe;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACzC;;;;;;;;;;OAUC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;QAGF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,YAAY,EAAE,MAAM;SACrB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,YAAoB;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACzC,gEAAgE,EAChE,CAAC,YAAY,CAAC,CACf,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"workflow-list-master.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/workflow-list-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,gGAAwF;AACxF,qCAAqC;AAG9B,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,+CAAiB;IAC9D,YAA6B,UAAsB;QACjD,KAAK,EAAE,CAAC;QADmB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAC,OAAe;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACzC;;;;;;;;;;OAUC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;QAGF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,YAAY,EAAE,MAAM;SACrB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,YAAoB;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACzC,gEAAgE,EAChE,CAAC,YAAY,CAAC,CACf,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,QAAQ;QAEZ,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC3C,kDAAkD,CACnD,CAAC;QAEF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAGjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACvC;;;wBAGkB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;KACnD,EACC,OAAO,CACR,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AA7DY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,yBAAyB,CA6DrC"}
|