Skip to content

E
Education
Commit 011ccabe authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 85fe9691
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 70 deletions
Edu.Repository/Sell/RB_Teaching_BonusDetailRepository.cs
View file @ 011ccabe
......@@ -160,8 +160,10 @@ where {where} order by bd.Date asc";
where += $@" and b.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
}
string sql = $@" select b.*,t.TeacherName,case when b.CouseClassify =3 then '预约课' else case when b.CouseClassify =1 then c.ClassName else tr.LessonName end end as ClassName,
c.ClassNo,s.SName from RB_Teaching_BonusDetail b
string sql = $@"
select b.*,t.TeacherName,case when b.CouseClassify =3 then '预约课' else case when b.CouseClassify =1 then c.ClassName else tr.LessonName end end as ClassName
,c.ClassNo,s.SName
from RB_Teaching_BonusDetail b
left join rb_teacher t on b.TeacherId = t.TId
left join rb_class c on b.ClassId = c.ClassId and b.CouseClassify =1
left join rb_school s on b.School_Id = s.SId
......
Edu.WebApi/Controllers/QYWeChat/QYWeChatController.cs
View file @ 011ccabe
......@@ -42,7 +42,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWeChatConfigInfo() {
public ApiResult GetWeChatConfigInfo()
{
var userInfo = base.UserInfo;
var model = weChatModule.GetWeChatConfigModel(new RB_WeChat_Config_ViewModel() { Group_Id = userInfo.Group_Id });
......@@ -72,7 +73,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetWeChatConfig() {
public ApiResult SetWeChatConfig()
{
var userInfo = base.UserInfo;
RB_WeChat_Config_ViewModel demdoel = JsonHelper.DeserializeObject<RB_WeChat_Config_ViewModel>(RequestParm.Msg.ToString());
......@@ -89,7 +91,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -104,7 +107,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetSyncEduDepartment() {
public ApiResult SetSyncEduDepartment()
{
var userInfo = base.UserInfo;
string msg = weChatModule.SetSyncEduDepartment(userInfo);
......@@ -127,7 +131,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetSynvEduEmployee() {
public ApiResult SetSynvEduEmployee()
{
var userInfo = base.UserInfo;
string msg = weChatModule.SetSynvEduEmployee(userInfo);
......@@ -150,20 +155,24 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetUserCoustomerTransfer() {
public ApiResult SetUserCoustomerTransfer()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int TransferUserId = parms.GetInt("TransferUserId", 0);//转交人
int ReceiveUserId = parms.GetInt("ReceiveUserId", 0);//接收人
int CustomerTransfer = parms.GetInt("CustomerTransfer", 0);//是否客户转移
int ChannelTransfer = parms.GetInt("ChannelTransfer", 0);//是否转移渠道码用户配置
if (TransferUserId <= 0) {
if (TransferUserId <= 0)
{
return ApiResult.ParamIsNull("请传递转交人");
}
if (ReceiveUserId <= 0) {
if (ReceiveUserId <= 0)
{
return ApiResult.ParamIsNull("请传递接收人");
}
if (CustomerTransfer != 1 && ChannelTransfer != 1) {
if (CustomerTransfer != 1 && ChannelTransfer != 1)
{
return ApiResult.ParamIsNull("请选择需要转移的对象");
}
......@@ -183,7 +192,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetLeaveUserClientList() {
public ApiResult GetLeaveUserClientList()
{
var userInfo = base.UserInfo;
var RList = weChatModule.GetLeaveUserClientList(userInfo);
......@@ -194,7 +204,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// 离职用户 客户转移
/// </summary>
/// <returns></returns>
public ApiResult SetLeaveUserCustomerTransfer() {
public ApiResult SetLeaveUserCustomerTransfer()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int TransferUserId = parms.GetInt("TransferUserId", 0);//转交人
......@@ -232,7 +243,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWeChatMediumGroupPageList() {
public ApiResult GetWeChatMediumGroupPageList()
{
var userInfo = base.UserInfo;
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
var demodel = JsonHelper.DeserializeObject<RB_WeChat_MediumGroup_ViewModel>(base.RequestParm.Msg.ToString());
......@@ -277,10 +289,12 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetWeChatMediumGroup() {
public ApiResult SetWeChatMediumGroup()
{
var userInfo = base.UserInfo;
var demodel = JsonHelper.DeserializeObject<RB_WeChat_MediumGroup_ViewModel>(base.RequestParm.Msg.ToString());
if (string.IsNullOrEmpty(demodel.Name)) {
if (string.IsNullOrEmpty(demodel.Name))
{
return ApiResult.ParamIsNull("请传递分组名称");
}
......@@ -295,7 +309,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -305,11 +320,13 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelWeChatMediumGroup() {
public ApiResult DelWeChatMediumGroup()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int MediumId = parms.GetInt("MediumId", 0);
if (MediumId <= 0) {
if (MediumId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -318,7 +335,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -328,7 +346,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWeChatMediumPageList() {
public ApiResult GetWeChatMediumPageList()
{
var userInfo = base.UserInfo;
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
var demodel = JsonHelper.DeserializeObject<RB_WeChat_Medium_ViewModel>(base.RequestParm.Msg.ToString());
......@@ -364,14 +383,16 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetWeChatMediumInfo() {
public ApiResult SetWeChatMediumInfo()
{
var userInfo = base.UserInfo;
var demodel = JsonHelper.DeserializeObject<RB_WeChat_Medium_ViewModel>(base.RequestParm.Msg.ToString());
if (demodel.MediaGroupId < 0)
{
return ApiResult.ParamIsNull("请传递分组id");
}
switch (demodel.Type) {
switch (demodel.Type)
{
case Common.Enum.WeChat.MediumTypeEnum.Text:
if (demodel.TextModel == null) { return ApiResult.ParamIsNull("请传递文本信息"); }
demodel.Content = JsonHelper.Serialize(demodel.TextModel);
......@@ -402,8 +423,10 @@ namespace Edu.WebApi.Controllers.QYWeChat
break;
}
if (demodel.Id > 0) {
if (demodel.Type != Common.Enum.WeChat.MediumTypeEnum.Text && demodel.Type != Common.Enum.WeChat.MediumTypeEnum.ImgText && demodel.Type != Common.Enum.WeChat.MediumTypeEnum.Applet) {
if (demodel.Id > 0)
{
if (demodel.Type != Common.Enum.WeChat.MediumTypeEnum.Text && demodel.Type != Common.Enum.WeChat.MediumTypeEnum.ImgText && demodel.Type != Common.Enum.WeChat.MediumTypeEnum.Applet)
{
return ApiResult.Failed("无法修改");
}
}
......@@ -430,7 +453,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetWecharMediumMore() {
public ApiResult SetWecharMediumMore()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
string MediumIds = parms.GetStringValue("MediumIds");//素材ids
......@@ -547,7 +571,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWeChatWelcomesInfo() {
public ApiResult GetWeChatWelcomesInfo()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int WelcomeId = parms.GetInt("WelcomeId", 0);
......@@ -592,7 +617,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
if (demodel.Type > 1)
{
if (string.IsNullOrEmpty(demodel.MediumIds)) {
if (string.IsNullOrEmpty(demodel.MediumIds))
{
return ApiResult.ParamIsNull("请传递素材Id");
}
}
......@@ -660,7 +686,7 @@ namespace Edu.WebApi.Controllers.QYWeChat
var result = weChatModule.GetLabelListByIds(ids);
return ApiResult.Success(message: "OK", data: result);
}
else
else
{
return ApiResult.Failed("参数信息错误");
}
......@@ -671,7 +697,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWeChatLableList() {
public ApiResult GetWeChatLableList()
{
var userInfo = base.UserInfo;
var demodel = JsonHelper.DeserializeObject<RB_WeChat_Lable_ViewModel>(base.RequestParm.Msg.ToString());
demodel.Group_Id = userInfo.Group_Id;
......@@ -700,19 +727,24 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetWeChatLable() {
public ApiResult SetWeChatLable()
{
var userInfo = base.UserInfo;
var demodel = JsonHelper.DeserializeObject<RB_WeChat_Lable_ViewModel>(base.RequestParm.Msg.ToString());
if (string.IsNullOrEmpty(demodel.Name))
{
return ApiResult.ParamIsNull("请输入分组/标签名称");
}
if (demodel.Id == 0 && demodel.ParentId == 0) {
if (demodel.ChildList == null || !demodel.ChildList.Any()) {
if (demodel.Id == 0 && demodel.ParentId == 0)
{
if (demodel.ChildList == null || !demodel.ChildList.Any())
{
return ApiResult.ParamIsNull("新增分组必须至少添加一个标签");
}
foreach (var item in demodel.ChildList) {
if (string.IsNullOrEmpty(item.Name)) {
foreach (var item in demodel.ChildList)
{
if (string.IsNullOrEmpty(item.Name))
{
return ApiResult.ParamIsNull("请输入标签名称");
}
}
......@@ -740,11 +772,13 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelWeChatLable() {
public ApiResult DelWeChatLable()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int LableId = parms.GetInt("LableId", 0);
if (LableId <= 0) {
if (LableId <= 0)
{
return ApiResult.ParamIsNull("请传递标签Id");
}
......@@ -753,7 +787,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -763,7 +798,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetSyncWeChatLable() {
public ApiResult SetSyncWeChatLable()
{
var userInfo = base.UserInfo;
string msg = weChatModule.SetSyncWeChatLable(userInfo);
......@@ -771,7 +807,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -923,11 +960,13 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWeChatChannelInfo() {
public ApiResult GetWeChatChannelInfo()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int ChannelId = parms.GetInt("ChannelId", 0);
if (ChannelId <= 0) {
if (ChannelId <= 0)
{
return ApiResult.ParamIsNull("请传递活码Id");
}
......@@ -1178,39 +1217,50 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetWeChatChannelInfo() {
public ApiResult SetWeChatChannelInfo()
{
var userInfo = base.UserInfo;
RB_WeChat_Channel_ViewModel demodel = JsonHelper.DeserializeObject<RB_WeChat_Channel_ViewModel>(base.RequestParm.Msg.ToString());
if (demodel.ChannelGroupId <= 0) {
if (demodel.ChannelGroupId <= 0)
{
return ApiResult.ParamIsNull("请传递分组Id");
}
if (string.IsNullOrEmpty(demodel.Name)) {
if (string.IsNullOrEmpty(demodel.Name))
{
return ApiResult.ParamIsNull("请输入渠道码的名称");
}
if (demodel.SkipVerify <= 0) {
if (demodel.SkipVerify <= 0)
{
return ApiResult.ParamIsNull("请选择自动添加好友类型");
}
demodel.LableIds = "";
if (demodel.LabelIdList != null && demodel.LabelIdList.Any()) {
if (demodel.LabelIdList != null && demodel.LabelIdList.Any())
{
demodel.LableIds = string.Join(",", demodel.LabelIdList);
}
if (demodel.Type <= 0) {
if (demodel.Type <= 0)
{
return ApiResult.ParamIsNull("请选择渠道码类型");
}
if (demodel.WeekList == null || !demodel.WeekList.Any()) {
if (demodel.WeekList == null || !demodel.WeekList.Any())
{
return ApiResult.ParamIsNull("请传递周期数据");
}
foreach (var item in demodel.WeekList) {
if ((item.EmpList == null || !item.EmpList.Any()) && (item.DeptList == null || !item.DeptList.Any())) {
foreach (var item in demodel.WeekList)
{
if ((item.EmpList == null || !item.EmpList.Any()) && (item.DeptList == null || !item.DeptList.Any()))
{
return ApiResult.Failed("周期数据传递有误");
}
}
for (int i = 0; i < 7; i++) {
for (int i = 0; i < 7; i++)
{
var nlist = demodel.WeekList.Where(x => x.Week == i).ToList();
if (!nlist.Any()) { return ApiResult.ParamIsNull("周期成员设置有误，亲核实后再试"); }
if (!nlist.Where(x => x.IsDefault == 1).Any()) { return ApiResult.ParamIsNull("周期成员默认数据不存在，请核实后再试"); }
}
if (demodel.SpecialDateEnable == 1) {
if (demodel.SpecialDateEnable == 1)
{
//启用特殊日期
if (demodel.SpecialWeekList == null || !demodel.SpecialWeekList.Any())
{
......@@ -1224,17 +1274,22 @@ namespace Edu.WebApi.Controllers.QYWeChat
}
}
}
if (demodel.EmpAddLimit == 1) {
if (demodel.LimitList == null || !demodel.LimitList.Any()) {
if (demodel.EmpAddLimit == 1)
{
if (demodel.LimitList == null || !demodel.LimitList.Any())
{
return ApiResult.ParamIsNull("请传递人员添加上限数据");
}
if (string.IsNullOrEmpty(demodel.EmpBackUp)) {
if (string.IsNullOrEmpty(demodel.EmpBackUp))
{
return ApiResult.ParamIsNull("请选择备用人员");
}
}
if (demodel.WelcomeEnable == 1) {
if (demodel.WelcomeList == null || !demodel.WelcomeList.Any()) {
if (demodel.WelcomeEnable == 1)
{
if (demodel.WelcomeList == null || !demodel.WelcomeList.Any())
{
return ApiResult.ParamIsNull("请传递通用欢迎语");
}
}
......@@ -1275,7 +1330,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult UpdateWeChatChannelGroup() {
public ApiResult UpdateWeChatChannelGroup()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int ChannelId = parms.GetInt("ChannelId", 0);
......@@ -1301,7 +1357,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWeChatChannelCoustomerPageList() {
public ApiResult GetWeChatChannelCoustomerPageList()
{
var userInfo = base.UserInfo;
ResultPageModel pageModel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
RB_WeChat_ChannelRecord_ViewModel demodel = JsonHelper.DeserializeObject<RB_WeChat_ChannelRecord_ViewModel>(base.RequestParm.Msg.ToString());
......@@ -1365,11 +1422,14 @@ namespace Edu.WebApi.Controllers.QYWeChat
return ApiResult.ParamIsNull();
}
if (Type == 1) {
if (string.IsNullOrEmpty(StartTime)) {
if (Type == 1)
{
if (string.IsNullOrEmpty(StartTime))
{
return ApiResult.ParamIsNull("请传递开始时间");
}
if (string.IsNullOrEmpty(EndTime)) {
if (string.IsNullOrEmpty(EndTime))
{
return ApiResult.ParamIsNull("请传递结束时间");
}
}
......@@ -1383,7 +1443,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWeChatChannelStatisticsPageList() {
public ApiResult GetWeChatChannelStatisticsPageList()
{
var userInfo = base.UserInfo;
ResultPageModel pageModel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
......@@ -1494,22 +1555,23 @@ namespace Edu.WebApi.Controllers.QYWeChat
{
var parm = JObject.FromObject(RequestParm.Msg);
var referer = Request.Headers["Origin"].ToString().Replace("http://", "");
if (!string.IsNullOrEmpty(parm.GetStringValue("platment")))
if (!string.IsNullOrEmpty(parm.GetStringValue("platment")))
{
referer = parm.GetStringValue("platment") == "class_room_manager" ? "edu.oytour.com" : string.Empty;
}
Common.Plugin.LogHelper.WriteInfo("SetUserCodeCallBack::referer __" + referer);
Common.Plugin.LogHelper.WriteInfo("SetUserCodeCallBack::parm __" + JsonHelper.Serialize(parm));
if (!string.IsNullOrEmpty(referer))
{
var group = groupModule.GetGroupEntityModule(referer);
if (group.GId != 0)
{
var appcode = parm.GetStringValue("appcode");
var code = parm.GetStringValue("code");
var config = Cache.WeChat.WeChatReidsCache.GetAppConfig(group.GId, appcode);
var token = QYWeiXinHelper.GetToken(config?.CropId ?? "", config?.Secret ?? "", false);
var userInfo = new QYWeiXinHelper().GetLoginWorkUserInfo(group.GId, code, appcode, token);
Common.Plugin.LogHelper.WriteInfo("SetUserCodeCallBack::userInfo __" + JsonHelper.Serialize(userInfo));
if (userInfo.status)
{
return ApiResult.Success(data: userInfo.result);
......@@ -1547,13 +1609,10 @@ namespace Edu.WebApi.Controllers.QYWeChat
if (group.GId != 0)
{
var query = JObject.Parse(RequestParm.Msg.ToString());
Common.Plugin.LogHelper.WriteInfo("query::" + Common.Plugin.JsonHelper.Serialize(query));
var mark = query.GetStringValue("mark");
var config = Cache.WeChat.WeChatReidsCache.GetAppConfig(group.GId, mark);
Common.Plugin.LogHelper.WriteInfo("config::" + Common.Plugin.JsonHelper.Serialize(config));
var token = QYWeiXinHelper.GetToken(config?.CropId ?? "", config?.Secret ?? "", false);
Common.Plugin.LogHelper.WriteInfo("token::" + token);
var path = new QYWeiXinHelper().GetUserAuthorizationCodePath(mark, config?.CropId ?? "", config?.AppId ?? "", token);
Common.Plugin.LogHelper.WriteInfo("path::" + path);
if (!string.IsNullOrEmpty(path))
......
Edu.WebApi/Controllers/User/LoginController.cs
View file @ 011ccabe
......@@ -112,6 +112,7 @@ namespace Edu.WebApi.Controllers.User
int autoLoginId = jobj.GetInt("AutoLoginId",0);
var workId = jobj.GetStringValue("AutoLoginWorkId");
var openId = jobj.GetStringValue("AutoLoginOpenId");
Common.Plugin.LogHelper.WriteInfo("Login::Query __" + Common.Plugin.JsonHelper.Serialize(jobj));
//新增自动登录功能，用于通过推送消息自动登录
RB_Account_ViewModel model = null;
if (autoLoginId == 0 && (string.IsNullOrEmpty(workId) && string.IsNullOrEmpty(openId)))
......
Edu.WebApi/appsettings.json
View file @ 011ccabe
......@@ -30,6 +30,7 @@
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"ErpUrl": "http://localhost:8181/#",
"WorkAPPDomain": "http://m.kookaku.com/pages",
"Mongo": "mongodb://47.96.23.199:27017",
"MongoDBName": "Edu",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
......
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