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
d9d7956a
Commit
d9d7956a
authored
Apr 19, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
837431ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
12 deletions
+34
-12
RB_Education_Contract_ViewModel.cs
...Model/ViewModel/Course/RB_Education_Contract_ViewModel.cs
+20
-0
EducationContractController.cs
Edu.WebApi/Controllers/Course/EducationContractController.cs
+14
-12
No files found.
Edu.Model/ViewModel/Course/RB_Education_Contract_ViewModel.cs
View file @
d9d7956a
...
...
@@ -48,5 +48,25 @@ namespace Edu.Model.ViewModel.Course
return
str
;
}
}
/// <summary>
/// 学员生日字符串
/// </summary>
public
string
StuBirthStr
{
get
{
return
Common
.
ConvertHelper
.
FormatDate
(
this
.
StuBirth
);
}
}
/// <summary>
/// 第一期-支付日期字符串
/// </summary>
public
string
FirstPayDateStr
{
get
{
return
Common
.
ConvertHelper
.
FormatDate
(
this
.
FirstPayDate
);
}
}
/// <summary>
/// 第二期-支付日期字符串
/// </summary>
public
string
SecondPayDateStr
{
get
{
return
Common
.
ConvertHelper
.
FormatDate
(
this
.
SecondPayDate
);
}
}
/// <summary>
/// 第三期-支付日期字符串
/// </summary>
public
string
ThirdPayDateStr
{
get
{
return
Common
.
ConvertHelper
.
FormatDate
(
this
.
ThirdPayDate
);
}
}
}
}
Edu.WebApi/Controllers/Course/EducationContractController.cs
View file @
d9d7956a
using
System
;
using
System.Linq
;
using
Edu.Common.API
;
using
Edu.Common.Enum.Course
;
using
Edu.Common.Plugin
;
...
...
@@ -37,7 +37,7 @@ namespace Edu.WebApi.Controllers.Course
{
int
OrderId
=
base
.
ParmJObj
.
GetInt
(
"OrderId"
,
0
);
//订单编号
int
GuestId
=
base
.
ParmJObj
.
GetInt
(
"GuestId"
,
0
);
//学员编号
var
model
=
educationContractModule
.
GetStudentInfoModule
(
OrderId
,
GuestId
);
var
model
=
educationContractModule
.
GetStudentInfoModule
(
OrderId
,
GuestId
);
return
ApiResult
.
Success
(
""
,
model
);
}
...
...
@@ -54,9 +54,9 @@ namespace Edu.WebApi.Controllers.Course
{
OrderId
=
base
.
ParmJObj
.
GetInt
(
"OrderId"
),
ContractNo
=
base
.
ParmJObj
.
GetStringValue
(
"ContractNo"
),
CType
=
(
ContractTypeEnum
)
base
.
ParmJObj
.
GetInt
(
"CType"
),
Status
=
base
.
ParmJObj
.
GetInt
(
"Status"
),
StudentName
=
base
.
ParmJObj
.
GetStringValue
(
"StudentName"
),
CType
=
(
ContractTypeEnum
)
base
.
ParmJObj
.
GetInt
(
"CType"
),
Status
=
base
.
ParmJObj
.
GetInt
(
"Status"
),
StudentName
=
base
.
ParmJObj
.
GetStringValue
(
"StudentName"
),
};
dmodel
.
Group_Id
=
userInfo
.
Group_Id
;
var
list
=
educationContractModule
.
GetEducationContractPageListModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
count
,
dmodel
);
...
...
@@ -65,7 +65,9 @@ namespace Edu.WebApi.Controllers.Course
{
x
.
Id
,
x
.
CType
,
CTypeName
=
x
.
CType
.
ToName
(),
x
.
OrderId
,
x
.
GuestId
,
x
.
ContractNo
,
x
.
StudentName
,
x
.
SchoolName
,
...
...
@@ -157,12 +159,12 @@ namespace Edu.WebApi.Controllers.Course
ThirdBookFee
=
base
.
ParmJObj
.
GetDecimal
(
"ThirdBookFee"
),
ThirdClassFee
=
base
.
ParmJObj
.
GetDecimal
(
"ThirdClassFee"
),
ThirdDiscountMoney
=
base
.
ParmJObj
.
GetDecimal
(
"ThirdDiscountMoney"
),
ThirdMoney
=
base
.
ParmJObj
.
GetDecimal
(
"ThirdMoney"
),
ThirdPayDate
=
base
.
ParmJObj
.
GetDateTime
(
"ThirdPayDate"
),
CNYCaps
=
base
.
ParmJObj
.
GetStringValue
(
"CNYCaps"
),
Money
=
base
.
ParmJObj
.
GetDecimal
(
"Money"
),
Exam
=
base
.
ParmJObj
.
GetStringValue
(
"Exam"
),
IsSupplement
=
base
.
ParmJObj
.
GetInt
(
"IsSupplement"
),
ThirdMoney
=
base
.
ParmJObj
.
GetDecimal
(
"ThirdMoney"
),
ThirdPayDate
=
base
.
ParmJObj
.
GetDateTime
(
"ThirdPayDate"
),
CNYCaps
=
base
.
ParmJObj
.
GetStringValue
(
"CNYCaps"
),
Money
=
base
.
ParmJObj
.
GetDecimal
(
"Money"
),
Exam
=
base
.
ParmJObj
.
GetStringValue
(
"Exam"
),
IsSupplement
=
base
.
ParmJObj
.
GetInt
(
"IsSupplement"
),
};
dmodel
.
Group_Id
=
userInfo
.
Group_Id
;
dmodel
.
CreateBy
=
userInfo
.
Id
;
...
...
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