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
41d71833
Commit
41d71833
authored
Jul 23, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
4f1e298a
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
138 additions
and
123 deletions
+138
-123
RB_Education_Receipt.cs
Edu.Model/Entity/EduTask/RB_Education_Receipt.cs
+85
-80
RB_Education_Receipt_ViewModel.cs
...Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs
+5
-0
EducationReceiptModule.cs
Edu.Module.EduTask/EducationReceiptModule.cs
+1
-0
OrderChangeModule.cs
Edu.Module.EduTask/OrderChangeModule.cs
+46
-43
FinanceController.cs
Edu.WebApi/Controllers/Finance/FinanceController.cs
+1
-0
No files found.
Edu.Model/Entity/EduTask/RB_Education_Receipt.cs
View file @
41d71833
...
@@ -90,5 +90,10 @@ namespace Edu.Model.Entity.EduTask
...
@@ -90,5 +90,10 @@ namespace Edu.Model.Entity.EduTask
/// 生效时间
/// 生效时间
/// </summary>
/// </summary>
public
DateTime
?
EffectiveDate
{
get
;
set
;
}
public
DateTime
?
EffectiveDate
{
get
;
set
;
}
/// <summary>
/// 附件
/// </summary>
public
string
ReceiptFile
{
get
;
set
;
}
}
}
}
}
Edu.Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs
View file @
41d71833
...
@@ -39,5 +39,10 @@ namespace Edu.Model.ViewModel.EduTask
...
@@ -39,5 +39,10 @@ namespace Edu.Model.ViewModel.EduTask
/// 课程名称
/// 课程名称
/// </summary>
/// </summary>
public
string
CourseName
{
get
;
set
;
}
public
string
CourseName
{
get
;
set
;
}
/// <summary>
/// 附件list
/// </summary>
public
List
<
string
>
ReceiptFileList
{
get
;
set
;
}
}
}
}
}
Edu.Module.EduTask/EducationReceiptModule.cs
View file @
41d71833
...
@@ -458,6 +458,7 @@ namespace Edu.Module.EduTask
...
@@ -458,6 +458,7 @@ namespace Edu.Module.EduTask
AuditObj
,
AuditObj
,
item
.
VerifyStatus
,
item
.
VerifyStatus
,
AuditStatusName
=
item
.
VerifyStatus
==
Common
.
Enum
.
EduTask
.
EduTaskRrocessStatus
.
NotAudit
?
"待审"
:
item
.
VerifyStatus
.
ToName
(),
AuditStatusName
=
item
.
VerifyStatus
==
Common
.
Enum
.
EduTask
.
EduTaskRrocessStatus
.
NotAudit
?
"待审"
:
item
.
VerifyStatus
.
ToName
(),
ReceiptFileList
=
string
.
IsNullOrWhiteSpace
(
item
.
ReceiptFile
)?
new
List
<
string
>()
:
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
List
<
string
>>(
item
.
ReceiptFile
)
};
};
result
.
Add
(
obj
);
result
.
Add
(
obj
);
}
}
...
...
Edu.Module.EduTask/OrderChangeModule.cs
View file @
41d71833
This diff is collapsed.
Click to expand it.
Edu.WebApi/Controllers/Finance/FinanceController.cs
View file @
41d71833
...
@@ -1037,6 +1037,7 @@ namespace Edu.WebApi.Controllers.Finance
...
@@ -1037,6 +1037,7 @@ namespace Edu.WebApi.Controllers.Finance
x
.
ClassName
,
x
.
ClassName
,
x
.
ClassNo
,
x
.
ClassNo
,
x
.
StudentName
,
x
.
StudentName
,
x
.
GuestId
,
x
.
CreateByName
,
x
.
CreateByName
,
x
.
CreateByPhoto
,
x
.
CreateByPhoto
,
x
.
TotalCourseFee
,
x
.
TotalCourseFee
,
...
...
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