Skip to content

E
Education
Commit 4b1246d4 authored by 黄奎's avatar 黄奎
Browse files
Options

新增实体类

parent 310a85fd
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 92 deletions
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, OrderTransClass = 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.OrderTransClass,
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
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient", "DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ", "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient", "FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient", "DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ", "LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient" "LogConnectionPName": "MySql.Data.MySqlClient"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"SettlementRate": "0.60", "SettlementRate": "0.60",
"SellCommissionFFBL": "0.15", "SellCommissionFFBL": "0.15",
"JwtSecretKey": "@VIITTOREBORN*2018", "JwtSecretKey": "@VIITTOREBORN*2018",
"MallJwtSecretKey": "@VIITTOREBORN*2018123", "MallJwtSecretKey": "@VIITTOREBORN*2018123",
"JwtExpirTime": 86400, "JwtExpirTime": 86400,
"IsSendMsg": 2, "IsSendMsg": 2,
"AllowedHosts": "*", "AllowedHosts": "*",
"OpenValidation": "False", "OpenValidation": "False",
"UploadSiteUrl": "http://192.168.1.36:8120", "UploadSiteUrl": "http://192.168.1.36:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com", "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com", "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"Mongo": "mongodb://47.96.25.130:27017", "Mongo": "mongodb://47.96.25.130:27017",
"MongoDBName": "Edu", "MongoDBName": "Edu",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/", "WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
"FinanceKey": "FinanceMallInsertToERPViitto2020", "FinanceKey": "FinanceMallInsertToERPViitto2020",
"PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn", "PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn",
"IncomeFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut", "IncomeFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut",
"sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址 "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
"sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址 "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
"FinanceDateBase": "reborn_finance", "FinanceDateBase": "reborn_finance",
"EduDateBase": "uat_reborn_edu", "EduDateBase": "uat_reborn_edu",
"JHTenantId": "15", "JHTenantId": "15",
"JHMallBaseId": "5", "JHMallBaseId": "5",
"Notice_BaseKey": "Notice_BaseKey", "Notice_BaseKey": "Notice_BaseKey",
"RabbitMqConfig": { "RabbitMqConfig": {
"HostName": "47.96.25.130", "HostName": "47.96.25.130",
"VirtualHost": "/", "VirtualHost": "/",
"Port": 5672, "Port": 5672,
"UserName": "guest", "UserName": "guest",
"Password": "viitto2019", "Password": "viitto2019",
"QueenName": "vt_sys_message_test" "QueenName": "vt_sys_message_test"
}, },
"RedisSetting": { "RedisSetting": {
"RedisServer": "47.96.23.199", "RedisServer": "47.96.23.199",
"RedisPort": "6379", "RedisPort": "6379",
"RedisPwd": "Viitto2018" "RedisPwd": "Viitto2018"
}, },
"VirtualDirectory": "WebFile", "VirtualDirectory": "WebFile",
//未填写 未打分 下降比例 //未填写 未打分 下降比例
"OKRMatterValue": "30,100,100", "OKRMatterValue": "30,100,100",
//是否是线上环境 //是否是线上环境
"IsOnline": false, "IsOnline": false,
//退课流程编号 //退课流程编号
"BackClassFlowId": 1, "BackClassFlowId": 1,
//分区校长岗位编号 //分区校长岗位编号
"SchoolPostId": 3, "SchoolPostId": 3,
//教务长 //教务长
"JiaoWuZhang": 8, "JiaoWuZhang": 8,
//留学就业部门主管审核编号[王涛] //留学就业部门主管审核编号[王涛]
"StudyAbroadDirectorId": 64, "StudyAbroadDirectorId": 64,
//留学就业部门负责人审核编号[姚顺先] //留学就业部门负责人审核编号[姚顺先]
"StudyAbroadManagerId": 52, "StudyAbroadManagerId": 52,
//合同默认抬头 //合同默认抬头
"ContractDefaultTitle": "JH-DZ-CD-", "ContractDefaultTitle": "JH-DZ-CD-",
//消息推送AppId //消息推送AppId
"PushAppId": "JiaHeJiaoYu", "PushAppId": "JiaHeJiaoYu",
//是否推送消息 //是否推送消息
"IsPushMessage": "1", "IsPushMessage": "1",
//超过下班时间60分钟不能打卡 //超过下班时间60分钟不能打卡
"MoreThanMinutes": 60, "MoreThanMinutes": 60,
//连续缺课课时 //连续缺课课时
"AbsentHours": 12, "AbsentHours": 12,
//值班时间验证日期 //值班时间验证日期
"DutyDate": "2021-06-30", "DutyDate": "2021-06-30",
//调课流程编号 //调课流程编号
"ChangeClassFlowId": 2, "ChangeClassFlowId": 2,
//停课流程编号 //停课流程编号
"StopClassFlowId": 3 "StopClassFlowId": 3,
//订单转班流程编号
"OrderTransClassFlowId": 5
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment