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
4b1246d4
Commit
4b1246d4
authored
Jul 15, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增实体类
parent
310a85fd
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
119 additions
and
92 deletions
+119
-92
Config.cs
Edu.Common/Config.cs
+13
-0
ReceiptTypeEnum.cs
Edu.Common/Enum/Finance/ReceiptTypeEnum.cs
+3
-3
RB_Order_Change.cs
Edu.Model/Entity/EduTask/RB_Order_Change.cs
+5
-2
OrderChangeModule.cs
Edu.Module.EduTask/OrderChangeModule.cs
+1
-1
RB_Education_ReceiptRepository.cs
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
+10
-1
appsettings.json
Edu.WebApi/appsettings.json
+87
-85
No files found.
Edu.Common/Config.cs
View file @
4b1246d4
...
@@ -367,6 +367,7 @@ namespace Edu.Common
...
@@ -367,6 +367,7 @@ namespace Edu.Common
return
ChangeClassFlowId
;
return
ChangeClassFlowId
;
}
}
}
}
/// <summary>
/// <summary>
/// 停课流程编号
/// 停课流程编号
/// </summary>
/// </summary>
...
@@ -379,6 +380,18 @@ namespace Edu.Common
...
@@ -379,6 +380,18 @@ namespace Edu.Common
}
}
}
}
/// <summary>
/// 订单转班流程编号
/// </summary>
public
static
int
OrderTransClassFlowId
{
get
{
int
.
TryParse
(
ReadConfigKey
(
"OrderTransClassFlowId"
),
out
int
OrderTransClassFlowId
);
return
OrderTransClassFlowId
;
}
}
...
...
Edu.Common/Enum/Finance/ReceiptTypeEnum.cs
View file @
4b1246d4
...
@@ -33,9 +33,9 @@ namespace Edu.Common.Enum.Finance
...
@@ -33,9 +33,9 @@ namespace Edu.Common.Enum.Finance
InvitationClass
=
4
,
InvitationClass
=
4
,
/// <summary>
/// <summary>
/// 转班
///
订单
转班
/// </summary>
/// </summary>
[
EnumField
(
"转班"
)]
[
EnumField
(
"
订单
转班"
)]
TransClass
=
5
,
Order
TransClass
=
5
,
}
}
}
}
Edu.Model/Entity/EduTask/RB_Order_Change.cs
View file @
4b1246d4
using
System
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
VT.FW.DB
;
using
VT.FW.DB
;
namespace
Edu.Model.Entity.EduTask
namespace
Edu.Model.Entity.EduTask
...
@@ -37,6 +35,11 @@ namespace Edu.Model.Entity.EduTask
...
@@ -37,6 +35,11 @@ namespace Edu.Model.Entity.EduTask
/// </summary>
/// </summary>
public
int
NewCourseId
{
get
;
set
;
}
public
int
NewCourseId
{
get
;
set
;
}
/// <summary>
/// 生效日期
/// </summary>
public
DateTime
EffectiveDate
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 变更原因
/// 变更原因
/// </summary>
/// </summary>
...
...
Edu.Module.EduTask/OrderChangeModule.cs
View file @
4b1246d4
...
@@ -39,7 +39,7 @@ namespace Edu.Module.EduTask
...
@@ -39,7 +39,7 @@ namespace Edu.Module.EduTask
{
{
Id
=
0
,
Id
=
0
,
Title
=
"转班申请"
,
Title
=
"转班申请"
,
ReceiptType
=
Common
.
Enum
.
Finance
.
ReceiptTypeEnum
.
TransClass
,
ReceiptType
=
Common
.
Enum
.
Finance
.
ReceiptTypeEnum
.
Order
TransClass
,
RelationId
=
newId
,
RelationId
=
newId
,
OrderId
=
model
.
SourceOrderId
,
OrderId
=
model
.
SourceOrderId
,
ClassId
=
model
.
NewClassId
,
ClassId
=
model
.
NewClassId
,
...
...
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @
4b1246d4
...
@@ -172,7 +172,16 @@ WHERE 1=1
...
@@ -172,7 +172,16 @@ WHERE 1=1
flowModel
=
flowRepository
.
GetFlowRepository
(
Common
.
Config
.
StopClassFlowId
);
flowModel
=
flowRepository
.
GetFlowRepository
(
Common
.
Config
.
StopClassFlowId
);
if
(
flowModel
==
null
)
if
(
flowModel
==
null
)
{
{
message
=
"未配置调课流程!"
;
message
=
"未配置停课流程!"
;
return
false
;
}
}
else
if
(
model
.
ReceiptType
==
Common
.
Enum
.
Finance
.
ReceiptTypeEnum
.
OrderTransClass
)
{
flowModel
=
flowRepository
.
GetFlowRepository
(
Common
.
Config
.
OrderTransClassFlowId
);
if
(
flowModel
==
null
)
{
message
=
"未配置订单转班流程!"
;
return
false
;
return
false
;
}
}
}
}
...
...
Edu.WebApi/appsettings.json
View file @
4b1246d4
...
@@ -83,5 +83,7 @@
...
@@ -83,5 +83,7 @@
//调课流程编号
//调课流程编号
"ChangeClassFlowId"
:
2
,
"ChangeClassFlowId"
:
2
,
//停课流程编号
//停课流程编号
"StopClassFlowId"
:
3
"StopClassFlowId"
:
3
,
//订单转班流程编号
"OrderTransClassFlowId"
:
5
}
}
\ No newline at end of file
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