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
4251e0aa
Commit
4251e0aa
authored
Dec 16, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增配置
parent
2d6f88d9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
163 additions
and
26 deletions
+163
-26
Config.cs
Edu.Common/Config.cs
+15
-1
BackClassEnum.cs
Edu.Common/Enum/Course/BackClassEnum.cs
+34
-0
RB_Student_BackClass.cs
Edu.Model/Entity/Course/RB_Student_BackClass.cs
+3
-2
OrderModule2.cs
Edu.Module.Course/OrderModule2.cs
+67
-1
BasicFlowModule.cs
Edu.Module.System/BasicFlowModule.cs
+1
-18
RB_FlowRepository.cs
Edu.Repository/Flow/RB_FlowRepository.cs
+36
-0
OrderController.cs
Edu.WebApi/Controllers/Course/OrderController.cs
+3
-2
LoginController.cs
Edu.WebApi/Controllers/User/LoginController.cs
+1
-1
appsettings.json
Edu.WebApi/appsettings.json
+3
-1
No files found.
Edu.Common/Config.cs
View file @
4251e0aa
...
...
@@ -309,7 +309,9 @@ namespace Edu.Common
}
}
/// <summary>
/// 是否发送短信
/// </summary>
public
static
int
IsSendMsg
{
get
...
...
@@ -333,5 +335,17 @@ namespace Edu.Common
return
fileExportPath
;
}
}
/// <summary>
/// 退课流程编号
/// </summary>
public
static
int
BackClassFlowId
{
get
{
int
.
TryParse
(
ReadConfigKey
(
"BackClassFlowId"
),
out
int
BackClassFlowId
);
return
BackClassFlowId
;
}
}
}
}
\ No newline at end of file
Edu.Common/Enum/Course/BackClassEnum.cs
0 → 100644
View file @
4251e0aa
using
Edu.Common.Plugin
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Edu.Common.Enum.Course
{
/// <summary>
/// 退课状态枚举
/// </summary>
public
enum
BackClassAuditStatusEnum
{
/// <summary>
/// 审核中
/// </summary>
[
EnumField
(
"审核中"
)]
InReview
=
1
,
/// <summary>
/// 通过
/// </summary>
[
EnumField
(
"通过"
)]
Pass
=
2
,
/// <summary>
/// 驳回
/// </summary>
[
EnumField
(
"驳回"
)]
Rejected
=
3
,
/// <summary>
/// 作废
/// </summary>
[
EnumField
(
"作废"
)]
Delete
=
4
,
}
}
\ No newline at end of file
Edu.Model/Entity/Course/RB_Student_BackClass.cs
View file @
4251e0aa
using
System
;
using
Edu.Common.Enum.Course
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
VT.FW.DB
;
...
...
@@ -75,7 +76,7 @@ namespace Edu.Model.Entity.Course
/// <summary>
/// 审核状态
/// </summary>
public
int
AuditStatus
{
get
;
set
;
}
public
BackClassAuditStatusEnum
AuditStatus
{
get
;
set
;
}
/// <summary>
/// 抄送人(多个逗号分隔)
...
...
Edu.Module.Course/OrderModule2.cs
View file @
4251e0aa
using
System
;
using
Edu.Model.CacheModel
;
using
Edu.Model.ViewModel.Course
;
using
Edu.Repository.Course
;
using
Edu.Repository.Flow
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
...
...
@@ -9,6 +13,68 @@ namespace Edu.Module.Course
/// </summary>
public
partial
class
OrderModule
{
/// <summary>
/// 学员退课单据仓储层对象
/// </summary>
private
readonly
RB_Student_BackClassRepository
student_BackClassRepository
=
new
RB_Student_BackClassRepository
();
/// <summary>
/// 退款单据审核人员信息仓储层对象
/// </summary>
private
readonly
RB_Student_BackRelevanceRepository
student_BackRelevanceRepository
=
new
RB_Student_BackRelevanceRepository
();
/// <summary>
/// 学员退课单据审核记录仓储层对象
/// </summary>
private
readonly
RB_Student_BackRecordRepository
student_BackRecordRepository
=
new
RB_Student_BackRecordRepository
();
/// <summary>
/// 流程仓储层对象
/// </summary>
private
readonly
RB_FlowRepository
flowRepository
=
new
RB_FlowRepository
();
/// <summary>
/// 创建退课流程
/// </summary>
/// <param name="GuestId"></param>
/// <param name="OrderId"></param>
/// <param name="reason"></param>
/// <param name="userinfo"></param>
/// <param name="message"></param>
/// <returns></returns>
public
virtual
bool
CreateBackClassApplyModule
(
int
GuestId
,
int
OrderId
,
string
reason
,
UserInfo
userinfo
,
out
string
message
)
{
bool
flag
=
false
;
message
=
""
;
var
guestModel
=
order_GuestRepository
.
GetEntity
(
GuestId
);
var
orderModel
=
orderRepository
.
GetEntity
(
OrderId
);
if
(
guestModel
==
null
)
{
message
=
"旅客信息不正确!"
;
return
false
;
}
if
(
orderModel
==
null
)
{
message
=
"订单信息不正确!"
;
return
false
;
}
//获取退课流程
var
backClassFlow
=
flowRepository
.
GetFlowRepository
(
Common
.
Config
.
BackClassFlowId
);
if
(
backClassFlow
==
null
)
{
message
=
"未配置退课流程!"
;
return
false
;
}
var
backClassModel
=
new
RB_Student_BackClass_ViewModel
()
{
BackId
=
0
,
//AuditStatus=
};
return
flag
;
}
}
}
Edu.Module.System/BasicFlowModule.cs
View file @
4251e0aa
...
...
@@ -45,7 +45,6 @@ namespace Edu.Module.System
public
List
<
RB_Flow_ViewModel
>
GetFlowPageListModule
(
int
pageIndex
,
int
pageSize
,
out
long
rowsCount
,
RB_Flow_ViewModel
query
)
{
var
list
=
flowRepository
.
GetFlowPageListRepository
(
pageIndex
,
pageSize
,
out
rowsCount
,
query
);
return
list
;
}
...
...
@@ -56,23 +55,7 @@ namespace Edu.Module.System
/// <returns></returns>
public
RB_Flow_ViewModel
GetFlowModule
(
object
FlowId
)
{
var
extModel
=
flowRepository
.
GetEntity
<
RB_Flow_ViewModel
>(
FlowId
);
if
(
extModel
!=
null
)
{
if
(
extModel
.
FlowId
>
0
)
{
var
auditList
=
flow_AduitInfoRepository
.
GetFlowAduitInfoListRepository
(
new
RB_Flow_AduitInfo_ViewModel
()
{
FlowId
=
extModel
.
FlowId
});
extModel
.
FlowNodeList
=
flow_NodeRepository
.
GetFlowNodeListRepository
(
new
RB_Flow_Node_ViewModel
()
{
FlowId
=
extModel
.
FlowId
});
if
(
extModel
.
FlowNodeList
!=
null
&&
extModel
.
FlowNodeList
.
Count
>
0
)
{
foreach
(
var
item
in
extModel
.
FlowNodeList
)
{
item
.
FlowAduitList
=
auditList
?.
Where
(
qitem
=>
qitem
.
NodeId
==
item
.
NodeId
)?.
ToList
();
}
}
}
}
return
extModel
;
return
flowRepository
.
GetFlowRepository
(
FlowId
);
}
...
...
Edu.Repository/Flow/RB_FlowRepository.cs
View file @
4251e0aa
...
...
@@ -13,6 +13,16 @@ namespace Edu.Repository.Flow
/// </summary>
public
class
RB_FlowRepository
:
BaseRepository
<
RB_Flow
>
{
/// <summary>
/// 流程节点仓储层对象
/// </summary>
private
readonly
RB_Flow_NodeRepository
flow_NodeRepository
=
new
RB_Flow_NodeRepository
();
/// <summary>
/// 流程节点审核人
/// </summary>
private
readonly
RB_Flow_AduitInfoRepository
flow_AduitInfoRepository
=
new
RB_Flow_AduitInfoRepository
();
/// <summary>
/// 获取流程设置分页列表
/// </summary>
...
...
@@ -39,5 +49,31 @@ WHERE 1=1
}
return
GetPage
<
RB_Flow_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
()).
ToList
();
}
/// <summary>
/// 获取流程信息
/// </summary>
/// <param name="FlowId"></param>
/// <returns></returns>
public
RB_Flow_ViewModel
GetFlowRepository
(
object
FlowId
)
{
var
extModel
=
base
.
GetEntity
<
RB_Flow_ViewModel
>(
FlowId
);
if
(
extModel
!=
null
)
{
if
(
extModel
.
FlowId
>
0
)
{
var
auditList
=
flow_AduitInfoRepository
.
GetFlowAduitInfoListRepository
(
new
RB_Flow_AduitInfo_ViewModel
()
{
FlowId
=
extModel
.
FlowId
});
extModel
.
FlowNodeList
=
flow_NodeRepository
.
GetFlowNodeListRepository
(
new
RB_Flow_Node_ViewModel
()
{
FlowId
=
extModel
.
FlowId
});
if
(
extModel
.
FlowNodeList
!=
null
&&
extModel
.
FlowNodeList
.
Count
>
0
)
{
foreach
(
var
item
in
extModel
.
FlowNodeList
)
{
item
.
FlowAduitList
=
auditList
?.
Where
(
qitem
=>
qitem
.
NodeId
==
item
.
NodeId
)?.
ToList
();
}
}
}
}
return
extModel
;
}
}
}
Edu.WebApi/Controllers/Course/OrderController.cs
View file @
4251e0aa
...
...
@@ -23,7 +23,7 @@ namespace Edu.WebApi.Controllers.Course
/// <summary>
/// 订单处理类对象
/// </summary>
private
readonly
OrderModule
orderModule
=
new
OrderModule
();
private
readonly
OrderModule
orderModule
=
AOP
.
AOPHelper
.
CreateAOPObject
<
OrderModule
>
();
#
region
产品管理
...
...
@@ -939,7 +939,8 @@ namespace Edu.WebApi.Controllers.Course
var
OrderId
=
base
.
ParmJObj
.
GetInt
(
"OrderId"
);
//申请原因
var
applyReason
=
base
.
ParmJObj
.
GetStringValue
(
"applyReason"
);
return
ApiResult
.
Failed
();
bool
flag
=
orderModule
.
CreateBackClassApplyModule
(
GuestId
,
OrderId
,
applyReason
,
base
.
UserInfo
,
out
string
message
);
return
flag
?
ApiResult
.
Success
(
message
:
message
)
:
ApiResult
.
Failed
(
message
:
message
);
}
#
endregion
}
...
...
Edu.WebApi/Controllers/User/LoginController.cs
View file @
4251e0aa
...
...
@@ -50,7 +50,7 @@ namespace Edu.WebApi.Controllers.User
var
model
=
accountModule
.
GetAccountListExtModule
(
new
RB_Account_ViewModel
()
{
Account
=
account
.
Trim
(),
AccountType
=
(
AccountTypeEnum
)
accountType
//
AccountType = (AccountTypeEnum)accountType
})?.
FirstOrDefault
();
if
(
model
==
null
)
{
...
...
Edu.WebApi/appsettings.json
View file @
4251e0aa
...
...
@@ -40,5 +40,7 @@
},
"VirtualDirectory"
:
"WebFile"
,
//是否是线上环境
"IsOnline"
:
false
"IsOnline"
:
false
,
//退课流程编号
"BackClassFlowId"
:
1
}
\ 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