Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
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
黄奎
Education
Commits
df3d9857
Commit
df3d9857
authored
Jul 09, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
9f882e8c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
RB_Education_Receipt_ViewModel.cs
...Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs
+4
-1
EducationReceiptModule.cs
Edu.Module.EduTask/EducationReceiptModule.cs
+2
-0
RB_Education_ReceiptRepository.cs
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
+7
-2
No files found.
Edu.Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs
View file @
df3d9857
...
...
@@ -10,6 +10,9 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary>
public
class
RB_Education_Receipt_ViewModel
:
RB_Education_Receipt
{
/// <summary>
/// 是否特殊节点
/// </summary>
public
int
SpecialNode
{
get
;
set
;
}
}
}
Edu.Module.EduTask/EducationReceiptModule.cs
View file @
df3d9857
...
...
@@ -106,6 +106,8 @@ namespace Edu.Module.EduTask
item
.
Title
,
item
.
ReceiptType
,
DataObj
,
item
.
SpecialNode
,
item
.
RelationId
,
ReceiptTypeName
=
item
.
ReceiptType
.
ToName
(),
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
item
.
CreateBy
)?.
AccountName
,
CreateTime
=
Common
.
ConvertHelper
.
FormatTime
(
item
.
CreateTime
),
...
...
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @
df3d9857
...
...
@@ -59,12 +59,17 @@ namespace Edu.Repository.EduTask
public
List
<
RB_Education_Receipt_ViewModel
>
GetEducationReceiptPageRepository
(
int
pageIndex
,
int
pageSize
,
out
long
rowsCount
,
EducationReceiptQuery
query
)
{
var
parameters
=
new
DynamicParameters
();
string
isSpecNode
=
""
;
if
(
query
.
Conditon
==
Common
.
Enum
.
Course
.
EduReceiptConditionEnum
.
WaitAgree
)
{
isSpecNode
=
string
.
Format
(
",IFNULL((SELECT SpecialNode FROM rb_Education_relevance WHERE Id IN(SELECT BackrelevanceId FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus=1 AND AuditEmId={0})),0) AS SpecialNode "
,
query
.
CreateBy
);
}
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT A.*
SELECT A.*
{0}
FROM RB_Education_Receipt AS A
WHERE 1=1
"
);
"
,
isSpecNode
);
if
(
query
!=
null
)
{
if
(
query
.
Group_Id
>
0
)
...
...
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