Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
online-edu-backend
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Redmine
Redmine
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
online-edu
online-edu-backend
Commits
97a6d3cd
Commit
97a6d3cd
authored
Jul 27, 2021
by
liuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug:企业购领取会员查询接口
parent
549a2175
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
MyEnterpriseController.java
...com/qkdata/biz/web/controller/MyEnterpriseController.java
+0
-1
OrgUserReceiveRecordModel.java
...java/com/qkdata/biz/web/vo/OrgUserReceiveRecordModel.java
+2
-0
org_user_receive_recordMapper.xml
...rces/mappers/management/org_user_receive_recordMapper.xml
+11
-2
No files found.
src/main/java/com/qkdata/biz/web/controller/MyEnterpriseController.java
View file @
97a6d3cd
...
@@ -135,7 +135,6 @@ public class MyEnterpriseController {
...
@@ -135,7 +135,6 @@ public class MyEnterpriseController {
@SysLog
(
"企业购中领取会员历史记录列表"
)
@SysLog
(
"企业购中领取会员历史记录列表"
)
public
PageResult
<
OrgUserReceiveRecordModel
>
orgReceiveVIPHistory
(
@RequestBody
QueryReceiveHistoryModel
model
){
public
PageResult
<
OrgUserReceiveRecordModel
>
orgReceiveVIPHistory
(
@RequestBody
QueryReceiveHistoryModel
model
){
model
.
setUserId
(
null
);
model
.
setUserId
(
null
);
model
.
setOrgId
(
userService
.
getUserEnterpriesId
(
UserContext
.
getUserId
()));
return
orgUserReceiveRecordService
.
queryPageList
(
model
);
return
orgUserReceiveRecordService
.
queryPageList
(
model
);
}
}
...
...
src/main/java/com/qkdata/biz/web/vo/OrgUserReceiveRecordModel.java
View file @
97a6d3cd
...
@@ -11,4 +11,6 @@ public class OrgUserReceiveRecordModel {
...
@@ -11,4 +11,6 @@ public class OrgUserReceiveRecordModel {
private
Integer
count
;
private
Integer
count
;
private
String
courseName
;
private
String
courseName
;
private
LocalDateTime
createTime
;
private
LocalDateTime
createTime
;
private
Long
userId
;
private
String
name
;
}
}
src/main/resources/mappers/management/org_user_receive_recordMapper.xml
View file @
97a6d3cd
...
@@ -6,10 +6,19 @@
...
@@ -6,10 +6,19 @@
SELECT r.product_type,
SELECT r.product_type,
r.count,
r.count,
r.create_time,
r.create_time,
c.`name` course_name
c.`name` course_name,
r.user_id,
ue.`name`
FROM org_user_receive_record r
FROM org_user_receive_record r
LEFT JOIN course c on r.course_id = c.id
LEFT JOIN course c on r.course_id = c.id
WHERE r.user_id = #{p.userId}
INNER JOIN user_ext ue on ue.user_id = r.user_id
WHERE 1 = 1
<if
test=
"p.userId != null"
>
and r.user_id = #{p.userId}
</if>
<if
test=
"p.orgId != null"
>
and r.org_id = #{p.orgId}
</if>
<if
test=
"p.productType != null"
>
<if
test=
"p.productType != null"
>
AND r.product_type = #{p.productType}
AND r.product_type = #{p.productType}
</if>
</if>
...
...
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