Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
5
51business
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
方斌
51business
Commits
bf5b168b
Commit
bf5b168b
authored
Jun 10, 2020
by
任国军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add relation
parent
79b5cdbf
Pipeline
#24806
passed with stage
in 4 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
courseV5ClassRelation.js
app/model/class/v5/courseV5ClassRelation.js
+4
-4
institution.js
app/service/course/v5/institution.js
+8
-0
No files found.
app/model/class/v5/courseV5Class
ToScore
.js
→
app/model/class/v5/courseV5Class
Relation
.js
View file @
bf5b168b
...
@@ -6,14 +6,14 @@ const moment = require('moment');
...
@@ -6,14 +6,14 @@ const moment = require('moment');
module
.
exports
=
app
=>
{
module
.
exports
=
app
=>
{
const
{
INTEGER
,
DATE
}
=
app
.
Sequelize
;
const
{
INTEGER
,
DATE
}
=
app
.
Sequelize
;
const
CourseV5Class
ToScore
=
app
.
classModel
.
define
(
'course_v5_class_to_score
'
,
{
const
CourseV5Class
Relation
=
app
.
classModel
.
define
(
'course_v5_class_relation
'
,
{
id
:
{
id
:
{
type
:
INTEGER
,
type
:
INTEGER
,
primaryKey
:
true
,
primaryKey
:
true
,
autoIncrement
:
true
,
autoIncrement
:
true
,
},
},
class_id
:
INTEGER
,
class_id
:
INTEGER
,
score
_id
:
INTEGER
,
relation
_id
:
INTEGER
,
status
:
INTEGER
,
status
:
INTEGER
,
is_deleted
:
INTEGER
,
is_deleted
:
INTEGER
,
created_time
:
{
created_time
:
{
...
@@ -34,9 +34,9 @@ module.exports = app => {
...
@@ -34,9 +34,9 @@ module.exports = app => {
},
},
},
{
},
{
timestamps
:
false
,
timestamps
:
false
,
tableName
:
'course_v5_class_
to_score
'
,
tableName
:
'course_v5_class_
relation
'
,
});
});
return
CourseV5Class
ToScore
;
return
CourseV5Class
Relation
;
};
};
app/service/course/v5/institution.js
View file @
bf5b168b
...
@@ -147,6 +147,13 @@ class InstitutionSubService extends Service {
...
@@ -147,6 +147,13 @@ class InstitutionSubService extends Service {
const
frequencyList
=
await
ctx
.
classModel
.
V5
.
CourseV5ClassToFrequency
.
findAll
({
where
:
{
class_id
:
id
,
status
:
1
,
is_deleted
:
0
},
attributes
:
[
'frequency_id'
]
});
const
frequencyList
=
await
ctx
.
classModel
.
V5
.
CourseV5ClassToFrequency
.
findAll
({
where
:
{
class_id
:
id
,
status
:
1
,
is_deleted
:
0
},
attributes
:
[
'frequency_id'
]
});
const
frequency
=
await
ctx
.
classModel
.
V5
.
CourseV5Frequency
.
findAll
({
where
:
{
id
:
{
$in
:
R
.
pluck
(
'frequency_id'
,
frequencyList
)
}
},
attributes
:
[
'id'
,
'name'
]
});
const
frequency
=
await
ctx
.
classModel
.
V5
.
CourseV5Frequency
.
findAll
({
where
:
{
id
:
{
$in
:
R
.
pluck
(
'frequency_id'
,
frequencyList
)
}
},
attributes
:
[
'id'
,
'name'
]
});
// 关联课程
const
relationList
=
await
ctx
.
classModel
.
V5
.
CourseV5ClassRelation
.
findAll
({
where
:
{
class_id
:
id
,
status
:
1
,
is_deleted
:
0
},
attributes
:
[
'relation_id'
]
});
const
relation
=
await
ctx
.
classModel
.
V5
.
CourseV5Class
.
findAll
({
where
:
{
id
:
{
$in
:
R
.
pluck
(
'relation_id'
,
relationList
)
}
},
attributes
:
[
'id'
,
'name'
,
'price'
,
'mode'
],
raw
:
true
});
for
(
const
i
in
relation
)
{
relation
[
i
].
mode
=
await
this
.
getClassMode
(
relation
[
i
].
mode
);
}
const
columns
=
[];
const
columns
=
[];
for
(
const
v
of
classColumns
)
{
for
(
const
v
of
classColumns
)
{
if
(
!
ctx
.
isEmpty
(
columnList
[
v
.
column_id
]))
{
if
(
!
ctx
.
isEmpty
(
columnList
[
v
.
column_id
]))
{
...
@@ -186,6 +193,7 @@ class InstitutionSubService extends Service {
...
@@ -186,6 +193,7 @@ class InstitutionSubService extends Service {
classInfo
.
pay_count
+=
orderCount
;
classInfo
.
pay_count
+=
orderCount
;
classInfo
.
video_count
=
videoCount
;
classInfo
.
video_count
=
videoCount
;
classInfo
.
frequency
=
frequency
;
classInfo
.
frequency
=
frequency
;
classInfo
.
relation
=
relation
;
return
classInfo
;
return
classInfo
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment