diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 047eb338..fa39bb9a 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -626,6 +626,7 @@ + diff --git a/SGGL/BLL/MDM/MDMDataService.cs b/SGGL/BLL/MDM/MDMDataService.cs new file mode 100644 index 00000000..c8a90cde --- /dev/null +++ b/SGGL/BLL/MDM/MDMDataService.cs @@ -0,0 +1,260 @@ +using Aspose.Words.Lists; +using Aspose.Words.Tables; +using Model; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using NPOI.POIFS.Crypt.Dsig; +using NPOI.SS.Formula.Functions; +using Org.BouncyCastle.Ocsp; +using RestSharp; +using SgManager.AI; +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Runtime.Remoting.Contexts; +using System.Security.Policy; +using System.Text; +using System.Threading.Tasks; +using System.Web; +using System.Web.UI.WebControls; + +namespace BLL +{ + public static class MDMDataService + { + //private static readonly string MdmApiUrl = "http://mdm.cwcec.com:8020/"; + private static readonly string MdmApiUrl = SysConstSetService.WuHuanMDMPath; + + /// + /// 获取token + /// + /// 五环MDM系统token有效期48小时 + /// + public static Model.TokenItem GetToken() + { + Model.TokenItem tokenItem = new Model.TokenItem(); + tokenItem.Token = BLL.SysConstSetService.WuHuanMDMToken; + tokenItem.ExpiryTime = BLL.SysConstSetService.WuHuanMDMTokenExTime; + if (string.IsNullOrEmpty(tokenItem.Token) || string.IsNullOrEmpty(tokenItem.ExpiryTime)) + { + tokenItem = GetWuHuanMDMToken(); + } + else if (DateTime.Now > DateTime.Parse(tokenItem.ExpiryTime)) + { + tokenItem = GetWuHuanMDMToken(); + } + return tokenItem; + } + + /// + /// 获取五环MDM系统Token + /// + /// 他们的token有效期48小时 + /// + public static Model.TokenItem GetWuHuanMDMToken() + { + string getUrl = MdmApiUrl + "/api/standard/dis/token?appId=v7lm6i30&appSecret=0qnbsy28e1hldzbm7rnyjs4n93s4eu62"; + TokenItem tokenItem = new TokenItem(); + try + { + var strJosn = Http(getUrl); + if (!string.IsNullOrEmpty(strJosn)) + { + JObject obj = JObject.Parse(strJosn); + if (obj["data"] != null) + { + string tokenStr = obj["data"].ToString(); + tokenItem.Token = tokenStr; + tokenItem.ExpiryTime = DateTime.Now.AddHours(-12).ToString("yyyy-MM-dd HH:mm:ss"); + SysConstSetService.SetWuHuanMDMToken(tokenItem.Token); + SysConstSetService.SetWuHuanMDMTokenExpirationTime(tokenItem.ExpiryTime); + } + } + } + catch (Exception eee) + { + ErrLogInfo.WriteLog("获取五环MDM系统Token出错1：" + eee.StackTrace + eee.Message); + } + return tokenItem; + } + + /// + /// 项目档案查询接口 + /// + public static void GetMDMProjectMasterData() + { + string url = $"{MdmApiUrl}/api/standard/dis/query_all"; + var tempData = new + { + actRet = 1, + pageNumber = 1, + sortName = "id", + searchDestCode = "", + sortOrder = "desc", + pageSize = 10000, + searchDisStatus = "", + menuName = "项目档案", + status = 1, + searchCond = new List() + }; + //var token = GetToken(); + //Hashtable newToken = new Hashtable { { "Authorization", token.Token } }; + //string contenttype = "application/json;charset=utf-8"; + //string result = Http(url, "POST", contenttype, newToken, JsonConvert.SerializeObject(tempData)); + + string mess = string.Empty; + string total = string.Empty; + string code = string.Empty; + string data = string.Empty; + string rows = string.Empty; + string pushContent = JsonConvert.SerializeObject(tempData); + //var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, newToken, pushContent); + var returndata = "{\"msg\":\"操作成功\",\"total\":4403,\"code\":1,\"data\":{\"userColumnPermissions\":\"\"},\"rows\":[{\"code\":\"100539\",\"projShortName\":\"新疆年产40亿方煤制天然气项目\",\"projectNameEn\":\"\",\"cityCode\":\"654000\",\"stProjectStepVals\":\"3006\",\"remarkA\":\"\",\"remarkC\":\"\",\"remarkB\":\"\",\"cityName\":\"伊犁哈萨克自治州\",\"countryCode\":\"CHN\",\"id\":6178,\"projStepZxnoVals\":\"10\",\"countyName\":\"伊宁县\",\"address\":\"伊宁县工业园区\",\"provinceCode\":\"650000\",\"projStepZxnoCode\":\"10\",\"stProjectTypeVals\":\"30\",\"stNum\":\"25093\",\"disType\":\"\",\"projStepZxnoName\":\"项目投标\",\"countyCode\":\"654021\",\"stProjectPropertyVals\":\"10\",\"name\":\"新疆年产40亿方煤制天然气项目\",\"provinceName\":\"新疆维吾尔自治区\",\"countryName\":\"中国\"},{\"code\":\"100538\",\"projShortName\":\"印尼泗水PET项目\",\"projectNameEn\":\"\",\"cityCode\":\"\",\"stProjectStepVals\":\"2001\",\"remarkA\":\"\",\"remarkC\":\"\",\"remarkB\":\"\",\"cityName\":\"\",\"countryCode\":\"IDN\",\"id\":6176,\"projStepZxnoVals\":\"20\",\"countyName\":\"\",\"address\":\"印度尼西亚泗水市\",\"provinceCode\":\"\",\"projStepZxnoCode\":\"20\",\"stProjectTypeVals\":\"20\",\"stNum\":\"25092\",\"disType\":\"\",\"projStepZxnoName\":\"项目实施\",\"countyCode\":\"\",\"stProjectPropertyVals\":\"10\",\"name\":\"印尼泗水PET项目\",\"provinceName\":\"\",\"countryName\":\"印度尼西亚\"},{\"code\":\"100537\",\"projShortName\":\"鹤壁煤化工锅炉扩能节能改造项目\",\"projectNameEn\":\"\",\"cityCode\":\"410600\",\"stProjectStepVals\":\"2004\",\"remarkA\":\"\",\"remarkC\":\"\",\"remarkB\":\"\",\"cityName\":\"鹤壁市\",\"countryCode\":\"CHN\",\"id\":6174,\"projStepZxnoVals\":\"20\",\"countyName\":\"鹤山区\",\"address\":\"宝山园区\",\"provinceCode\":\"410000\",\"projStepZxnoCode\":\"20\",\"stProjectTypeVals\":\"20\",\"stNum\":\"25091\",\"disType\":\"\",\"projStepZxnoName\":\"项目实施\",\"countyCode\":\"410602\",\"stProjectPropertyVals\":\"10\",\"name\":\"河南能源化工集团鹤壁煤化工有限公司锅炉扩能节能绿色化改造项目\",\"provinceName\":\"河南省\",\"countryName\":\"中国\"},{\"code\":\"100536\",\"projShortName\":\"新疆兵团十三师淖毛湖绿电制氢项目\",\"projectNameEn\":\"\",\"cityCode\":\"654200\",\"stProjectStepVals\":\"2003\",\"remarkA\":\"\",\"remarkC\":\"1904503358757068802\",\"remarkB\":\"\",\"cityName\":\"塔城地区\",\"countryCode\":\"CHN\",\"id\":6172,\"projStepZxnoVals\":\"20\",\"countyName\":\"和布克赛尔蒙古自治县\",\"address\":\"和丰大道园服路园区服务中心715室\",\"provinceCode\":\"650000\",\"projStepZxnoCode\":\"20\",\"stProjectTypeVals\":\"20\",\"stNum\":\"25087\",\"disType\":\"\",\"projStepZxnoName\":\"项目实施\",\"countyCode\":\"654226\",\"stProjectPropertyVals\":\"10\",\"name\":\"新疆兵团十三师淖毛湖先进绿电制氢示范项目\",\"provinceName\":\"新疆维吾尔自治区\",\"countryName\":\"中国\"},{\"code\":\"100535\",\"projShortName\":\"福建邵化生产装置改造项目\",\"projectNameEn\":\"\",\"cityCode\":\"350700\",\"stProjectStepVals\":\"4001\",\"remarkA\":\"\",\"remarkC\":\"1904503358572519426\",\"remarkB\":\"\",\"cityName\":\"南平市\",\"countryCode\":\"CHN\",\"id\":6170,\"projStepZxnoVals\":\"10\",\"countyName\":\"邵武市\",\"address\":\"金塘工业区\",\"provinceCode\":\"350000\",\"projStepZxnoCode\":\"10\",\"stProjectTypeVals\":\"40\",\"stNum\":\"24217\",\"disType\":\"\",\"projStepZxnoName\":\"项目投标\",\"countyCode\":\"350781\",\"stProjectPropertyVals\":\"10\",\"name\":\"福建邵化化工有限公司生产装置技术升级搬迁改造项目\",\"provinceName\":\"福建省\",\"countryName\":\"中国\"},{\"code\":\"100534\",\"projShortName\":\"土库曼斯坦化学康采恩化肥项目\",\"projectNameEn\":\"Turkmenhimiya Maryazot Fertilizer Project\",\"cityCode\":\"\",\"stProjectStepVals\":\"2001\",\"remarkA\":\"\",\"remarkC\":\"1904503358383775746\",\"remarkB\":\"\",\"cityName\":\"\",\"countryCode\":\"TKM\",\"id\":6168,\"projStepZxnoVals\":\"20\",\"countyName\":\"\",\"address\":\"Mary City\",\"provinceCode\":\"\",\"projStepZxnoCode\":\"20\",\"stProjectTypeVals\":\"20\",\"stNum\":\"24513\",\"disType\":\"\",\"projStepZxnoName\":\"项目实施\",\"countyCode\":\"\",\"stProjectPropertyVals\":\"10\",\"name\":\"土库曼斯坦化学康采恩化肥项目\",\"provinceName\":\"\",\"countryName\":\"土库曼斯坦\"},{\"code\":\"100533\",\"projShortName\":\"宁夏煤业有限责任公司煤制油分公司浓盐水结晶分盐及资源化利用改造项目\",\"projectNameEn\":\"\",\"cityCode\":\"640100\",\"stProjectStepVals\":\"3005\",\"remarkA\":\"\",\"remarkC\":\"1904201377140236290\",\"remarkB\":\"\",\"cityName\":\"银川市\",\"countryCode\":\"CHN\",\"id\":6166,\"projStepZxnoVals\":\"20\",\"countyName\":\"贺兰县\",\"address\":\"宁夏回族自治区银川市宁东镇\",\"provinceCode\":\"640000\",\"projStepZxnoCode\":\"20\",\"stProjectTypeVals\":\"30\",\"stNum\":\"25090\",\"disType\":\"\",\"projStepZxnoName\":\"项目实施\",\"countyCode\":\"640122\",\"stProjectPropertyVals\":\"20\",\"name\":\"宁夏煤业有限责任公司煤制油分公司浓盐水结晶分盐及资源化利用改造项目\",\"provinceName\":\"宁夏回族自治区\",\"countryName\":\"中国\"},{\"code\":\"100532\",\"projShortName\":\"肯尼亚KAISHAN绿氨项目\",\"projectNameEn\":\"Kenya KAISHAN Ammonia&Urea Project\",\"cityCode\":\"\",\"stProjectStepVals\":\"2001\",\"remarkA\":\"\",\"remarkC\":\"1904201376867606529\",\"remarkB\":\"\",\"cityName\":\"\",\"countryCode\":\"KEN\",\"id\":6164,\"projStepZxnoVals\":\"20\",\"countyName\":\"\",\"address\":\"肯尼亚\",\"provinceCode\":\"\",\"projStepZxnoCode\":\"20\",\"stProjectTypeVals\":\"20\",\"stNum\":\"25083\",\"disType\":\"\",\"projStepZxnoName\":\"项目实施\",\"countyCode\":\"\",\"stProjectPropertyVals\":\"10\",\"name\":\"肯尼亚KAISHAN绿氨项目\",\"provinceName\":\"\",\"countryName\":\"肯尼亚\"},{\"code\":\"100531\",\"projShortName\":\"玉门市老市区管理委员会创业孵化基地建设项目(北区道路建设工程)\",\"projectNameEn\":\"\",\"cityCode\":\"620900\",\"stProjectStepVals\":\"3006\",\"remarkA\":\"\",\"remarkC\":\"1904201376603365377\",\"remarkB\":\"\",\"cityName\":\"酒泉市\",\"countryCode\":\"CHN\",\"id\":6162,\"projStepZxnoVals\":\"20\",\"countyName\":\"玉门市\",\"address\":\"老化工园区\",\"provinceCode\":\"620000\",\"projStepZxnoCode\":\"20\",\"stProjectTypeVals\":\"30\",\"stNum\":\"25089\",\"disType\":\"\",\"projStepZxnoName\":\"项目实施\",\"countyCode\":\"620981\",\"stProjectPropertyVals\":\"10\",\"name\":\"玉门市老市区管理委员会玉门经济开发区老市区化工工业园创业孵化基地建设项目(北区道路建设工程)工程设计\",\"provinceName\":\"甘肃省\",\"countryName\":\"中国\"}]}"; + + if (!string.IsNullOrEmpty(returndata)) + { + JObject obj = JObject.Parse(returndata); + mess = obj["msg"].ToString(); + total = obj["total"].ToString(); + code = obj["code"].ToString(); + data = obj["data"].ToString(); + rows = obj["rows"].ToString(); + + MdmResponseData mdmResponseData = MdmResponseData.FromJson(returndata); + if (mdmResponseData.code == 1) + { + if (mdmResponseData.rows.Any()) + { + List list = new List(); + DeleteAllMDM_Project(); + foreach (var item in mdmResponseData.rows) + { + MDM_Project newItem = new MDM_Project(); + newItem.Id = item.id; + newItem.Code = item.code; + newItem.StNum = item.stNum; + newItem.Name = item.name; + newItem.DisType = item.disType; + newItem.ProjShortName = item.projShortName; + newItem.ProjStepZxnoCode = item.projStepZxnoCode; + newItem.ProjStepZxnoName = item.projStepZxnoName; + newItem.StProjectTypeVals = item.stProjectTypeVals; + newItem.StProjectStepVals = item.stProjectStepVals; + newItem.ProjStepZxnoVals = item.projStepZxnoVals; + newItem.StProjectPropertyVals = item.stProjectPropertyVals; + newItem.RemarkA = item.remarkA; + newItem.RemarkB = item.remarkB; + newItem.RemarkC = item.remarkC; + newItem.Address = item.address; + newItem.CityCode = item.cityCode; + newItem.CityName = item.cityName; + newItem.CountryCode = item.countryCode; + newItem.CountryName = item.countryName; + newItem.CountyCode = item.countyCode; + newItem.CountyName = item.countyName; + newItem.ProjectNameEn = item.projectNameEn; + newItem.ProvinceCode = item.provinceCode; + newItem.ProvinceName = item.provinceName; + newItem.CreateTime = DateTime.Now; + list.Add(newItem); + } + AddBulkMDM_Project(list); + } + } + } + } + + public static void AddBulkMDM_Project(List newtables) + { + Model.SGGLDB db = Funs.DB; + db.MDM_Project.InsertAllOnSubmit(newtables); + db.SubmitChanges(); + } + + public static void DeleteAllMDM_Project() + { + Model.SGGLDB db = Funs.DB; + if (db.MDM_Project.FirstOrDefault() != null) + { + db.MDM_Project.DeleteAllOnSubmit(db.MDM_Project); + db.SubmitChanges(); + } + } + + + public static string Http(string url, string method = "GET", string contenttype = "application/json;charset=utf-8", Hashtable header = null, string data = null) + { + ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | +SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | +SecurityProtocolType.Tls12; + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); + request.Method = string.IsNullOrEmpty(method) ? "GET" : method; + request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype; + if (header != null) + { + foreach (var i in header.Keys) + { + request.Headers.Add(i.ToString(), header[i].ToString()); + } + } + else if (method == "POST") + { + var token = GetToken(); + request.Headers.Add("Authorization", token.Token); + } + request.Timeout = 20000; /// 设置5秒超时 + if (!string.IsNullOrEmpty(data)) + { + Stream RequestStream = request.GetRequestStream(); + byte[] bytes = Encoding.UTF8.GetBytes(data); + RequestStream.Write(bytes, 0, bytes.Length); + RequestStream.Close(); + } + + HttpWebResponse response = null; + Stream ResponseStream = null; + StreamReader StreamReader = null; + try + { + response = (HttpWebResponse)request.GetResponse(); + ResponseStream = response.GetResponseStream(); + StreamReader = new StreamReader(ResponseStream, Encoding.GetEncoding("utf-8")); + + string re = StreamReader.ReadToEnd(); + StreamReader.Close(); + ResponseStream.Close(); + return re; + } + catch (WebException ex) + { + response = (HttpWebResponse)ex.Response; + ResponseStream = response.GetResponseStream(); + StreamReader = new StreamReader(ResponseStream, Encoding.GetEncoding("utf-8")); + + string re = StreamReader.ReadToEnd(); + return re; + } + finally + { + if (StreamReader != null) + { + StreamReader.Close(); + } + if (ResponseStream != null) + { + ResponseStream.Close(); + } + if (response != null) + { + response.Close(); + } + } + } + + + } +} diff --git a/SGGL/BLL/SysManage/SysConstSetService.cs b/SGGL/BLL/SysManage/SysConstSetService.cs index c0a75cfb..1bfb4e71 100644 --- a/SGGL/BLL/SysManage/SysConstSetService.cs +++ b/SGGL/BLL/SysManage/SysConstSetService.cs @@ -170,6 +170,130 @@ Funs.DB.SubmitChanges(); } } + + + + + public static string WuHuanMDMPath + { + get + { + var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "MDM接口地址" select x).ToList().FirstOrDefault(); + if (sysSet5 != null) + { + _CNCECPath = sysSet5.SetValue; + } + else + { + _CNCECPath = ""; + } + return _CNCECPath; + } + set + { + _CNCECPath = value; + } + } + public static string WuHuanMDMToken + { + get + { + var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "MDMToken" select x).ToList().FirstOrDefault(); + if (sysSet5 != null) + { + _CNCECToken = sysSet5.SetValue; + } + else + { + _CNCECToken = ""; + } + return _CNCECToken; + } + } + public static string WuHuanMDMTokenExTime + { + get + { + var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "MDMTokenExTime" select x).ToList().FirstOrDefault(); + if (sysSet5 != null) + { + _CNCECTokenExTime = sysSet5.SetValue; + } + else + { + _CNCECTokenExTime = ""; + } + return _CNCECTokenExTime; + } + } + public static void SetWuHuanMDMToken(string token) + { + Model.Sys_Set sysSet = Funs.DB.Sys_Set.FirstOrDefault(x => x.SetName == "MDMToken"); + if (sysSet != null) + { + if (!string.IsNullOrEmpty(token)) + { + sysSet.SetValue = token; + } + Funs.DB.SubmitChanges(); + } + else + { + Model.Sys_Set newSysSet5 = new Model.Sys_Set(); + var q = (from x in Funs.DB.Sys_Set orderby x.SetId descending select x).FirstOrDefault(); + if (q == null) + { + newSysSet5.SetId = 1; + } + else + { + newSysSet5.SetId = q.SetId + 1; + } + if (!string.IsNullOrEmpty(token)) + { + newSysSet5.SetValue = token; + } + newSysSet5.SetName = "MDMToken"; + Funs.DB.Sys_Set.InsertOnSubmit(newSysSet5); + Funs.DB.SubmitChanges(); + } + } + public static void SetWuHuanMDMTokenExpirationTime(string ExpirationTime) + { + Model.Sys_Set sysSet = Funs.DB.Sys_Set.FirstOrDefault(x => x.SetName == "MDMTokenExTime"); + if (sysSet != null) + { + if (!string.IsNullOrEmpty(ExpirationTime)) + { + sysSet.SetValue = ExpirationTime; + } + Funs.DB.SubmitChanges(); + } + else + { + Model.Sys_Set newSysSet5 = new Model.Sys_Set(); + var q = (from x in Funs.DB.Sys_Set orderby x.SetId descending select x).FirstOrDefault(); + if (q == null) + { + newSysSet5.SetId = 1; + } + else + { + newSysSet5.SetId = q.SetId + 1; + } + if (!string.IsNullOrEmpty(ExpirationTime)) + { + newSysSet5.SetValue = ExpirationTime; + } + newSysSet5.SetName = "MDMTokenExTime"; + Funs.DB.Sys_Set.InsertOnSubmit(newSysSet5); + Funs.DB.SubmitChanges(); + } + } + + + + /// /// 获取及格分数 /// diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index abcd5db4..f0be9eb2 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -218,6 +218,7 @@ namespace BLL PageSize = 10, IsOffice = user.IsOffice, Telephone = user.Telephone, + Email = user.Email, DataSources = user.DataSources, SignatureUrl = user.SignatureUrl, DepartId = user.DepartId, @@ -268,6 +269,7 @@ namespace BLL newUser.IsPost = user.IsPost; newUser.IsOffice = user.IsOffice; newUser.Telephone = user.Telephone; + newUser.Email = user.Email; newUser.SignatureUrl = user.SignatureUrl; newUser.DepartId = user.DepartId; newUser.MainCNProfessionalId = user.MainCNProfessionalId; @@ -298,6 +300,10 @@ namespace BLL newUser.IsPost = user.IsPost; newUser.IsOffice = user.IsOffice; newUser.Telephone = user.Telephone; + if (!string.IsNullOrEmpty(user.Email)) + { + newUser.Email = user.Email; + } newUser.SignatureUrl = user.SignatureUrl; newUser.DepartId = user.DepartId; newUser.Politicalstatus = user.Politicalstatus; @@ -339,7 +345,10 @@ namespace BLL newUser.UserName = user.UserName; newUser.UserCode = user.UserCode; newUser.IdentityCard = user.IdentityCard; - newUser.Email = user.Email; + if (!string.IsNullOrEmpty(user.Email)) + { + newUser.Email = user.Email; + } newUser.Telephone = user.Telephone; Funs.DB.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx index f7c82221..90d8f221 100644 --- a/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx +++ b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx @@ -53,7 +53,7 @@ - + + //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.SitePerson { - - - public partial class PersonListEdit { - +namespace FineUIPro.Web.HSSE.SitePerson +{ + + + public partial class PersonListEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel3 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel3; - + /// /// Toolbar2 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// btnAttachUrl1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl1; - + /// /// btnAttachUrl5 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl5; - + /// /// btnAttachUrl2 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl2; - + /// /// btnAttachUrl3 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl3; - + /// /// btnAttachUrl4 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl4; - + /// /// btnSave 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnQR 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnQR; - + /// /// btnClose 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// TabStrip1 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TabStrip TabStrip1; - + /// /// Tab1 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tab Tab1; - + /// /// Panel2 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Panel1 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// txtPersonName 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPersonName; - + /// /// drpIdcardType 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpIdcardType; - + /// /// txtIdentityCard 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtIdentityCard; - + /// /// txtIdcardStartDate 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtIdcardStartDate; - + /// /// txtIdcardEndDate 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtIdcardEndDate; - + /// /// txtUnitName 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitName; - + /// /// txtWorkArea 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownBox txtWorkArea; - + /// /// gvWorkArea 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvWorkArea; - + /// /// drpMainCNProfessional 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpMainCNProfessional; - + /// /// drpAuditor 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAuditor; - + /// /// ckIsForeign 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckIsForeign; - + /// /// txtBirthday 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtBirthday; - + /// /// txtInTime 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtInTime; - + /// /// txtOutTime 控件。 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtOutTime; - + /// /// ckIsSafetyMonitoring 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckIsSafetyMonitoring; - + /// /// Panel4 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel4; - + /// /// txtCardNo 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCardNo; - + /// /// btnReadIdentityCard 控件。 /// @@ -317,7 +319,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnReadIdentityCard; - + /// /// rblSex 控件。 /// @@ -326,7 +328,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblSex; - + /// /// rblIdcardForever 控件。 /// @@ -335,7 +337,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIdcardForever; - + /// /// txtIdcardAddress 控件。 /// @@ -344,7 +346,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtIdcardAddress; - + /// /// drpPost 控件。 /// @@ -353,7 +355,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPost; - + /// /// drpTeamGroup 控件。 /// @@ -362,7 +364,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpTeamGroup; - + /// /// drpViceCNProfessional 控件。 /// @@ -371,7 +373,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpViceCNProfessional; - + /// /// txtAuditorDate 控件。 /// @@ -380,7 +382,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtAuditorDate; - + /// /// ckIsOutside 控件。 /// @@ -389,7 +391,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckIsOutside; - + /// /// txtTelephone 控件。 /// @@ -398,7 +400,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTelephone; - + /// /// rblIsUsed 控件。 /// @@ -407,7 +409,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsUsed; - + /// /// txtOutResult 控件。 /// @@ -416,7 +418,16 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtOutResult; - + + /// + /// txtEmail 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEmail; + /// /// Panel5 控件。 /// @@ -425,7 +436,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel5; - + /// /// imgPhoto 控件。 /// @@ -434,7 +445,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Image imgPhoto; - + /// /// filePhoto 控件。 /// @@ -443,7 +454,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FileUpload filePhoto; - + /// /// Tab2 控件。 /// @@ -452,7 +463,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tab Tab2; - + /// /// Form7 控件。 /// @@ -461,7 +472,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form7; - + /// /// drpPosition 控件。 /// @@ -470,7 +481,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPosition; - + /// /// drpTitle 控件。 /// @@ -479,7 +490,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpTitle; - + /// /// drpEduLevel 控件。 /// @@ -488,7 +499,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpEduLevel; - + /// /// drpMaritalStatus 控件。 /// @@ -497,7 +508,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpMaritalStatus; - + /// /// drpPoliticsStatus 控件。 /// @@ -506,7 +517,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPoliticsStatus; - + /// /// drpNation 控件。 /// @@ -515,7 +526,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpNation; - + /// /// drpCountryCode 控件。 /// @@ -524,7 +535,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCountryCode; - + /// /// drpProvinceCode 控件。 /// @@ -533,7 +544,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProvinceCode; - + /// /// drpCertificate 控件。 /// @@ -542,7 +553,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCertificate; - + /// /// txtCertificateCode 控件。 /// @@ -551,7 +562,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCertificateCode; - + /// /// txtCertificateLimitTime 控件。 /// @@ -560,7 +571,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtCertificateLimitTime; - + /// /// rblIsCardUsed 控件。 /// @@ -569,7 +580,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsCardUsed; - + /// /// txtAddress 控件。 /// @@ -578,7 +589,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAddress; - + /// /// Window1 控件。 /// @@ -587,7 +598,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx index 74fc820b..12d29826 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx +++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx @@ -32,8 +32,14 @@ + + + + + + diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs index b72bbe5c..8bec16e5 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs @@ -110,6 +110,7 @@ namespace FineUIPro.Web.SysManage this.drpIsPost.SelectedValue = Convert.ToString(user.IsPost); } this.txtTelephone.Text = user.Telephone; + this.txtEmail.Text = user.Email; if (user.IsOffice == true) { this.drpIsOffice.SelectedValue = "True"; @@ -199,6 +200,7 @@ namespace FineUIPro.Web.SysManage Account = this.txtAccount.Text.Trim(), IdentityCard = this.txtIdentityCard.Text.Trim(), Telephone = this.txtTelephone.Text.Trim(), + Email = this.txtEmail.Text.Trim(), }; if (this.drpUnit.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs index a6469fde..df6cc61f 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.SysManage /// protected global::FineUIPro.TextBox txtTelephone; + /// + /// txtEmail 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEmail; + /// /// trServer 控件。 /// diff --git a/SGGL/Model/MDM/MdmProject.cs b/SGGL/Model/MDM/MdmProject.cs new file mode 100644 index 00000000..d7a76fa3 --- /dev/null +++ b/SGGL/Model/MDM/MdmProject.cs @@ -0,0 +1,217 @@ +// +// +// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: +// +// using Model; +// +// var response = Response.FromJson(jsonString); + + +namespace Model +{ + using System; + using System.Collections.Generic; + + using System.Globalization; + using Newtonsoft.Json; + using Newtonsoft.Json.Converters; + + + /// + /// 项目 + /// + public partial class MdmResponseData + { + /// + /// 返回状态 + /// + [JsonProperty("code")] + public int code { get; set; } + /// + /// 数组总条数 + /// + [JsonProperty("total")] + public int total { get; set; } + + /// + /// 权限数组 + /// + [JsonProperty("data")] + public ResponseData data { get; set; } + /// + /// 返回状态 + /// + [JsonProperty("rows")] + public System.Collections.Generic.List rows { get; set; } + /// + /// 返回消息 + /// + [JsonProperty("msg")] + public string msg { get; set; } + } + + + public partial class ResponseData + { + /// + /// 权限信息 + /// + [JsonProperty("userColumnPermissions")] + public string userColumnPermissions { get; set; } + } + /// + /// 项目 + /// + public partial class MdmProject + { + /// + /// 主键ID + /// + [JsonProperty("id")] + public int id { get; set; } + /// + /// 项目ID + /// + [JsonProperty("code")] + public string code { get; set; } + /// + /// 项目号(源头) + /// + [JsonProperty("stNum")] + public string stNum { get; set; } + /// + /// 操作类型 + /// + [JsonProperty("disType")] + public string disType { get; set; } + /// + /// 名称 + /// + [JsonProperty("name")] + public string name { get; set; } + /// + /// 项目简称 + /// + [JsonProperty("projShortName")] + public string projShortName { get; set; } + /// + /// 项目阶段编码 + /// + [JsonProperty("projStepZxnoCode")] + public string projStepZxnoCode { get; set; } + /// + /// 项目阶段名称 + /// + [JsonProperty("projStepZxnoName")] + public string projStepZxnoName { get; set; } + /// + /// 项目类型一级 + /// + [JsonProperty("stProjectTypeVals")] + public string stProjectTypeVals { get; set; } + /// + /// 项目类型二级 + /// + [JsonProperty("stProjectStepVals")] + public string stProjectStepVals { get; set; } + /// + /// 项目阶段 + /// + [JsonProperty("projStepZxnoVals")] + public string projStepZxnoVals { get; set; } + /// + /// 项目性质 + /// + [JsonProperty("stProjectPropertyVals")] + public string stProjectPropertyVals { get; set; } + /// + /// 备注3_新系统项目ID + /// + [JsonProperty("remarkC")] + public string remarkC { get; set; } + /// + /// 详细地址 + /// + [JsonProperty("address")] + public string address { get; set; } + /// + /// 市编码 + /// + [JsonProperty("cityCode")] + public string cityCode { get; set; } + /// + /// 市名称 + /// + [JsonProperty("cityName")] + public string cityName { get; set; } + /// + /// 国家编码 + /// + [JsonProperty("countryCode")] + public string countryCode { get; set; } + /// + /// 国家名称 + /// + [JsonProperty("countryName")] + public string countryName { get; set; } + /// + /// 区县编码 + /// + [JsonProperty("countyCode")] + public string countyCode { get; set; } + /// + /// 区县名称 + /// + [JsonProperty("countyName")] + public string countyName { get; set; } + /// + /// 项目英文名称 + /// + [JsonProperty("projectNameEn")] + public string projectNameEn { get; set; } + /// + /// 省编码 + /// + [JsonProperty("provinceCode")] + public string provinceCode { get; set; } + /// + /// 省名称 + /// + [JsonProperty("provinceName")] + public string provinceName { get; set; } + /// + /// 经度 + /// + [JsonProperty("remarkA")] + public string remarkA { get; set; } + + /// + /// 纬度 + /// + [JsonProperty("remarkB")] + public string remarkB { get; set; } + + } + + public partial class MdmResponseData + { + public static MdmResponseData FromJson(string json) + { + return JsonConvert.DeserializeObject(json, Model.Converter.Settings); + } + } + + internal static class Converter + { + public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings + { + MetadataPropertyHandling = MetadataPropertyHandling.Ignore, + DateParseHandling = DateParseHandling.None, + Converters = + { + new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal } + }, + }; + } +} + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index e6e76a75..ad3f3a76 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1646,6 +1646,9 @@ namespace Model partial void InsertManager_TrainSortC(Manager_TrainSortC instance); partial void UpdateManager_TrainSortC(Manager_TrainSortC instance); partial void DeleteManager_TrainSortC(Manager_TrainSortC instance); + partial void InsertMDM_Project(MDM_Project instance); + partial void UpdateMDM_Project(MDM_Project instance); + partial void DeleteMDM_Project(MDM_Project instance); partial void InsertMeeting_AttendMeeting(Meeting_AttendMeeting instance); partial void UpdateMeeting_AttendMeeting(Meeting_AttendMeeting instance); partial void DeleteMeeting_AttendMeeting(Meeting_AttendMeeting instance); @@ -7135,6 +7138,14 @@ namespace Model } } + public System.Data.Linq.Table MDM_Project + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Meeting_AttendMeeting { get @@ -263500,6 +263511,668 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.MDM_Project")] + public partial class MDM_Project : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private int _Id; + + private string _Code; + + private string _StNum; + + private string _DisType; + + private string _Name; + + private string _ProjShortName; + + private string _ProjStepZxnoCode; + + private string _ProjStepZxnoName; + + private string _StProjectTypeVals; + + private string _StProjectStepVals; + + private string _ProjStepZxnoVals; + + private string _StProjectPropertyVals; + + private string _RemarkC; + + private string _Address; + + private string _CityCode; + + private string _CityName; + + private string _CountryCode; + + private string _CountryName; + + private string _CountyCode; + + private string _CountyName; + + private string _ProjectNameEn; + + private string _ProvinceCode; + + private string _ProvinceName; + + private string _RemarkA; + + private string _RemarkB; + + private System.DateTime _CreateTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(int value); + partial void OnIdChanged(); + partial void OnCodeChanging(string value); + partial void OnCodeChanged(); + partial void OnStNumChanging(string value); + partial void OnStNumChanged(); + partial void OnDisTypeChanging(string value); + partial void OnDisTypeChanged(); + partial void OnNameChanging(string value); + partial void OnNameChanged(); + partial void OnProjShortNameChanging(string value); + partial void OnProjShortNameChanged(); + partial void OnProjStepZxnoCodeChanging(string value); + partial void OnProjStepZxnoCodeChanged(); + partial void OnProjStepZxnoNameChanging(string value); + partial void OnProjStepZxnoNameChanged(); + partial void OnStProjectTypeValsChanging(string value); + partial void OnStProjectTypeValsChanged(); + partial void OnStProjectStepValsChanging(string value); + partial void OnStProjectStepValsChanged(); + partial void OnProjStepZxnoValsChanging(string value); + partial void OnProjStepZxnoValsChanged(); + partial void OnStProjectPropertyValsChanging(string value); + partial void OnStProjectPropertyValsChanged(); + partial void OnRemarkCChanging(string value); + partial void OnRemarkCChanged(); + partial void OnAddressChanging(string value); + partial void OnAddressChanged(); + partial void OnCityCodeChanging(string value); + partial void OnCityCodeChanged(); + partial void OnCityNameChanging(string value); + partial void OnCityNameChanged(); + partial void OnCountryCodeChanging(string value); + partial void OnCountryCodeChanged(); + partial void OnCountryNameChanging(string value); + partial void OnCountryNameChanged(); + partial void OnCountyCodeChanging(string value); + partial void OnCountyCodeChanged(); + partial void OnCountyNameChanging(string value); + partial void OnCountyNameChanged(); + partial void OnProjectNameEnChanging(string value); + partial void OnProjectNameEnChanged(); + partial void OnProvinceCodeChanging(string value); + partial void OnProvinceCodeChanged(); + partial void OnProvinceNameChanging(string value); + partial void OnProvinceNameChanged(); + partial void OnRemarkAChanging(string value); + partial void OnRemarkAChanged(); + partial void OnRemarkBChanging(string value); + partial void OnRemarkBChanged(); + partial void OnCreateTimeChanging(System.DateTime value); + partial void OnCreateTimeChanged(); + #endregion + + public MDM_Project() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="id", Storage="_Id", DbType="Int NOT NULL", IsPrimaryKey=true)] + public int Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="code", Storage="_Code", DbType="NVarChar(100) NOT NULL", CanBeNull=false)] + public string Code + { + get + { + return this._Code; + } + set + { + if ((this._Code != value)) + { + this.OnCodeChanging(value); + this.SendPropertyChanging(); + this._Code = value; + this.SendPropertyChanged("Code"); + this.OnCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stNum", Storage="_StNum", DbType="NVarChar(100) NOT NULL", CanBeNull=false)] + public string StNum + { + get + { + return this._StNum; + } + set + { + if ((this._StNum != value)) + { + this.OnStNumChanging(value); + this.SendPropertyChanging(); + this._StNum = value; + this.SendPropertyChanged("StNum"); + this.OnStNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="disType", Storage="_DisType", DbType="NVarChar(100)")] + public string DisType + { + get + { + return this._DisType; + } + set + { + if ((this._DisType != value)) + { + this.OnDisTypeChanging(value); + this.SendPropertyChanging(); + this._DisType = value; + this.SendPropertyChanged("DisType"); + this.OnDisTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="name", Storage="_Name", DbType="NVarChar(200) NOT NULL", CanBeNull=false)] + public string Name + { + get + { + return this._Name; + } + set + { + if ((this._Name != value)) + { + this.OnNameChanging(value); + this.SendPropertyChanging(); + this._Name = value; + this.SendPropertyChanged("Name"); + this.OnNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projShortName", Storage="_ProjShortName", DbType="NVarChar(100)")] + public string ProjShortName + { + get + { + return this._ProjShortName; + } + set + { + if ((this._ProjShortName != value)) + { + this.OnProjShortNameChanging(value); + this.SendPropertyChanging(); + this._ProjShortName = value; + this.SendPropertyChanged("ProjShortName"); + this.OnProjShortNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projStepZxnoCode", Storage="_ProjStepZxnoCode", DbType="NVarChar(100)")] + public string ProjStepZxnoCode + { + get + { + return this._ProjStepZxnoCode; + } + set + { + if ((this._ProjStepZxnoCode != value)) + { + this.OnProjStepZxnoCodeChanging(value); + this.SendPropertyChanging(); + this._ProjStepZxnoCode = value; + this.SendPropertyChanged("ProjStepZxnoCode"); + this.OnProjStepZxnoCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projStepZxnoName", Storage="_ProjStepZxnoName", DbType="NVarChar(100)")] + public string ProjStepZxnoName + { + get + { + return this._ProjStepZxnoName; + } + set + { + if ((this._ProjStepZxnoName != value)) + { + this.OnProjStepZxnoNameChanging(value); + this.SendPropertyChanging(); + this._ProjStepZxnoName = value; + this.SendPropertyChanged("ProjStepZxnoName"); + this.OnProjStepZxnoNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectTypeVals", Storage="_StProjectTypeVals", DbType="NVarChar(100)")] + public string StProjectTypeVals + { + get + { + return this._StProjectTypeVals; + } + set + { + if ((this._StProjectTypeVals != value)) + { + this.OnStProjectTypeValsChanging(value); + this.SendPropertyChanging(); + this._StProjectTypeVals = value; + this.SendPropertyChanged("StProjectTypeVals"); + this.OnStProjectTypeValsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectStepVals", Storage="_StProjectStepVals", DbType="NVarChar(100)")] + public string StProjectStepVals + { + get + { + return this._StProjectStepVals; + } + set + { + if ((this._StProjectStepVals != value)) + { + this.OnStProjectStepValsChanging(value); + this.SendPropertyChanging(); + this._StProjectStepVals = value; + this.SendPropertyChanged("StProjectStepVals"); + this.OnStProjectStepValsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projStepZxnoVals", Storage="_ProjStepZxnoVals", DbType="NVarChar(100)")] + public string ProjStepZxnoVals + { + get + { + return this._ProjStepZxnoVals; + } + set + { + if ((this._ProjStepZxnoVals != value)) + { + this.OnProjStepZxnoValsChanging(value); + this.SendPropertyChanging(); + this._ProjStepZxnoVals = value; + this.SendPropertyChanged("ProjStepZxnoVals"); + this.OnProjStepZxnoValsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectPropertyVals", Storage="_StProjectPropertyVals", DbType="NVarChar(100)")] + public string StProjectPropertyVals + { + get + { + return this._StProjectPropertyVals; + } + set + { + if ((this._StProjectPropertyVals != value)) + { + this.OnStProjectPropertyValsChanging(value); + this.SendPropertyChanging(); + this._StProjectPropertyVals = value; + this.SendPropertyChanged("StProjectPropertyVals"); + this.OnStProjectPropertyValsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="remarkC", Storage="_RemarkC", DbType="NVarChar(100)")] + public string RemarkC + { + get + { + return this._RemarkC; + } + set + { + if ((this._RemarkC != value)) + { + this.OnRemarkCChanging(value); + this.SendPropertyChanging(); + this._RemarkC = value; + this.SendPropertyChanged("RemarkC"); + this.OnRemarkCChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="address", Storage="_Address", DbType="NVarChar(500)")] + public string Address + { + get + { + return this._Address; + } + set + { + if ((this._Address != value)) + { + this.OnAddressChanging(value); + this.SendPropertyChanging(); + this._Address = value; + this.SendPropertyChanged("Address"); + this.OnAddressChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="cityCode", Storage="_CityCode", DbType="NVarChar(100)")] + public string CityCode + { + get + { + return this._CityCode; + } + set + { + if ((this._CityCode != value)) + { + this.OnCityCodeChanging(value); + this.SendPropertyChanging(); + this._CityCode = value; + this.SendPropertyChanged("CityCode"); + this.OnCityCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="cityName", Storage="_CityName", DbType="NVarChar(100)")] + public string CityName + { + get + { + return this._CityName; + } + set + { + if ((this._CityName != value)) + { + this.OnCityNameChanging(value); + this.SendPropertyChanging(); + this._CityName = value; + this.SendPropertyChanged("CityName"); + this.OnCityNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="countryCode", Storage="_CountryCode", DbType="NVarChar(100)")] + public string CountryCode + { + get + { + return this._CountryCode; + } + set + { + if ((this._CountryCode != value)) + { + this.OnCountryCodeChanging(value); + this.SendPropertyChanging(); + this._CountryCode = value; + this.SendPropertyChanged("CountryCode"); + this.OnCountryCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="countryName", Storage="_CountryName", DbType="NVarChar(100)")] + public string CountryName + { + get + { + return this._CountryName; + } + set + { + if ((this._CountryName != value)) + { + this.OnCountryNameChanging(value); + this.SendPropertyChanging(); + this._CountryName = value; + this.SendPropertyChanged("CountryName"); + this.OnCountryNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="countyCode", Storage="_CountyCode", DbType="NVarChar(100)")] + public string CountyCode + { + get + { + return this._CountyCode; + } + set + { + if ((this._CountyCode != value)) + { + this.OnCountyCodeChanging(value); + this.SendPropertyChanging(); + this._CountyCode = value; + this.SendPropertyChanged("CountyCode"); + this.OnCountyCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="countyName", Storage="_CountyName", DbType="NVarChar(100)")] + public string CountyName + { + get + { + return this._CountyName; + } + set + { + if ((this._CountyName != value)) + { + this.OnCountyNameChanging(value); + this.SendPropertyChanging(); + this._CountyName = value; + this.SendPropertyChanged("CountyName"); + this.OnCountyNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectNameEn", Storage="_ProjectNameEn", DbType="NVarChar(500)")] + public string ProjectNameEn + { + get + { + return this._ProjectNameEn; + } + set + { + if ((this._ProjectNameEn != value)) + { + this.OnProjectNameEnChanging(value); + this.SendPropertyChanging(); + this._ProjectNameEn = value; + this.SendPropertyChanged("ProjectNameEn"); + this.OnProjectNameEnChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="provinceCode", Storage="_ProvinceCode", DbType="NVarChar(100)")] + public string ProvinceCode + { + get + { + return this._ProvinceCode; + } + set + { + if ((this._ProvinceCode != value)) + { + this.OnProvinceCodeChanging(value); + this.SendPropertyChanging(); + this._ProvinceCode = value; + this.SendPropertyChanged("ProvinceCode"); + this.OnProvinceCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="provinceName", Storage="_ProvinceName", DbType="NVarChar(100)")] + public string ProvinceName + { + get + { + return this._ProvinceName; + } + set + { + if ((this._ProvinceName != value)) + { + this.OnProvinceNameChanging(value); + this.SendPropertyChanging(); + this._ProvinceName = value; + this.SendPropertyChanged("ProvinceName"); + this.OnProvinceNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="remarkA", Storage="_RemarkA", DbType="NVarChar(100)")] + public string RemarkA + { + get + { + return this._RemarkA; + } + set + { + if ((this._RemarkA != value)) + { + this.OnRemarkAChanging(value); + this.SendPropertyChanging(); + this._RemarkA = value; + this.SendPropertyChanged("RemarkA"); + this.OnRemarkAChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="remarkB", Storage="_RemarkB", DbType="NVarChar(100)")] + public string RemarkB + { + get + { + return this._RemarkB; + } + set + { + if ((this._RemarkB != value)) + { + this.OnRemarkBChanging(value); + this.SendPropertyChanging(); + this._RemarkB = value; + this.SendPropertyChanged("RemarkB"); + this.OnRemarkBChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime NOT NULL")] + public System.DateTime CreateTime + { + get + { + return this._CreateTime; + } + set + { + if ((this._CreateTime != value)) + { + this.OnCreateTimeChanging(value); + this.SendPropertyChanging(); + this._CreateTime = value; + this.SendPropertyChanged("CreateTime"); + this.OnCreateTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Meeting_AttendMeeting")] public partial class Meeting_AttendMeeting : INotifyPropertyChanging, INotifyPropertyChanged { @@ -343514,6 +344187,8 @@ namespace Model private System.Nullable _IsBlacklist; + private string _Email; + private EntitySet _Accident_AccidentPersonRecord; private EntitySet _Accident_AccidentReportOtherItem; @@ -343700,6 +344375,8 @@ namespace Model partial void OnIsSafetyMonitoringChanged(); partial void OnIsBlacklistChanging(System.Nullable value); partial void OnIsBlacklistChanged(); + partial void OnEmailChanging(string value); + partial void OnEmailChanged(); #endregion public SitePerson_Person() @@ -345008,6 +345685,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Email", DbType="NVarChar(200)")] + public string Email + { + get + { + return this._Email; + } + set + { + if ((this._Email != value)) + { + this.OnEmailChanging(value); + this.SendPropertyChanging(); + this._Email = value; + this.SendPropertyChanged("Email"); + this.OnEmailChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentPersonRecord { diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 3ad20c8b..dc94e259 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -230,6 +230,7 @@ + diff --git a/SGGL/Model/TokenItem.cs b/SGGL/Model/TokenItem.cs index f5d772a3..b3461d68 100644 --- a/SGGL/Model/TokenItem.cs +++ b/SGGL/Model/TokenItem.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace Model { public class TokenItem