diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml
index f78d6348d..38864e88f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml
@@ -20,9 +20,9 @@
@**@
+ 通知书号*
+
+ *@
+
- *@
+
-
家庭情况
- - 父亲姓名 : {{studentInfo.FatherName}}
- - 父亲电话 : {{studentInfo.FatherPhone}}
- - 母亲姓名 : {{studentInfo.MatherName}}
- - 母亲电话 : {{studentInfo.MatherPhone}}
- - 港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}
- - 健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}
+ - 监护人姓名 : {{studentInfo.Guardian}}
+ - 监护人联系电话 : {{studentInfo.GuardianPhone}}
+ - 与监护人关系 : {{studentInfo.GuardianType |guardiantype}}
- 邮政编码 : {{studentInfo.PostalCode}}
- 家庭地址 : {{studentInfo.MailAddress}}
@@ -72,25 +61,25 @@
学籍信息
- - 通知书号 : {{studentInfo.NoticeNo}}
- - 考 生 号 : {{studentInfo.ksh}}
- - 系所 : {{studentInfo.DeptNo | deptNo}}
+ - 学 籍 号 : {{studentInfo.StuCode}}
+ - 学 号 : {{studentInfo.StuNo}}
+ - 年 级 : {{studentInfo.Grade}}
+ - 系 部 : {{studentInfo.DeptNo | deptNo}}
- 专 业 : {{studentInfo.MajorNo | majorNo}}
- 班 级 : {{studentInfo.ClassNo | class}}
- - 报到日期 : {{studentInfo.RegisterDate | date}}
- - 入学年月 : {{studentInfo.EntranceDate | date}}
- - 入党时间 : {{studentInfo.JoinPartyDate | date}}
- 入团时间 : {{studentInfo.JoinLeagueDate | date}}
- - 档案地址 : {{studentInfo.MatherUnit}}
+ - 现有学历 : {{studentInfo.GraduateNo | graduateNo}}
+ - 报到日期 : {{studentInfo.RegisterDate | date}}
+ - 入学年月 : {{studentInfo.EntranceDate | date}}
联系方式
- - 校内地址 : {{studentInfo.InSchoolAddress}}
+ - 联系电话 : {{studentInfo.mobile}}
- QQ : {{studentInfo.QQ}}
- - 校内电话 : {{studentInfo.InSchoolTelephone}}
+ - E-mail : {{studentInfo.EMail}}
@@ -110,12 +99,14 @@
},
methods: {
getData: function () {
- $.get('/UserCenter/GetStudentInfo?stuId=' + keyValue, function (ref) {
- this.studentInfo = ref.data.userInfo;
- this.baseInfo = ref.data.basicInfo;
- this.headUrl = ref.data.userInfo.Photo;
+ $.get('/UserCenter/GetStudentInfo?stuId=' + keyValue,
+ function (ref) {
+ this.studentInfo = ref.data.userInfo;
+ this.baseInfo = ref.data.basicInfo;
+ this.headUrl = ref.data.userInfo.Photo;
- }.bind(this), "json");
+ }.bind(this),
+ "json");
},
getUrl: function () {
var loginInfo = top.learun.clientdata.get(['userinfo']);
@@ -133,26 +124,28 @@
},
company: function (value) {
var result;
- top.learun.clientdata.getAsync('custmerData', {
- sync: true,
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
- key: value,
- keyId: 'f_companyid',
- callback: function (_data) {
- result = _data.f_fullname;
- }
- });
+ top.learun.clientdata.getAsync('custmerData',
+ {
+ sync: true,
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+ key: value,
+ keyId: 'f_companyid',
+ callback: function (_data) {
+ result = _data.f_fullname;
+ }
+ });
return result;
},
graduateNo: function (value) {
var result;
- top.learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'CollegeType',
- callback: function (_data) {
- result = _data.text;
- }
- });
+ top.learun.clientdata.getAsync('dataItem',
+ {
+ key: value,
+ code: 'CollegeType',
+ callback: function (_data) {
+ result = _data.text;
+ }
+ });
return result;
},
date: function (value) {
@@ -166,24 +159,38 @@
},
nationalityNo: function (value) {
var result;
- top.learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'National',
- callback: function (_data) {
- result = _data.text;
- }
- });
+ top.learun.clientdata.getAsync('dataItem',
+ {
+ key: value,
+ code: 'National',
+ callback: function (_data) {
+ result = _data.text;
+ }
+ });
return result;
},
partyFaceNo: function (value) {
var result;
- top.learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'BCdPartyFace',
- callback: function (_data) {
- result = _data.text;
- }
- });
+ top.learun.clientdata.getAsync('dataItem',
+ {
+ key: value,
+ code: 'PolityStatus',
+ callback: function (_data) {
+ result = _data.text;
+ }
+ });
+ return result;
+ },
+ guardiantype: function (value) {
+ var result;
+ top.learun.clientdata.getAsync('dataItem',
+ {
+ key: value,
+ code: 'GuardianType',
+ callback: function (_data) {
+ result = _data.text;
+ }
+ });
return result;
},
province: function (value) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index 658244de8..22171f71c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
@@ -159,7 +159,7 @@ var bootstrap = function ($, learun) {
}
learun.layerForm({
id: 'form',
- title: '编辑',
+ title: '查看',
url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue,
width: 1162,
height: 600,
@@ -437,7 +437,18 @@ var bootstrap = function ($, learun) {
formatter: function (cellvalue) {
return cellvalue == "1" ? "已审核" : "未审核";
}
+ },
+ {
+ label: "是否上传头像", name: "Photo", width: 80, align: "center",
+ formatter: function (cellvalue) {
+ if (cellvalue != null && cellvalue != "" && cellvalue != undefined) {
+ return cellvalue = "是";
+ } else {
+ return cellvalue= "否";
+ }
+ }
}
+
],
mainId: 'StuId',
isPage: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml
index c7ae00fc7..cd74ce967 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml
@@ -31,6 +31,7 @@
+ 文件大小不能超过200M
@@ -112,32 +115,51 @@
民 族 : {{studentInfo.NationalityNo |nationalityNo}}
政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}
身份证号 : {{studentInfo.IdentityCardNo}}
+ 户口所在地 : {{studentInfo.FatherUnit}}
+ @*民 族 : {{studentInfo.NationalityNo |nationalityNo}}
+ 政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}
+ 身份证号 : {{studentInfo.IdentityCardNo}}
E-mail : {{studentInfo.EMail}}
户 籍 省 : {{studentInfo.F_ProvinceId | province}}
户籍地市 : {{studentInfo.F_CityId | city}}
户籍县区 : {{studentInfo.F_CountyId | area}}
- 户籍地址 : {{studentInfo.FatherUnit}}
+ 户籍地址 : {{studentInfo.FatherUnit}}*@
家庭情况
- - 父亲姓名 : {{studentInfo.FatherName}}
+ - 监护人姓名 : {{studentInfo.Guardian}}
+ - 监护人联系电话 : {{studentInfo.GuardianPhone}}
+ - 与监护人关系 : {{studentInfo.GuardianType |guardiantype}}
+ - 邮政编码 : {{studentInfo.PostalCode}}
+ - 家庭地址 : {{studentInfo.MailAddress}}
+ @*- 父亲姓名 : {{studentInfo.FatherName}}
- 父亲电话 : {{studentInfo.FatherPhone}}
- 母亲姓名 : {{studentInfo.MatherName}}
- 母亲电话 : {{studentInfo.MatherPhone}}
- 港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}
- 健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}
- 邮政编码 : {{studentInfo.PostalCode}}
- - 通信地址 : {{studentInfo.MailAddress}}
+ - 通信地址 : {{studentInfo.MailAddress}}
*@
学籍信息
- - 通知书号 : {{studentInfo.NoticeNo}}
+ - 学 籍 号 : {{studentInfo.StuCode}}
+ - 学 号 : {{studentInfo.StuNo}}
+ - 年 级 : {{studentInfo.Grade}}
+ - 系 部 : {{studentInfo.DeptNo | deptNo}}
+ - 专 业 : {{studentInfo.MajorNo | majorNo}}
+ - 班 级 : {{studentInfo.ClassNo | class}}
+ - 入团时间 : {{studentInfo.JoinLeagueDate | date}}
+ - 现有学历 : {{studentInfo.GraduateNo | graduateNo}}
+ - 报到日期 : {{studentInfo.RegisterDate | date}}
+ - 入学年月 : {{studentInfo.EntranceDate | date}}
+ @*- 通知书号 : {{studentInfo.NoticeNo}}
- 考 生 号 : {{studentInfo.ksh}}
- 系所 : {{studentInfo.DeptNo | deptNo}}
- 专 业 : {{studentInfo.MajorNo | majorNo}}
@@ -146,16 +168,19 @@
- 入学年月 : {{studentInfo.EntranceDate | date}}
- 入党时间 : {{studentInfo.JoinPartyDate | date}}
- 入团时间 : {{studentInfo.JoinLeagueDate | date}}
- - 档案地址 : {{studentInfo.MatherUnit}}
+ - 档案地址 : {{studentInfo.MatherUnit}}
*@
联系方式
- - 校内地址 : {{studentInfo.InSchoolAddress}}
+ - 联系电话 : {{studentInfo.mobile}}
+ - QQ : {{studentInfo.QQ}}
+ - E-mail : {{studentInfo.EMail}}
+ @*- 校内地址 : {{studentInfo.InSchoolAddress}}
- QQ : {{studentInfo.QQ}}
- - 校内电话 : {{studentInfo.InSchoolTelephone}}
+ - 校内电话 : {{studentInfo.InSchoolTelephone}}
*@
@@ -247,6 +272,18 @@
});
return result;
},
+ guardiantype: function (value) {
+ var result;
+ top.learun.clientdata.getAsync('dataItem',
+ {
+ key: value,
+ code: 'GuardianType',
+ callback: function (_data) {
+ result = _data.text;
+ }
+ });
+ return result;
+ },
province: function (value) {
var result;
top.learun.clientdata.getAsync('custmerData', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs
index 09e1fed2c..e15250c2d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs
@@ -202,11 +202,15 @@ namespace Learun.Application.OA
if (newEntity.IsSend == "1" && status == 2)
{
+ BaseRepository()
+ .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始run task') ");
Task.Run(async () => { sendNew(newEntity); });
}
}
catch (Exception ex)
{
+ BaseRepository()
+ .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'run task 报错"+ex.Message+"') ");
if (ex is ExceptionEx)
{
throw;
@@ -233,11 +237,13 @@ namespace Learun.Application.OA
string ports = ConfigurationManager.AppSettings["Ports"];
#endregion
+ BaseRepository()
+ .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始组装实体') ");
SemdNewList SendNew = new SemdNewList
{
Title = newEntity.F_FullHead,
SubTitle = newEntity.F_BriefHead,
- Content = newEntity.F_NewsContent,
+ Content = HttpUtility.HtmlDecode(newEntity.F_NewsContent),
Author = newEntity.F_AuthorName,
Source = newEntity.F_SourceName,
AddDate = DateTime.Now,
@@ -248,8 +254,12 @@ namespace Learun.Application.OA
{
{ "X-SS-API-KEY", ApiKey }
};
+ BaseRepository()
+ .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始post cms') ");
string responses = HttpMethods.HttpPosts("http://" + ports + "/api/v1/contents/" + siteId + "/" + channelId, SendNew.ToJson(), ApiId);
+ BaseRepository()
+ .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'"+HttpUtility.UrlEncode(responses)+"') ");
//#region 修改审核状态
//string Nid = JsonConvert.DeserializeObject(responses).value.id;
@@ -272,7 +282,8 @@ namespace Learun.Application.OA
}
catch (Exception ex)
{
-
+ BaseRepository()
+ .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'"+ex.Message + "') ");
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs
index 6e1f9085d..a177705c6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs
@@ -152,28 +152,36 @@ namespace Learun.Util
public static string HttpPosts(string url, string json, WebHeaderCollection header)
{
string result = "";
- HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
- req.Method = "POST";
- req.ContentType = "application/json;charset=UTF-8";
- req.Headers.Add(header);
- byte[] data = Encoding.UTF8.GetBytes(json);//把字符串转换为字节
+ try
+ {
+ HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
+ req.Method = "POST";
+ req.ContentType = "application/json;charset=UTF-8";
+ req.Headers.Add(header);
+ byte[] data = Encoding.UTF8.GetBytes(json);//把字符串转换为字节
- req.ContentLength = data.Length; //请求长度
+ req.ContentLength = data.Length; //请求长度
- using (Stream reqStream = req.GetRequestStream()) //获取
- {
- reqStream.Write(data, 0, data.Length);//向当前流中写入字节
- reqStream.Close(); //关闭当前流
- }
+ using (Stream reqStream = req.GetRequestStream()) //获取
+ {
+ reqStream.Write(data, 0, data.Length);//向当前流中写入字节
+ reqStream.Close(); //关闭当前流
+ }
- HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); //响应结果
- Stream stream = resp.GetResponseStream();
- //获取响应内容
- using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
+ HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); //响应结果
+ Stream stream = resp.GetResponseStream();
+ //获取响应内容
+ using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
+ {
+ result = reader.ReadToEnd();
+ }
+ return result;
+ }
+ catch (Exception e)
{
- result = reader.ReadToEnd();
+ throw e;
}
- return result;
+
}
}
}