diff --git a/CreateModel.bat b/CreateModel.bat index f5e367c..cee3c9c 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -27,7 +27,7 @@ REM -------------- @echo. @call "%VS100COMNTOOLS%"vsvars32.bat -SqlMetal /views /server:.\SQL2012 /database:SGGLDB_TCC /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:.\SQL2012 /database:CNPC_XJYJ /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/CreateModel2017.bat b/CreateModel2017.bat index 2b16f99..0be5ffc 100644 --- a/CreateModel2017.bat +++ b/CreateModel2017.bat @@ -27,7 +27,7 @@ REM -------------- @echo. @call "%VS150%" -SqlMetal /views /server:. /database:SGGLDB_XJYJ /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:. /database:CNPC_XJYJ /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/CreateModel2017local.bat b/CreateModel2017local.bat index 730ed1b..83d4258 100644 --- a/CreateModel2017local.bat +++ b/CreateModel2017local.bat @@ -27,7 +27,7 @@ REM -------------- @echo. @call "%VS150%" -SqlMetal /views /server:. /user:sa /password:1111 /database:SGGLDB_TCC /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:. /user:sa /password:1111 /database:CNPC_XJYJ /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/CreateModel_47.bat b/CreateModel_47.bat index 7cbc9ad..8199ca0 100644 --- a/CreateModel_47.bat +++ b/CreateModel_47.bat @@ -27,7 +27,7 @@ REM -------------- @echo. @call "%VS150%" -SqlMetal /views /server:47.104.102.122,14333 /database:SGGLDB_XJYJ /user:sa /password:p@ssw0rd /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:47.104.102.122,14333 /database:CNPC_XJYJ /user:sa /password:p@ssw0rd /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/SGGL/BLL/API/APIBaseInfoService.cs b/SGGL/BLL/API/APIBaseInfoService.cs index 631fdb4..d2cb1fc 100644 --- a/SGGL/BLL/API/APIBaseInfoService.cs +++ b/SGGL/BLL/API/APIBaseInfoService.cs @@ -15,7 +15,7 @@ namespace BLL { public static ListItem[] GetInstallationList(string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Project_Installation @@ -39,7 +39,7 @@ namespace BLL public static List getCQMSSolutinType(string groupId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var list = (from x in db.Base_SolutionTempleteType orderby x.SortIndex select new Model.BaseInfoItem { BaseInfoId = x.SolutionTempleteTypeCode, BaseInfoCode = x.SortIndex.ToString(), BaseInfoName = x.SolutionTempleteTypeName }).ToList(); return list; @@ -53,7 +53,7 @@ namespace BLL /// public static List getSysConst(string groupId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Sys_Const where x.GroupId == groupId @@ -71,7 +71,7 @@ namespace BLL /// public static List getProjectList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_Project orderby x.ProjectCode @@ -95,7 +95,7 @@ namespace BLL /// public static Model.BaseInfoItem getProjectByCode(string projectCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_Project where x.ProjectCode == projectCode @@ -119,7 +119,7 @@ namespace BLL /// public static List getProjectWorkArea(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null @@ -143,7 +143,7 @@ namespace BLL /// public static List GetProjecUnitWorkByUnitId(string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.WBS_UnitWork where x.ProjectId == projectId && x.UnitId == unitId && x.SuperUnitWork == null @@ -168,7 +168,7 @@ namespace BLL /// public static List GetMaterial() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_Material orderby x.MaterialCode @@ -191,7 +191,7 @@ namespace BLL /// public static List getDetectionType() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_DetectionType orderby x.DetectionTypeCode @@ -212,7 +212,7 @@ namespace BLL /// public static List getDetectionRate() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_DetectionRate orderby x.DetectionRateCode @@ -236,7 +236,7 @@ namespace BLL /// public static List getHazardRegisterTypes(string type) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == type @@ -255,7 +255,7 @@ namespace BLL /// public static List getProjectPictureByProjectId(string projectId, string pictureType, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.InformationProject_Picture join y in db.AttachFile on x.PictureId equals y.ToKeyId @@ -318,7 +318,7 @@ namespace BLL /// public static List getProjectMapByProjectId(string projectId, string mapType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.InformationProject_ProjectMap join y in db.AttachFile on x.ProjectMapId equals y.ToKeyId @@ -374,7 +374,7 @@ namespace BLL /// public static List getNoticesList(string projectId, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.InformationProject_Notice where x.AccessProjectId.Contains(projectId) && x.IsRelease == true @@ -398,7 +398,7 @@ namespace BLL /// public static List getNoticesList(string projectId, string userId, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.InformationProject_Notice where x.AccessProjectId.Contains(projectId) && x.IsRelease == true @@ -422,7 +422,7 @@ namespace BLL /// public static Model.NoticeItem getNoticesByNoticeId(string noticeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.InformationProject_Notice where x.NoticeId == noticeId @@ -447,7 +447,7 @@ namespace BLL /// public static List getWorkPost(string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_WorkPost where strParam == null || x.WorkPostName.Contains(strParam) @@ -466,7 +466,7 @@ namespace BLL public static List getWorkPost(string projectId,string strParam) { List res = new List(); - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_WorkPost where strParam == null || x.WorkPostName.Contains(strParam) @@ -633,7 +633,7 @@ namespace BLL /// public static Model.BaseInfoItem getTeamGroupLeader(string teamGroupId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.ProjectData_TeamGroup join y in db.SitePerson_Person on x.GroupLeaderId equals y.PersonId @@ -651,7 +651,7 @@ namespace BLL /// public static List getWorkArea(string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.WBS_UnitWork where x.ProjectId == projectId && (unitId == null || x.UnitId == unitId) @@ -669,7 +669,7 @@ namespace BLL /// public static List getSafetyMeasures(string licenseType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_SafetyMeasures where x.LicenseType == licenseType @@ -687,7 +687,7 @@ namespace BLL /// public static List getPictureType(string menuType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_PictureType where menuType == null || x.MenuType ==menuType @@ -705,7 +705,7 @@ namespace BLL /// public static List getBase_LicenseType() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_LicenseType orderby x.LicenseTypeCode @@ -722,7 +722,7 @@ namespace BLL /// public static List getCertificate() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_Certificate orderby x.CertificateCode @@ -739,7 +739,7 @@ namespace BLL /// public static List getDepart() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_Depart orderby x.DepartCode @@ -756,7 +756,7 @@ namespace BLL /// public static List getEmergencyType() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Base_EmergencyType orderby x.EmergencyTypeCode @@ -773,7 +773,7 @@ namespace BLL /// public static List getCountry() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.RealName_Country orderby x.Name @@ -790,7 +790,7 @@ namespace BLL /// public static List getProvinceByCountry(string countryId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.RealName_City where countryId == null || countryId=="" || x.CountryId== countryId @@ -808,7 +808,7 @@ namespace BLL /// public static List getBasicDataByDictTypeCode(string dictTypeCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.RealName_BasicData where x.DictTypeCode == dictTypeCode @@ -821,7 +821,7 @@ namespace BLL public static List getProjectQuality() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.WBS_ProjectQuality orderby x.ProjectQualityType @@ -851,7 +851,7 @@ namespace BLL } public static List getProjectPersonAndSafeHour( string dateA, string dateZ) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List res = new List(); var projects = db.Base_Project.Where(x=>x.ProjectState=="1").ToList(); @@ -923,7 +923,7 @@ namespace BLL public static List getHSSEManager(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userListaq = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -944,7 +944,7 @@ namespace BLL { system = ""; } - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List list = new List(); if (!string.IsNullOrEmpty(projectId)) diff --git a/SGGL/BLL/API/APICommonService.cs b/SGGL/BLL/API/APICommonService.cs index 422de83..e7fac5d 100644 --- a/SGGL/BLL/API/APICommonService.cs +++ b/SGGL/BLL/API/APICommonService.cs @@ -28,7 +28,7 @@ namespace BLL string secret = Const.AppSecret_TCC; //string appid = "wxb5f0e8051b7b9eee"; //string secret = "626175f8860bf84beb4cf507b9445115"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getToken = db.Sys_AccessToken.FirstOrDefault(); if (getToken != null && getToken.Endtime > DateTime.Now) @@ -134,7 +134,7 @@ namespace BLL string secret = Const.AppSecret_TCC; //string appid = "wxb5f0e8051b7b9eee"; //string secret = "626175f8860bf84beb4cf507b9445115"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUser = db.Sys_User.FirstOrDefault(x => x.UserId == userId); if (getUser != null) @@ -187,7 +187,7 @@ namespace BLL /// public static void SaveFlowReceiveItem(Model.FlowReceiveItem flowReceiveItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { #region 闅愭偅鏁存敼鍗 if (flowReceiveItem.MenuId == Const.ProjectRectifyNoticeMenuId) @@ -330,7 +330,7 @@ namespace BLL /// public static void SaveSysHttpLog(string userName, string httpUrl, string logTxt) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Sys_HttpLog newLog = new Model.Sys_HttpLog() { diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index 2df45b9..cb5802f 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -19,7 +19,7 @@ namespace BLL /// public static Model.UserItem PersonLogOn(Model.UserItem userInfo) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUser = from x in db.SitePerson_Person where (x.Telephone == userInfo.Account || x.PersonName == userInfo.Account) @@ -67,7 +67,7 @@ namespace BLL /// public static Model.PersonItem getPersonByPersonId(string personId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPerson = from x in db.View_SitePerson_Person where x.PersonId == personId || x.IdentityCard == personId @@ -143,7 +143,7 @@ namespace BLL /// public static string getAttachUrl4(string personId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string returnUrl = APIUpLoadFileService.getFileUrl(personId + "#4", null); var getPersonQuality = db.QualityAudit_PersonQuality.FirstOrDefault(x => x.PersonId == personId); @@ -175,7 +175,7 @@ namespace BLL /// public static Model.PersonItem getPersonByProjectIdIdentityCard(string projectId, string identityCard) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPerson = from x in db.View_SitePerson_Person where x.ProjectId == projectId && (x.PersonId == identityCard || x.IdentityCard == identityCard) @@ -255,7 +255,7 @@ namespace BLL /// public static void getReUserPersonByPersonId(string personId, string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == personId); if (getPerson != null) @@ -277,7 +277,7 @@ namespace BLL /// public static List getPersonByProjectIdUnitId(string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var persons = from x in db.View_SitePerson_Person where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) && x.IsUsed == true @@ -341,7 +341,7 @@ namespace BLL /// public static List getPersonListByProjectIdStates(string projectId, string unitId, string states, string strUnitId, string strWorkPostId, string strParam, int pageIndex) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getViews = from x in db.SitePerson_Person where x.ProjectId == projectId && (strUnitId == null || x.UnitId == strUnitId) @@ -431,7 +431,7 @@ namespace BLL /// private static string ReturnQuality(string personId, string workPostId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string postType = ""; var workPost = db.Base_WorkPost.FirstOrDefault(x => x.WorkPostId == workPostId); @@ -479,7 +479,7 @@ namespace BLL /// public static List getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string departIds, string trainTypeId, string InTime, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { DateTime inDateTime = DateTime.Now; if (!string.IsNullOrEmpty(InTime) && !"null".Equals(InTime)) @@ -644,7 +644,7 @@ namespace BLL /// public static List getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List unitIdList = Funs.GetStrListByStr(unitIds, ','); var getPersons = from x in db.View_SitePerson_Person @@ -720,7 +720,7 @@ namespace BLL /// 浜哄憳淇℃伅 public static Model.SitePerson_Person SaveSitePerson(Model.PersonItem person) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SitePerson_Person newPerson = new Model.SitePerson_Person { @@ -1005,7 +1005,7 @@ namespace BLL /// public static void SaveSitePersonAttachment(Model.PersonItem person) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard || x.PersonId == person.PersonId); if (getPerson != null) @@ -1039,7 +1039,7 @@ namespace BLL { if (!string.IsNullOrEmpty(personId)) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == personId); @@ -1074,7 +1074,7 @@ namespace BLL { if (!string.IsNullOrEmpty(personId)) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getLists = Funs.GetStrListByStr(personId, ','); foreach (var item in getLists) @@ -1102,7 +1102,7 @@ namespace BLL { if (!string.IsNullOrEmpty(idCard)) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SitePerson_PersonInOut newInOut = new Model.SitePerson_PersonInOut { @@ -1131,7 +1131,7 @@ namespace BLL /// public static List getPersonInOutList(string projectId, string unitId, string startTime, string endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { DateTime? startTimeD = Funs.GetNewDateTime(startTime); DateTime? endTimeD = Funs.GetNewDateTime(endTime); @@ -1183,7 +1183,7 @@ namespace BLL /// public static List getPersonInOutList(string projectId, string userUnitId, string unitId, string workPostId, string strParam, string startTime, string endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { DateTime? startTimeD = Funs.GetNewDateTime(startTime); DateTime? endTimeD = Funs.GetNewDateTime(endTime); @@ -1243,7 +1243,7 @@ namespace BLL /// public static List getPersonInOutListByPersonId(string personId, string startTime, string endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { DateTime? startTimeD = Funs.GetNewDateTime(startTime); DateTime? endTimeD = Funs.GetNewDateTime(endTime); @@ -1280,7 +1280,7 @@ namespace BLL #region 鑾峰彇椤圭洰褰撴棩鍦ㄥ満浜哄憳鏁版嵁 public static IEnumerable getPersonPresenceData(string projectId, DateTime dateTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string url = ConfigurationManager.AppSettings["CEMS_IMG_URL"]; @@ -1331,7 +1331,7 @@ namespace BLL /// public static Model.PersonQualityItem getPersonQualityByIdentityCard(string identityCard, string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getLists = from y in db.SitePerson_Person join x in db.QualityAudit_PersonQuality on y.PersonId equals x.PersonId @@ -1381,7 +1381,7 @@ namespace BLL /// public static List getPersonTestRecoedByIdentityCard(string identityCard, string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getLists = from x in db.EduTrain_TrainRecordDetail join y in db.SitePerson_Person on x.PersonId equals y.PersonId @@ -1419,7 +1419,7 @@ namespace BLL /// public static List getPersonQualityByProjectIdUnitId(string projectId, string unitId, string type) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getLists = (from x in db.SitePerson_Person join y in db.QualityAudit_PersonQuality on x.PersonId equals y.PersonId @@ -1484,7 +1484,7 @@ namespace BLL /// 浜哄憳淇℃伅 public static void SavePersonQuality(Model.PersonQualityItem personQuality) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.QualityAudit_PersonQuality newPersonQuality = new Model.QualityAudit_PersonQuality { @@ -1562,7 +1562,7 @@ namespace BLL /// public static List getAbnormalPersonInOutList(string projectId, string unitId, string startTime, string endTime, string inOut, int pageIndex) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { DateTime startTimeD = Funs.GetNewDateTimeOrNow(startTime); DateTime endTimeD = Funs.GetNewDateTimeOrNow(endTime); @@ -1770,7 +1770,7 @@ namespace BLL { if (!string.IsNullOrEmpty(getPerson.IdentityCard)) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (getPerson != null) { diff --git a/SGGL/BLL/API/APIProjectService.cs b/SGGL/BLL/API/APIProjectService.cs index c3b202c..7c1f8ea 100644 --- a/SGGL/BLL/API/APIProjectService.cs +++ b/SGGL/BLL/API/APIProjectService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static List geProjectsByUserId(string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List projects = new List(); if (CommonService.IsThisUnitLeaderOfficeOrManage(userId)) @@ -49,7 +49,7 @@ namespace BLL /// public static List getALLProjectsByUserId(string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var projects = (from x in db.Project_ProjectUser join y in db.Base_Project on x.ProjectId equals y.ProjectId @@ -68,7 +68,7 @@ namespace BLL /// public static Model.ProjectItem getProjectByProjectId(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getproject = db.Base_Project.FirstOrDefault(x => x.ProjectId == projectId); return ObjectMapperManager.DefaultInstance.GetMapper().Map(getproject); diff --git a/SGGL/BLL/API/APIUnitService.cs b/SGGL/BLL/API/APIUnitService.cs index 4e1514b..e759e51 100644 --- a/SGGL/BLL/API/APIUnitService.cs +++ b/SGGL/BLL/API/APIUnitService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static Model.UnitItem getUnitByUnitId(string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUnit = db.Base_Unit.FirstOrDefault(x => x.UnitId == unitId); return ObjectMapperManager.DefaultInstance.GetMapper().Map(getUnit); @@ -30,7 +30,7 @@ namespace BLL /// public static List getUnitLists() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var units = (from x in db.Base_Unit orderby x.UnitName @@ -46,7 +46,7 @@ namespace BLL /// public static List getUnitByProjectIdUnitType(string projectId, string unitType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var units = (from x in db.Base_Unit join y in db.Project_ProjectUnit @@ -65,7 +65,7 @@ namespace BLL /// public static List getUnitByProjectIdUnitTypeQuery(string projectId, string strParam, string unitType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var units = (from x in db.Base_Unit join y in db.Project_ProjectUnit @@ -85,7 +85,7 @@ namespace BLL /// public static List getSubUnitQualityBySubUnitQualityId(string subUnitQualityId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = from x in db.QualityAudit_SubUnitQuality join y in db.Base_Unit on x.UnitId equals y.UnitId diff --git a/SGGL/BLL/API/APIUpLoadFileService.cs b/SGGL/BLL/API/APIUpLoadFileService.cs index 89a1d74..2d61f01 100644 --- a/SGGL/BLL/API/APIUpLoadFileService.cs +++ b/SGGL/BLL/API/APIUpLoadFileService.cs @@ -109,7 +109,7 @@ namespace BLL /// public static void SaveAttachUrl(Model.ToDoItem toDoItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////淇濆瓨闄勪欢 if (!string.IsNullOrEmpty(toDoItem.UrlStr)) @@ -159,7 +159,7 @@ namespace BLL public static string getFileUrl(string tokeyId, string url) { string fileUrl = url; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!string.IsNullOrEmpty(tokeyId)) { @@ -185,7 +185,7 @@ namespace BLL public static string getFileUrl(string menuId, string tokeyId, string url) { string fileUrl = url; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!string.IsNullOrEmpty(tokeyId)) { diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs index 0bf87ae..ea68395 100644 --- a/SGGL/BLL/API/APIUserService.cs +++ b/SGGL/BLL/API/APIUserService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static Model.UserItem UserLogOn(Model.UserItem userInfo) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUser = db.View_Sys_User.FirstOrDefault(x => (x.Account == userInfo.Account || x.Telephone == userInfo.Telephone) && x.IsPost == true && x.Password == Funs.EncryptionPassword(userInfo.Password)); return ObjectMapperManager.DefaultInstance.GetMapper().Map(getUser); @@ -28,7 +28,7 @@ namespace BLL /// public static Model.UserItem getUserByUserId(string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUser = db.View_Sys_User.FirstOrDefault(x => x.UserId == userId); getUser.Password = null; @@ -43,7 +43,7 @@ namespace BLL /// public static List getUserByUnitId(string unitId, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUser = (from x in db.Sys_User join y in db.Sys_Role on x.RoleId equals y.RoleId @@ -64,7 +64,7 @@ namespace BLL /// public static List getUserByProjectIdUnitIdQuery(string projectId, string unitId, string roleIds, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getDataList = new List(); HashSet userid = new HashSet(); @@ -196,7 +196,7 @@ namespace BLL /// public static List getUserByProjectIdUnitTypeQuery(string projectId, string unitType, string roleIds, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getDataList = new List(); List roleList = Funs.GetStrListByStr(roleIds, ','); @@ -235,7 +235,7 @@ namespace BLL /// public static List UserLogOn2() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var user = from x in db.Sys_User where x.IsPost == true @@ -251,7 +251,7 @@ namespace BLL /// public static void getSaveUserTel(string userId, string tel) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUser = db.Sys_User.FirstOrDefault(x => x.UserId == userId); if (getUser != null) @@ -269,7 +269,7 @@ namespace BLL /// public static void getSaveUserSignatureUrl(string userId, string SignatureUrl) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUser = db.Sys_User.FirstOrDefault(x => x.UserId == userId); if (getUser != null) @@ -287,7 +287,7 @@ namespace BLL /// public static int getMenuUnreadCount(string menuId, string projectId, string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int count = 0; var readCount = db.Sys_UserRead.Where(x => x.MenuId == menuId && x.ProjectId == projectId && x.UserId == userId).Select(x => x.DataId).Distinct().Count(); @@ -308,7 +308,7 @@ namespace BLL /// public static void getSaveUserRead(string menuId, string projectId, string userId, string dataId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userRead = db.Sys_UserRead.FirstOrDefault(x => x.ProjectId == projectId && x.UserId == userId && x.DataId == dataId); if (userRead == null) diff --git a/SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs b/SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs index ce67ab8..b38b3b5 100644 --- a/SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs +++ b/SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs @@ -11,7 +11,7 @@ namespace BLL.API.CQMS { public static bool AddInspectionManagement(InspectionManagement inspectionManagement) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.ProcessControl_InspectionManagement newInspectionManagement=null; if (!string.IsNullOrEmpty(inspectionManagement.InspectionId)) @@ -79,7 +79,7 @@ namespace BLL.API.CQMS public static List getInspectionManagementDetail(string projectId, int index, int page, string state, string name) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataList = from x in db.ProcessControl_InspectionManagementDetail where x.ProcessControl_InspectionManagement.ProjectId == projectId @@ -159,7 +159,7 @@ namespace BLL.API.CQMS } public static List getInspectionManagement(string projectId, int index, int page, string state, string name) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataList = from x in db.ProcessControl_InspectionManagement where x.ProjectId == projectId @@ -237,7 +237,7 @@ namespace BLL.API.CQMS public static List getInspectionManagementDetailByinspectionId(string inspectionId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataList = from x in db.ProcessControl_InspectionManagementDetail where x.InspectionId == inspectionId diff --git a/SGGL/BLL/API/CQMS/BreakdownProjectService.cs b/SGGL/BLL/API/CQMS/BreakdownProjectService.cs index f0c793d..aaea267 100644 --- a/SGGL/BLL/API/CQMS/BreakdownProjectService.cs +++ b/SGGL/BLL/API/CQMS/BreakdownProjectService.cs @@ -12,7 +12,7 @@ namespace BLL.API.CQMS public static List getBreakdowns(string projectId, string keyWord) { List res = new List(); - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.View_WBS_BreakdownProject where x.ProjectId == projectId && x.IsSelected==true diff --git a/SGGL/BLL/API/HJGL/APIElectrodeRecoveryService.cs b/SGGL/BLL/API/HJGL/APIElectrodeRecoveryService.cs index 5ad0ca8..cb43724 100644 --- a/SGGL/BLL/API/HJGL/APIElectrodeRecoveryService.cs +++ b/SGGL/BLL/API/HJGL/APIElectrodeRecoveryService.cs @@ -12,7 +12,7 @@ namespace BLL.API.HJGL public static void AddElectrodeRecovery(ElectrodeRecoveryItem electrodeRecoveryItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.HJGL_ElectrodeRecovery newElectrodeRecovery = new Model.HJGL_ElectrodeRecovery(); //newElectrodeRecovery.RecoveryId = electrodeRecoveryItem.RecoveryId; @@ -37,7 +37,7 @@ namespace BLL.API.HJGL } public static void UpdateElectrodeRecovery(ElectrodeRecoveryItem electrodeRecoveryItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.HJGL_ElectrodeRecovery newElectrodeRecovery = db.HJGL_ElectrodeRecovery.FirstOrDefault(x => x.ElectrodeRecoveryId == electrodeRecoveryItem.RecoveryId); //newElectrodeRecovery.ElectrodeRecoveryId = electrodeRecoveryItem.RecoveryId; @@ -63,7 +63,7 @@ namespace BLL.API.HJGL public static List GetListData(string projectId, int index, int page, string name) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = from u in db.HJGL_ElectrodeRecovery where u.ProjectId == projectId diff --git a/SGGL/BLL/API/HJGL/APIHotProcessHardService.cs b/SGGL/BLL/API/HJGL/APIHotProcessHardService.cs index a710690..6f07b01 100644 --- a/SGGL/BLL/API/HJGL/APIHotProcessHardService.cs +++ b/SGGL/BLL/API/HJGL/APIHotProcessHardService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static List getHotProessTrustNo(string unitWrokId,string hotProessTrustNo) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataLists = from x in db.HJGL_HotProess_Trust select x; @@ -48,7 +48,7 @@ namespace BLL /// public static List getHardTrustNo(string unitWrokId,string hardTrustNo) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataLists = from x in db.HJGL_Hard_Trust select x; @@ -80,7 +80,7 @@ namespace BLL /// public static List getHotProcessItem(string hotProessTrustId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.View_HJGL_HotProess_TrustItem where x.HotProessTrustId == hotProessTrustId @@ -109,7 +109,7 @@ namespace BLL /// public static List getHardTrustItem(string hardTrustId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.View_HJGL_Hard_TrustItem where x.HardTrustID == hardTrustId @@ -136,7 +136,7 @@ namespace BLL /// public static List GetHardNoPassWarning(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_Hard_TrustItem join y in db.HJGL_Hard_Trust on x.HardTrustID equals y.HardTrustID diff --git a/SGGL/BLL/API/HJGL/APINDETrustService.cs b/SGGL/BLL/API/HJGL/APINDETrustService.cs index b9253da..3c96c1b 100644 --- a/SGGL/BLL/API/HJGL/APINDETrustService.cs +++ b/SGGL/BLL/API/HJGL/APINDETrustService.cs @@ -19,7 +19,7 @@ namespace BLL /// public static List getAutoPointBatchCode(string unitWorkId,string detectionTypeId,string detectionRateId, string pointBatchCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataList = from x in db.HJGL_Batch_PointBatch where x.UnitWorkId == unitWorkId && x.EndDate == null @@ -60,7 +60,7 @@ namespace BLL /// public static List getPointBatchCode(string unitWorkId, string detectionTypeId, string detectionRateId, string pointBatchCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataList = from x in db.HJGL_Batch_PointBatch join y in db.HJGL_Batch_PointBatchItem on x.PointBatchId equals y.PointBatchId @@ -101,7 +101,7 @@ namespace BLL /// public static List getPointBatchDetail(string pointBatchId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_Batch_PointBatchItem join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId @@ -129,7 +129,7 @@ namespace BLL /// public static List getPointWeldJoint(string pointBatchId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_Batch_PointBatchItem join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId @@ -157,7 +157,7 @@ namespace BLL /// public static List getPointWeldJoint(string pointBatchId, string weldJointId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId); @@ -227,7 +227,7 @@ namespace BLL /// public static List GetPointWeldJointList(string unitWorkId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_Batch_PointBatchItem join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId @@ -255,7 +255,7 @@ namespace BLL /// public static void GenerateTrust(string unitWorkId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getViewGenerateTrustLists = (from x in db.View_GenerateTrust where x.UnitWorkId == unitWorkId select x).ToList(); @@ -349,7 +349,7 @@ namespace BLL /// public static List getBatchTrustCode(string unitWorkId, string detectionTypeId, string detectionRateId, bool? isAudit ,string trustBatchCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataList = from x in db.HJGL_Batch_BatchTrust where x.UnitWorkId == unitWorkId @@ -398,7 +398,7 @@ namespace BLL /// public static List GetBatchTrustDetail(string trustBatchId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_Batch_BatchTrustItem join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId @@ -438,7 +438,7 @@ namespace BLL /// public static List getBatchNdeCode(string unitWorkId, string detectionTypeId, string ndeCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataList = from x in db.HJGL_Batch_NDE join y in db.HJGL_Batch_BatchTrust on x.TrustBatchId equals y.TrustBatchId @@ -478,7 +478,7 @@ namespace BLL /// public static List GetBatchNDEDetail(string ndeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_Batch_NDEItem join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId @@ -510,7 +510,7 @@ namespace BLL /// public static List GetRepairRecord(string unitWorkId, bool isAudit, string repairRecordCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var repair = (from x in db.HJGL_RepairRecord where x.UnitWorkId == unitWorkId @@ -547,7 +547,7 @@ namespace BLL /// public static Model.WeldJointItem GetRepairInfoByRepairRecordId(string repairRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_RepairRecord join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId @@ -577,7 +577,7 @@ namespace BLL /// public static List GetRepairExpDetail(string repairRecordId, bool welder, bool pipeLine, bool daily, bool repairBefore, bool mat, bool spec) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var record = BLL.RepairRecordService.GetRepairRecordById(repairRecordId); var jot = BLL.WeldJointService.GetViewWeldJointById(record.WeldJointId); @@ -651,7 +651,7 @@ namespace BLL /// 鏄惁鍒囬櫎 public static void GetRepairExpSaveInfo(string repairRecordId, string expandId, string repairWelder, string repairDate, bool isCut) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.HJGL_RepairRecord repairRecord = BLL.RepairRecordService.GetRepairRecordById(repairRecordId); // 鏇存柊杩斾慨璁板綍 @@ -717,7 +717,7 @@ namespace BLL /// public static void RepairAudit(string repairRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { // 鏇存柊杩斾慨璁板綍 var repair = db.HJGL_RepairRecord.FirstOrDefault(x => x.RepairRecordId == repairRecordId); @@ -738,7 +738,7 @@ namespace BLL /// public static string GenerateRepairTrust(string repairRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string submitStr = string.Empty; Model.HJGL_RepairRecord repairRecord = BLL.RepairRecordService.GetRepairRecordById(repairRecordId); @@ -846,7 +846,7 @@ namespace BLL /// public static List GetNdeCheckNoPassWarn(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var onecheckNoPass = (from x in db.HJGL_Batch_NDEItem join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId @@ -892,7 +892,7 @@ namespace BLL /// public static List GetNoTrustJointWarn(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var point = (from x in db.HJGL_Batch_PointBatchItem join y in db.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId @@ -930,7 +930,7 @@ namespace BLL /// public static List GetNoCheckJointWarn(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_Batch_BatchTrustItem join y in db.HJGL_Batch_BatchTrust on x.TrustBatchId equals y.TrustBatchId diff --git a/SGGL/BLL/API/HJGL/APIPipeJointService.cs b/SGGL/BLL/API/HJGL/APIPipeJointService.cs index 7387bb2..85525f3 100644 --- a/SGGL/BLL/API/HJGL/APIPipeJointService.cs +++ b/SGGL/BLL/API/HJGL/APIPipeJointService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static List getPipelineList(string unitWrokId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_Pipeline where x.UnitWorkId == unitWrokId @@ -42,7 +42,7 @@ namespace BLL /// public static List GetWeldJointList(string pipeLineId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = (from x in db.View_HJGL_NoWeldJointFind where x.PipelineId == pipeLineId @@ -69,7 +69,7 @@ namespace BLL /// public static List GetAllWeldJointList(string pipeLineId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HJGL_WeldJoint where x.PipelineId == pipeLineId @@ -93,7 +93,7 @@ namespace BLL /// public static List getWelderList(string unitWorkId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var p = db.WBS_UnitWork.Where(x => x.UnitWorkId == unitWorkId).FirstOrDefault(); var getDataLists = (from x in db.SitePerson_Person @@ -119,7 +119,7 @@ namespace BLL /// public static Model.WeldJointItem getWeldJointInfo(string weldJointId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDateInfo = from x in db.HJGL_WeldJoint where x.WeldJointId == weldJointId @@ -172,7 +172,7 @@ namespace BLL /// public static Model.WeldJointItem getWeldJointByIdentify(string weldJointIdentify) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDateInfo = from x in db.HJGL_WeldJoint join y in db.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId @@ -212,7 +212,7 @@ namespace BLL /// public static void SavePipeWeldJoint(Model.WeldJointItem addItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string projectId = string.Empty; string unitId = string.Empty; @@ -369,7 +369,7 @@ namespace BLL /// public static void SavePreWeldingDaily(Model.WeldJointItem addItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string projectId = string.Empty; string unitId = string.Empty; diff --git a/SGGL/BLL/API/HJGL/APIPreWeldingDailyService.cs b/SGGL/BLL/API/HJGL/APIPreWeldingDailyService.cs index 80dc8a7..1b2ff9b 100644 --- a/SGGL/BLL/API/HJGL/APIPreWeldingDailyService.cs +++ b/SGGL/BLL/API/HJGL/APIPreWeldingDailyService.cs @@ -20,7 +20,7 @@ namespace BLL /// public static Model.HJGL_PreWeldingDailyItem getPreWeldingDailyInfo(string preWeldingDailyId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.HJGL_PreWeldingDaily where x.PreWeldingDailyId == preWeldingDailyId @@ -46,7 +46,7 @@ namespace BLL /// public static List getPreWeldingDailyList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getList = from x in db.HJGL_PreWeldingDaily where x.ProjectId == projectId @@ -73,7 +73,7 @@ namespace BLL /// public static void SavePreWeldingDaily(Model.HJGL_PreWeldingDailyItem newItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_PreWeldingDaily newP= new Model.HJGL_PreWeldingDaily { PreWeldingDailyId = newItem.PreWeldingDailyId, diff --git a/SGGL/BLL/API/HJGL/APIReportQueryService.cs b/SGGL/BLL/API/HJGL/APIReportQueryService.cs index fa0bb52..139915d 100644 --- a/SGGL/BLL/API/HJGL/APIReportQueryService.cs +++ b/SGGL/BLL/API/HJGL/APIReportQueryService.cs @@ -18,7 +18,7 @@ namespace BLL /// public static Model.WelderPerformanceItem GetWelderPerformanceByQRC(string personId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { // todo 浜岀淮鐮佸垎瑙ｅ緟鍋 var getDataLists = from x in db.View_WelderPerformance @@ -46,7 +46,7 @@ namespace BLL private static string GetWeldAvgNum(string personId,decimal totalDin) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string vagDin = string.Empty; var date = from x in db.HJGL_WeldJoint @@ -75,7 +75,7 @@ namespace BLL /// public static Model.WelderPerformanceItem GetWelderPerformanceByWelderCode(string projectId,string welderCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { // todo 浜岀淮鐮佸垎瑙ｅ緟鍋 var getDataLists = from x in db.View_WelderPerformance @@ -109,7 +109,7 @@ namespace BLL /// public static List getWelderQualify(string personId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Welder_WelderQualify where x.WelderId == personId @@ -134,7 +134,7 @@ namespace BLL /// public static List GetWelderQualifyWarning(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var welder = from x in db.SitePerson_Person where x.ProjectId == projectId && x.WorkPostId == Const.WorkPost_Welder @@ -247,7 +247,7 @@ namespace BLL /// public static Model.JointCompreInfoItem GetJointCompreInfo(string weldJointId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDateInfo = from x in db.View_HJGL_WeldJoint where x.WeldJointId == weldJointId diff --git a/SGGL/BLL/API/HJGL/APITestPackageService.cs b/SGGL/BLL/API/HJGL/APITestPackageService.cs index 05c316b..48a02a2 100644 --- a/SGGL/BLL/API/HJGL/APITestPackageService.cs +++ b/SGGL/BLL/API/HJGL/APITestPackageService.cs @@ -20,7 +20,7 @@ namespace BLL /// public static List getTestPackageNo(string unitWorkId, bool isFinish, string testPackageNo) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var dataList = from x in db.PTP_TestPackage where x.UnitWorkId == unitWorkId @@ -60,7 +60,7 @@ namespace BLL /// public static List GetTestPackageDetail(string ptp_Id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { //var getDataLists = (from x in db.View_PTP_TestPackageAudit // where x.PTP_ID == ptp_Id @@ -91,7 +91,7 @@ namespace BLL /// public static List GetCanTestPackageWarning(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List canTest = new List(); // 鑾峰彇椤圭洰涓湭瀹屾垚鐨勮瘯鍘嬪寘 diff --git a/SGGL/BLL/API/HJGL/APIWelderEntranceService.cs b/SGGL/BLL/API/HJGL/APIWelderEntranceService.cs index 6f514b4..be81004 100644 --- a/SGGL/BLL/API/HJGL/APIWelderEntranceService.cs +++ b/SGGL/BLL/API/HJGL/APIWelderEntranceService.cs @@ -17,7 +17,7 @@ namespace BLL public static List GetWelderList(string projectId, int index, int page, string name) { List res = new List(); - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.BS_Welder_Entrance where x.ProjectId == projectId @@ -75,7 +75,7 @@ namespace BLL /// public static WelderEntrance GetWelderById(string welderId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var item = db.BS_Welder_Entrance.FirstOrDefault(e => e.WED_ID == welderId); @@ -123,7 +123,7 @@ namespace BLL /// public static void AddBSWelder(WelderEntrance welder) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.BS_Welder_Entrance newWelder = new Model.BS_Welder_Entrance(); newWelder.WED_ID = welder.WED_ID; @@ -152,7 +152,7 @@ namespace BLL /// public static void UpdateBSWelder(WelderEntrance welder) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.BS_Welder_Entrance newWelder = db.BS_Welder_Entrance.FirstOrDefault(e => e.WED_ID == welder.WED_ID); if (newWelder != null) @@ -216,7 +216,7 @@ namespace BLL /// true-瀛樺湪锛宖alse-涓嶅瓨鍦 public static bool IsExistWEDName(string WED_Name, string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.BS_Welder_Entrance where x.WED_Name == WED_Name && x.ProjectId == projectId select x; if (q.Count() > 0) @@ -238,7 +238,7 @@ namespace BLL /// true-瀛樺湪锛宖alse-涓嶅瓨鍦 public static bool IsExistWEDCode(string WED_Code, string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.BS_Welder_Entrance where x.WED_Code == WED_Code && x.ProjectId == projectId select x; if (q.Count() > 0) @@ -258,7 +258,7 @@ namespace BLL /// public static void DeleteBSWelder(string WED_ID) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.BS_Welder_Entrance welder = db.BS_Welder_Entrance.FirstOrDefault(e => e.WED_ID == WED_ID); if (welder != null) diff --git a/SGGL/BLL/API/HJGL/APIWelderService.cs b/SGGL/BLL/API/HJGL/APIWelderService.cs index 7019092..4ada818 100644 --- a/SGGL/BLL/API/HJGL/APIWelderService.cs +++ b/SGGL/BLL/API/HJGL/APIWelderService.cs @@ -12,7 +12,7 @@ namespace BLL.API.HJGL { public static WelderItem GetWelderByIdCard(string idCard, string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { WelderItem item = new WelderItem(); var welder = db.BS_Welder.Where(u => u.IdentityCard == idCard && u.ProjectId == projectId).FirstOrDefault(); @@ -57,7 +57,7 @@ namespace BLL.API.HJGL public static List GetWelderMethod(string welderId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var items = from x in db.BS_WeldMethodItem where x.WED_ID == welderId select x.WME_ID; var methods = from m in db.Base_WeldingMethod @@ -77,7 +77,7 @@ namespace BLL.API.HJGL public static List GetWelderBSSteel(string welderId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var itemsSteel = from x in db.BS_WelderItem where x.WED_ID == welderId select x.STE_ID; var steel = from x in db.BS_Steel @@ -98,7 +98,7 @@ namespace BLL.API.HJGL public static List GetConsumables() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var steel = from x in db.Base_Consumables select new ConsumablesItem diff --git a/SGGL/BLL/API/HSSE/APIBonusScoreSelfManagementService.cs b/SGGL/BLL/API/HSSE/APIBonusScoreSelfManagementService.cs index d9cbd89..914144e 100644 --- a/SGGL/BLL/API/HSSE/APIBonusScoreSelfManagementService.cs +++ b/SGGL/BLL/API/HSSE/APIBonusScoreSelfManagementService.cs @@ -21,7 +21,7 @@ namespace BLL /// public static List getTrainingPlanListByProjectIdTrainTypeIdTrainStates(string projectId, string trainTypeId, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_Plan where x.ProjectId == projectId && (x.States == states || states == null) && x.TrainTypeId == trainTypeId @@ -59,7 +59,7 @@ namespace BLL /// public static Model.TrainingPlanItem getTrainingPlanByTrainingId(string planId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_Plan where x.PlanId == planId @@ -101,7 +101,7 @@ namespace BLL /// 鍩硅璁″垝浜哄憳 public static List getTrainingPlanItemListByTrainingPlanId(string trainingPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_PlanItem join y in db.Training_CompanyTraining on x.CompanyTrainingId equals y.CompanyTrainingId @@ -133,7 +133,7 @@ namespace BLL /// 鍩硅鏁欐潗绫诲瀷list public static void SaveTrainingPlan(Model.TrainingPlanItem trainingPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Training_Plan newTrainingPlan = new Model.Training_Plan { @@ -283,7 +283,7 @@ namespace BLL /// public static void AddTraining_Task(List trainingTasks, string planId, string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in trainingTasks) { @@ -311,7 +311,7 @@ namespace BLL /// public static void AddTraining_PlanItem(List trainingPlanItems, string planId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in trainingPlanItems) { diff --git a/SGGL/BLL/API/HSSE/APIChartAnalysisService.cs b/SGGL/BLL/API/HSSE/APIChartAnalysisService.cs index ccc58d2..625f419 100644 --- a/SGGL/BLL/API/HSSE/APIChartAnalysisService.cs +++ b/SGGL/BLL/API/HSSE/APIChartAnalysisService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static List getChartAnalysisByType(string projectId, string type, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getDataLists = new List(); var getHazardRegister = from x in db.HSSE_Hazard_HazardRegister diff --git a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs index 7a1826d..fdf3d98 100644 --- a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs +++ b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.CheckSpecialItem getCheckSpecialById(string CheckSpecialId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_CheckSpecial where x.CheckSpecialId == CheckSpecialId @@ -80,7 +80,7 @@ namespace BLL /// public static List getCheckSpecialList(string projectId, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getCheckSpecial = from x in db.Check_CheckSpecial where x.ProjectId == projectId && x.States ==states @@ -145,7 +145,7 @@ namespace BLL /// public static string SaveCheckSpecial(Model.CheckSpecialItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string message = string.Empty; Model.Check_CheckSpecial newCheckSpecial = new Model.Check_CheckSpecial @@ -255,7 +255,7 @@ namespace BLL /// public static List getCheckSpecialDetailList(string checkSpecialId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_CheckSpecialDetail where x.CheckSpecialId == checkSpecialId @@ -309,7 +309,7 @@ namespace BLL /// public static Model.CheckSpecialDetailItem getCheckSpecialDetailById(string checkSpecialDetailId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_CheckSpecialDetail where x.CheckSpecialDetailId == checkSpecialDetailId @@ -348,7 +348,7 @@ namespace BLL /// public static void SaveCheckSpecialDetail(Model.CheckSpecialDetailItem newDetail) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!string.IsNullOrEmpty(newDetail.CheckSpecialId)) { diff --git a/SGGL/BLL/API/HSSE/APIConstructSolutionService.cs b/SGGL/BLL/API/HSSE/APIConstructSolutionService.cs index 2da849f..e5b618e 100644 --- a/SGGL/BLL/API/HSSE/APIConstructSolutionService.cs +++ b/SGGL/BLL/API/HSSE/APIConstructSolutionService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.ConstructSolutionItem getConstructSolutionByConstructSolutionId(string constructSolutionId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Solution_ConstructSolution where x.ConstructSolutionId == constructSolutionId @@ -56,7 +56,7 @@ namespace BLL /// public static List getConstructSolutionList(string projectId, string unitId, string strParam, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getConstructSolution = from x in db.Solution_ConstructSolution where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) @@ -96,7 +96,7 @@ namespace BLL /// public static void SaveConstructSolution(Model.ConstructSolutionItem newItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_ConstructSolution newConstructSolution = new Model.Solution_ConstructSolution { ConstructSolutionId = newItem.ConstructSolutionId, diff --git a/SGGL/BLL/API/HSSE/APIEmergencyService.cs b/SGGL/BLL/API/HSSE/APIEmergencyService.cs index 7d94612..5c08566 100644 --- a/SGGL/BLL/API/HSSE/APIEmergencyService.cs +++ b/SGGL/BLL/API/HSSE/APIEmergencyService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.FileInfoItem getEmergencyListByEmergencyListId(string emergencyListId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Emergency_EmergencyList where x.EmergencyListId == emergencyListId @@ -58,7 +58,7 @@ namespace BLL /// public static List getEmergencyList(string projectId, string unitId, string states, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = from x in db.Emergency_EmergencyList where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) @@ -100,7 +100,7 @@ namespace BLL /// public static Model.FileInfoItem getEmergencySupplyByEmergencySupplyId(string emergencySupplyId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Emergency_EmergencySupply where x.FileId == emergencySupplyId @@ -136,7 +136,7 @@ namespace BLL /// public static List getEmergencySupplyList(string projectId, string unitId, string states, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = from x in db.Emergency_EmergencySupply where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) @@ -172,7 +172,7 @@ namespace BLL /// public static Model.FileInfoItem getEmergencyTeamAndTrainByEmergencyTeamAndTrainId(string emergencyTeamAndTrainId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Emergency_EmergencyTeamAndTrain where x.FileId == emergencyTeamAndTrainId @@ -204,7 +204,7 @@ namespace BLL /// public static List getEmergencyTeamItems(string fileId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Emergency_EmergencyTeamItem where x.FileId == fileId @@ -232,7 +232,7 @@ namespace BLL /// public static List getEmergencyTeamAndTrainList(string projectId, string unitId,string states, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = from x in db.Emergency_EmergencyTeamAndTrain where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) @@ -268,7 +268,7 @@ namespace BLL /// public static void SaveEmergency(Model.FileInfoItem emergencyInfo) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string menuId = string.Empty; if (emergencyInfo.MenuType == "1") @@ -460,7 +460,7 @@ namespace BLL ///// //public static Model.EmergencyProcessItem getEmergencyProcessItem(string projectId, string processSteps) //{ - // using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + // using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) // { // var getDataList = (from x in db.Emergency_EmergencyProcess // where x.ProjectId == projectId && x.ProcessSteps == processSteps @@ -501,7 +501,7 @@ namespace BLL /// public static List getEmergencyProcessList(string projectId, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = from x in db.Emergency_EmergencyProcess where x.ProjectId == projectId @@ -530,7 +530,7 @@ namespace BLL /// public static List getEmergencyProcessItem(string projectId, string processSteps) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getDataList = new List(); var getEmergencyProcess = db.Emergency_EmergencyProcess.FirstOrDefault(x => x.ProjectId == projectId && x.ProcessSteps == processSteps); diff --git a/SGGL/BLL/API/HSSE/APIEquipmentQualityService.cs b/SGGL/BLL/API/HSSE/APIEquipmentQualityService.cs index 57ebad4..caadbd1 100644 --- a/SGGL/BLL/API/HSSE/APIEquipmentQualityService.cs +++ b/SGGL/BLL/API/HSSE/APIEquipmentQualityService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.EquipmentQualityItem getEquipmentQualityByEquipmentQualityIdFactoryCode(string equipmentQualityId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getEquipmentQuality = (from x in db.View_QualityAudit_EquipmentQuality where x.EquipmentQualityId == equipmentQualityId || x.FactoryCode == equipmentQualityId @@ -60,7 +60,7 @@ namespace BLL /// public static List getEquipmentQualityList(string projectId, string unitId, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getEquipmentQuality = from x in db.View_QualityAudit_EquipmentQuality where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) @@ -103,7 +103,7 @@ namespace BLL /// public static void SaveEquipmentQuality(Model.EquipmentQualityItem newItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentQuality newEquipmentQuality = new Model.QualityAudit_EquipmentQuality { EquipmentQualityId = newItem.EquipmentQualityId, diff --git a/SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs b/SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs index 458e649..561c180 100644 --- a/SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs +++ b/SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.EquipmentQualityItem getEquipmentQualityByEquipmentQualityIdFactoryCode(string equipmentQualityId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getEquipmentQuality = (from x in db.View_QualityAudit_GeneralEquipmentQuality where x.GeneralEquipmentQualityId == equipmentQualityId @@ -53,7 +53,7 @@ namespace BLL /// public static List getEquipmentQualityList(string projectId, string unitId, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getEquipmentQuality = from x in db.View_QualityAudit_GeneralEquipmentQuality where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) @@ -89,7 +89,7 @@ namespace BLL /// public static void SaveEquipmentQuality(Model.EquipmentQualityItem newItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_GeneralEquipmentQuality newEquipmentQuality = new Model.QualityAudit_GeneralEquipmentQuality { GeneralEquipmentQualityId = newItem.EquipmentQualityId, diff --git a/SGGL/BLL/API/HSSE/APIGoodsManageService.cs b/SGGL/BLL/API/HSSE/APIGoodsManageService.cs index 3f780a4..7917911 100644 --- a/SGGL/BLL/API/HSSE/APIGoodsManageService.cs +++ b/SGGL/BLL/API/HSSE/APIGoodsManageService.cs @@ -20,7 +20,7 @@ namespace BLL /// 鐗╄川鍑洪棬璇︾粏 public static Model.GoodsManageItem getGoodsManageById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.GoodsManageItem getGoodsItem = new Model.GoodsManageItem(); var getData = db.CostGoods_GoodsManage.FirstOrDefault(x => x.GoodsManageId == id); @@ -72,7 +72,7 @@ namespace BLL /// public static List getItemList(string goodsManageId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.CostGoods_GoodsManageItem where x.GoodsManageId == goodsManageId @@ -96,7 +96,7 @@ namespace BLL /// public static List getFlowOperateItemList(string goodsManageId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.CostGoods_GoodsManageFlowOperate where x.GoodsManageId == goodsManageId @@ -125,7 +125,7 @@ namespace BLL /// public static Model.CostGoods_GoodsManageFlowOperate getFlowOperate(string goodsManageId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.CostGoods_GoodsManageFlowOperate where x.GoodsManageId == goodsManageId && !x.OperaterTime.HasValue @@ -143,7 +143,7 @@ namespace BLL /// public static Model.CostGoods_GoodsManageFlowOperate getNextFlowOperate(string goodsManageId,int sortIndex) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.CostGoods_GoodsManageFlowOperate where x.GoodsManageId == goodsManageId && x.SortIndex == sortIndex +1 @@ -172,7 +172,7 @@ namespace BLL /// public static List getGoodsManageByProjectIdStates(string projectId, string states, int pageIndex) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = from x in db.CostGoods_GoodsManage where x.ProjectId == projectId @@ -226,7 +226,7 @@ namespace BLL /// public static void SaveGoodsManage(Model.GoodsManageItem goodsManage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_GoodsManage newGoods = new Model.CostGoods_GoodsManage { GoodsManageId = goodsManage.GoodsManageId, diff --git a/SGGL/BLL/API/HSSE/APIHSEDiaryService.cs b/SGGL/BLL/API/HSSE/APIHSEDiaryService.cs index d652bca..659adca 100644 --- a/SGGL/BLL/API/HSSE/APIHSEDiaryService.cs +++ b/SGGL/BLL/API/HSSE/APIHSEDiaryService.cs @@ -19,7 +19,7 @@ namespace BLL /// public static Model.HSEDiaryItem getHSEDiary(string projectId, string userId, string diaryDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { DateTime? getDiaryDate = Funs.GetNewDateTime(diaryDate); Model.HSEDiaryItem getItem = new Model.HSEDiaryItem(); @@ -63,7 +63,7 @@ namespace BLL /// public static List ReturnFlowOperteList(string getProjectId, string getUserId, DateTime getDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Sys_FlowOperate where x.ProjectId == getProjectId && x.OperaterId == getUserId && x.IsClosed == true @@ -82,7 +82,7 @@ namespace BLL /// public static List getHSEDiaryList(string projectId, string userId, string diaryDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { DateTime? getDiaryDate = Funs.GetNewDateTime(diaryDate); var getDataList = from x in db.Project_HSEDiary @@ -112,7 +112,7 @@ namespace BLL public static void SaveHSEDiary(Model.HSEDiaryItem item) { DeleteHSEDiary(item.HSEDiaryId); - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Project_HSEDiary newHSEDiary = new Model.Project_HSEDiary { @@ -149,7 +149,7 @@ namespace BLL /// public static void DeleteHSEDiary(string hseDiaryId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = db.Project_HSEDiary.FirstOrDefault(x => x.HSEDiaryId == hseDiaryId); if (getInfo != null) @@ -166,7 +166,7 @@ namespace BLL /// public static string getValues1(List getFlowOperteList, string getProjectId, string getUserId, DateTime getDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strValues = string.Empty; var getRegister = (from x in db.HSSE_Hazard_HazardRegister @@ -210,7 +210,7 @@ namespace BLL /// public static string getValues2(List getFlowOperteList, string getProjectId, string getUserId, DateTime getDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strValues = string.Empty; var getCHeck = from x in db.Check_RectifyNotices @@ -250,7 +250,7 @@ namespace BLL /// public static string getValues3(List getFlowOperteList, string getProjectId, string getUserId, DateTime getDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strValues = string.Empty; var getLicense = from x in db.License_FlowOperate @@ -355,7 +355,7 @@ namespace BLL /// public static string getValues6(List getFlowOperteList, string getProjectId, string getUserId, DateTime getDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strValues = string.Empty; var getCompileCount = (from x in db.Emergency_EmergencyList @@ -393,7 +393,7 @@ namespace BLL /// public static string getValues7(List getFlowOperteList, string getProjectId, string getUserId, DateTime getDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strValues = string.Empty; var getFlows = getFlowOperteList.Where(x => x.MenuId == Const.ProjectTrainRecordMenuId).ToList(); @@ -426,7 +426,7 @@ namespace BLL /// public static string getValues8(List getFlowOperteList, string getProjectId, string getUserId, DateTime getDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strValues = string.Empty; var getClassMeeting = getFlowOperteList.Where(x => x.MenuId == Const.ProjectClassMeetingMenuId).Count(); diff --git a/SGGL/BLL/API/HSSE/APIHazardListService.cs b/SGGL/BLL/API/HSSE/APIHazardListService.cs index cdb376e..27890fe 100644 --- a/SGGL/BLL/API/HSSE/APIHazardListService.cs +++ b/SGGL/BLL/API/HSSE/APIHazardListService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.HazardListItem getHazardListInfoByHazardListId(string hazardListId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Hazard_HazardList where x.HazardListId == hazardListId @@ -53,7 +53,7 @@ namespace BLL /// public static List getHazardListList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getHazardList = from x in db.Hazard_HazardList where x.ProjectId == projectId && x.States == Const.State_2 @@ -89,7 +89,7 @@ namespace BLL /// public static List getHazardListSelectedInfo(string hazardListId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getHazardList = from x in db.Hazard_HazardSelectedItem join y in db.Technique_HazardListType on x.HazardListTypeId equals y.HazardListTypeId @@ -125,7 +125,7 @@ namespace BLL /// public static List getRiskLevel() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getRiskLevel = from x in db.Base_RiskLevel orderby x.RiskLevel @@ -148,7 +148,7 @@ namespace BLL /// public static List getHazardItemInfo(string hazardSelectedItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getHazardList = from x in db.Hazard_HazardSelectedItem join y in db.Technique_HazardListType on x.HazardListTypeId equals y.HazardListTypeId @@ -190,7 +190,7 @@ namespace BLL public static string SaveRoutingInspection(Model.RoutingInspectionItem newDetail) { string message = string.Empty; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var oldP = db.Hazard_PatrolPlan.FirstOrDefault(x => x.HazardSelectedItemId == newDetail.HazardSelectedItemId && x.CheckDate == null); if (oldP != null) @@ -311,7 +311,7 @@ namespace BLL /// public static List getReEvaluatorInfo(string LECItemRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getHazardList = from x in db.Hazard_RiskEvaluationRecord where x.LECItemRecordId == LECItemRecordId @@ -334,7 +334,7 @@ namespace BLL /// public static void SaveReEvaluator(Model.ReEvaluator newDetail) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Hazard_HazardSelectedItem item = BLL.Hazard_HazardSelectedItemService.GetHazardSelectedItemByHazardSelectedItemId(newDetail.HazardSelectedItemId); if (item != null) @@ -425,7 +425,7 @@ namespace BLL /// public static List getRoutingInspectionList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getHazardList = from x in db.Hazard_RoutingInspection join y in db.Hazard_HazardSelectedItem on x.HazardSelectedItemId equals y.HazardSelectedItemId @@ -482,7 +482,7 @@ namespace BLL /// public static List getRoutingInspection(string routingInspectionId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getHazardList = from x in db.Hazard_RoutingInspection join y in db.Hazard_HazardSelectedItem on x.HazardSelectedItemId equals y.HazardSelectedItemId diff --git a/SGGL/BLL/API/HSSE/APIHazardRealTimeService.cs b/SGGL/BLL/API/HSSE/APIHazardRealTimeService.cs index 2dad221..1a7126a 100644 --- a/SGGL/BLL/API/HSSE/APIHazardRealTimeService.cs +++ b/SGGL/BLL/API/HSSE/APIHazardRealTimeService.cs @@ -15,7 +15,7 @@ namespace BLL /// public static string SaveHazardRealTime(Model.Hazard_RealTimeItem newDetail) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Hazard_RealTimeDevice realTimeDevice = db.Hazard_RealTimeDevice.FirstOrDefault(x => x.BitNum == newDetail.BitNum); if (realTimeDevice == null) diff --git a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs index c60e060..d2d13d9 100644 --- a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs +++ b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static Model.HazardRegisterItem getHazardRegisterByHazardRegisterId(string hazardRegisterId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getHazardRegister = db.View_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == hazardRegisterId); return ObjectMapperManager.DefaultInstance.GetMapper().Map(getHazardRegister); @@ -31,7 +31,7 @@ namespace BLL /// public static List getHazardRegisterByProjectIdStates(string projectId, string states, int pageIndex) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var hazardRegisters = (from x in db.View_Hazard_HazardRegister where x.ProjectId == projectId && (x.States == states || states == null) @@ -48,7 +48,7 @@ namespace BLL /// public static void SaveHazardRegister(Model.HazardRegisterItem hazardRegister) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.HSSE_Hazard_HazardRegister newHazardRegister = new Model.HSSE_Hazard_HazardRegister { @@ -162,7 +162,7 @@ namespace BLL unitId = getUnit.UnitId; unitName = getUnit.UnitName; } - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var hazardRegisters = (from x in db.HSSE_Hazard_HazardRegister join y in db.Base_Project on x.ProjectId equals y.ProjectId diff --git a/SGGL/BLL/API/HSSE/APIIncentiveNoticeService.cs b/SGGL/BLL/API/HSSE/APIIncentiveNoticeService.cs index 68d01a4..72dc0ca 100644 --- a/SGGL/BLL/API/HSSE/APIIncentiveNoticeService.cs +++ b/SGGL/BLL/API/HSSE/APIIncentiveNoticeService.cs @@ -20,7 +20,7 @@ namespace BLL /// public static Model.IncentiveNoticeItem getIncentiveNoticeById(string incentiveNoticeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_IncentiveNotice where x.IncentiveNoticeId == incentiveNoticeId @@ -69,7 +69,7 @@ namespace BLL /// public static List getIncentiveNoticeList(string projectId, string unitId, string strParam, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getIncentiveNotice = from x in db.Check_IncentiveNotice where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) @@ -119,7 +119,7 @@ namespace BLL /// public static void SaveIncentiveNotice(Model.IncentiveNoticeItem newItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_IncentiveNotice newIncentiveNotice = new Model.Check_IncentiveNotice { IncentiveNoticeId = newItem.IncentiveNoticeId, diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index 74d460f..c5990c6 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -20,7 +20,7 @@ namespace BLL /// public static Model.LicenseDataItem getLicenseDataById(string strMenuId, string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.LicenseDataItem getInfo = new Model.LicenseDataItem(); #region 鍔ㄧ伀浣滀笟绁 @@ -529,7 +529,7 @@ namespace BLL /// public static List getLicenseDataList(string strMenuId, string projectId, string unitId, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId)) { @@ -1023,7 +1023,7 @@ namespace BLL /// public static List getLicenseDataListByStates(string projectId, string unitId, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId)) { @@ -1409,7 +1409,7 @@ namespace BLL /// public static List getLicenseLicenseItemList(string dataId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfoList = (from x in db.License_LicenseItem where x.DataId == dataId @@ -1438,7 +1438,7 @@ namespace BLL /// public static List getLicenseFlowOperateList(string dataId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfoList = (from x in db.License_FlowOperate where x.DataId == dataId && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false) @@ -1473,7 +1473,7 @@ namespace BLL /// public static string SaveLicenseData(Model.LicenseDataItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strLicenseId = newItem.LicenseId; string projectId = newItem.ProjectId; @@ -2560,7 +2560,7 @@ namespace BLL /// public static void SaveLicenseFlowOperate(Model.FlowOperateItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strMenuId = string.Empty; bool boolIsFlowEnd = false; @@ -3038,7 +3038,7 @@ namespace BLL /// 涓嬩竴姝ユ祦绋嬮泦鍚 public static void SaveNextLicenseFlowOperate(List newItemList) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string dataId = newItemList.FirstOrDefault().DataId; string menuId = newItemList.FirstOrDefault().MenuId; @@ -3102,7 +3102,7 @@ namespace BLL /// public static Model.FlowOperateItem getLicenseFlowOperate(string dataId, string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////瀹℃牳璁板綍 var getFlowOperate = from x in db.License_FlowOperate @@ -3142,7 +3142,7 @@ namespace BLL /// public static List getNextLicenseFlowOperate(string strMenuId, Model.LicenseDataItem licenseInfo, Model.FlowOperateItem getNowFlowOperate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getFlowOperate = new List(); var getAllFlows = from x in db.License_FlowOperate @@ -3273,7 +3273,7 @@ namespace BLL public static string cancleLicenseFlowOperate(string strMenuId,string dataId, string useId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getFlow = db.License_FlowOperate.Where(x => x.DataId == dataId && x.OperaterId == useId && x.OperaterTime != null).OrderBy(x => x.SortIndex).OrderBy(x => x.GroupNum).OrderBy(x => x.OrderNum).FirstOrDefault(); if (getFlow != null) @@ -3599,7 +3599,7 @@ namespace BLL /// public static void getDeleteLicenseFlowOperate(string flowOperateId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var delteFlow = db.License_FlowOperate.FirstOrDefault(x => x.FlowOperateId == flowOperateId); if (delteFlow != null) @@ -3653,7 +3653,7 @@ namespace BLL /// public static List getNextLicenseFlowOperateGroupList(string flowOperateId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getNextFlowsList = new List(); var getFlow = db.License_FlowOperate.FirstOrDefault(x => x.FlowOperateId == flowOperateId); @@ -3689,7 +3689,7 @@ namespace BLL } public static Model.FlowOperateItem getFinishLicenseFlowOperateGroupList(string dataId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.License_FlowOperate @@ -3732,7 +3732,7 @@ namespace BLL { string strLicenseId = newItem.LicenseId; string projectId = newItem.ProjectId; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { //// 鍒犻櫎鏈鏍哥殑娴佺▼璁板綍 var getDelFlows = from x in db.License_FlowOperate diff --git a/SGGL/BLL/API/HSSE/APILicenseFlowOperateService.cs b/SGGL/BLL/API/HSSE/APILicenseFlowOperateService.cs index 9567dd4..1715be0 100644 --- a/SGGL/BLL/API/HSSE/APILicenseFlowOperateService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseFlowOperateService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static Model.FlowOperateItem getLicenseFlowOperateById(string flowOperateId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = from x in db.License_FlowOperate where x.FlowOperateId == flowOperateId @@ -51,7 +51,7 @@ namespace BLL /// public static List getLicenseFlowOperateList(string dataId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = from x in db.License_FlowOperate where x.DataId == dataId @@ -86,7 +86,7 @@ namespace BLL /// public static List getLicenseFlowOperateItemList(string flowOperateId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = from x in db.License_FlowOperateItem join y in db.License_FlowOperate on x.FlowOperateId equals y.FlowOperateId diff --git a/SGGL/BLL/API/HSSE/APILicenseItemService.cs b/SGGL/BLL/API/HSSE/APILicenseItemService.cs index cb6b1c4..ebb9ae4 100644 --- a/SGGL/BLL/API/HSSE/APILicenseItemService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseItemService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static Model.LicenseItem getLicenseItemById(string licenseItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.License_LicenseItem where x.LicenseItemId == licenseItemId @@ -43,7 +43,7 @@ namespace BLL /// public static List getLicenseItemList(string dataId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = from x in db.License_LicenseItem where x.DataId == dataId diff --git a/SGGL/BLL/API/HSSE/APIMaterialService.cs b/SGGL/BLL/API/HSSE/APIMaterialService.cs index 56eab9f..ffe1be1 100644 --- a/SGGL/BLL/API/HSSE/APIMaterialService.cs +++ b/SGGL/BLL/API/HSSE/APIMaterialService.cs @@ -20,7 +20,7 @@ namespace BLL /// public static List getMaterialList(string projectId, string strParam ) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getConstructSolution = from x in db.HSSE_Material where x.ProjectId == projectId diff --git a/SGGL/BLL/API/HSSE/APIMeetingService.cs b/SGGL/BLL/API/HSSE/APIMeetingService.cs index 7223616..ed15164 100644 --- a/SGGL/BLL/API/HSSE/APIMeetingService.cs +++ b/SGGL/BLL/API/HSSE/APIMeetingService.cs @@ -21,7 +21,7 @@ namespace BLL /// 浼氳璇︾粏 public static Model.MeetingItem getMeetingByMeetingId(string meetingId, string meetingType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.MeetingItem getMeetItem = new Model.MeetingItem(); if (meetingType == "C") @@ -203,7 +203,7 @@ namespace BLL /// public static List getMeetingByProjectIdStates(string projectId, string meetingType, string states,int pageIndex) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getMeetItem = new List(); if (meetingType == "C") @@ -377,7 +377,7 @@ namespace BLL /// public static void SaveMeeting(Model.MeetingItem meeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string menuId = string.Empty; if (meeting.MeetingType == "C") { @@ -663,7 +663,7 @@ namespace BLL /// public static List getClassMeetingInfo(string projectId, string unitId, string meetingDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getMeetItems = new List(); DateTime mdate = Funs.GetNewDateTimeOrNow(meetingDate); diff --git a/SGGL/BLL/API/HSSE/APIPageDataService.cs b/SGGL/BLL/API/HSSE/APIPageDataService.cs index d312f8b..847031a 100644 --- a/SGGL/BLL/API/HSSE/APIPageDataService.cs +++ b/SGGL/BLL/API/HSSE/APIPageDataService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static List getPersonInOutAllNum(DateTime dateValue) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getSiteInOutList = new List(); var getDayAll = from x in db.SitePerson_PersonInOutNow @@ -45,7 +45,7 @@ namespace BLL /// public static List getPersonNum(string projectId, DateTime dateValue) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getSiteInOutList = new List(); var getDayAll = from x in db.SitePerson_PersonInOutNow @@ -78,7 +78,7 @@ namespace BLL /// public static List getPersonInOutNum(string projectId, DateTime dateValue) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getSiteInOutList = new List(); var getDayAll = from x in db.SitePerson_PersonInOutNow @@ -112,7 +112,7 @@ namespace BLL /// public static int getSafeHours(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int safeHours = 0; var getPersonInOutNumber = db.SitePerson_PersonInOutNumber.FirstOrDefault(x => x.ProjectId == projectId && x.InOutDate.Year == DateTime.Now.Year @@ -137,7 +137,7 @@ namespace BLL /// public static int getSafeWorkTime(string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; int SafeHours = 0; //// 鏌ユ壘褰撳墠椤圭洰 鏈鏂扮殑浜哄伐鏃舵暟閲忚褰 int getMaxWorkHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == projectId).Max(x => x.WorkHours) ?? 0; @@ -181,7 +181,7 @@ namespace BLL /// public static int getPersonInNowNum(string projectId, DateTime dateValue) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDayAll = from x in db.SitePerson_PersonInOutNow where x.ProjectId == projectId && x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month diff --git a/SGGL/BLL/API/HSSE/APIPauseNoticeService.cs b/SGGL/BLL/API/HSSE/APIPauseNoticeService.cs index e7419ec..3f5ead7 100644 --- a/SGGL/BLL/API/HSSE/APIPauseNoticeService.cs +++ b/SGGL/BLL/API/HSSE/APIPauseNoticeService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.PauseNoticeItem getPauseNoticeById(string PauseNoticeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_PauseNotice where x.PauseNoticeId == PauseNoticeId @@ -82,7 +82,7 @@ namespace BLL /// public static List getFlowOperateItem(string pauseNoticeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_PauseNoticeFlowOperate where x.PauseNoticeId == pauseNoticeId @@ -114,7 +114,7 @@ namespace BLL /// public static List getPauseNoticeList(string projectId, string unitId, string strParam, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPauseNotice = from x in db.Check_PauseNotice where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) && x.PauseStates == states @@ -164,7 +164,7 @@ namespace BLL /// public static void SavePauseNotice(Model.PauseNoticeItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_PauseNotice newPauseNotice = new Model.Check_PauseNotice { @@ -388,7 +388,7 @@ namespace BLL /// 璺緞 public static void SavePauseNoticeUrl(string pauseNoticeId, string attachUrl) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPauseNotice = db.Check_PauseNotice.FirstOrDefault(x => x.PauseNoticeId == pauseNoticeId); if (getPauseNotice != null) diff --git a/SGGL/BLL/API/HSSE/APIPersonQualityService.cs b/SGGL/BLL/API/HSSE/APIPersonQualityService.cs index 915e0b7..05f9397 100644 --- a/SGGL/BLL/API/HSSE/APIPersonQualityService.cs +++ b/SGGL/BLL/API/HSSE/APIPersonQualityService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static Model.PersonQualityItem getPersonQualityInfo(string type, string dataId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.PersonQualityItem getQualityItem = new Model.PersonQualityItem(); if (type == "1") @@ -159,7 +159,7 @@ namespace BLL /// public static List getPersonQualityList(string projectId, string unitId, string qualityType, string workPostId, string states, string unitIdQ) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getLists = new List(); if (qualityType == "1") @@ -329,7 +329,7 @@ namespace BLL /// 浜哄憳淇℃伅 public static void SavePersonQuality(Model.PersonQualityItem personQuality) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (personQuality.QualityType == "1") { diff --git a/SGGL/BLL/API/HSSE/APIPunishNoticeService.cs b/SGGL/BLL/API/HSSE/APIPunishNoticeService.cs index 4694fd3..531294d 100644 --- a/SGGL/BLL/API/HSSE/APIPunishNoticeService.cs +++ b/SGGL/BLL/API/HSSE/APIPunishNoticeService.cs @@ -20,7 +20,7 @@ namespace BLL /// public static Model.PunishNoticeItem getPunishNoticeById(string PunishNoticeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_PunishNotice where x.PunishNoticeId == PunishNoticeId @@ -74,7 +74,7 @@ namespace BLL public static List GetPunishNoticeItemList(string punishNoticeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_PunishNoticeItem where x.PunishNoticeId == punishNoticeId @@ -98,7 +98,7 @@ namespace BLL /// public static List getFlowOperateItem(string punishNoticeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_PunishNoticeFlowOperate where x.PunishNoticeId == punishNoticeId @@ -130,7 +130,7 @@ namespace BLL /// public static List getPunishNoticeList(string projectId, string unitId, string strParam, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPunishNotice = from x in db.Check_PunishNotice where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) && x.PunishStates == states @@ -178,7 +178,7 @@ namespace BLL /// public static void SavePunishNotice(Model.PunishNoticeItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { bool insertPunishNoticeItemItem = false; Model.Check_PunishNotice newPunishNotice = new Model.Check_PunishNotice @@ -453,7 +453,7 @@ namespace BLL /// 鍥炴墽鍗曡矾寰 public static void SavePunishNoticeReceiptUrl(string punishNoticeId, string attachUrl, string type) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPunishNotice = db.Check_PunishNotice.FirstOrDefault(x => x.PunishNoticeId == punishNoticeId); if (getPunishNotice != null) diff --git a/SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs b/SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs index 71d30c9..00e471a 100644 --- a/SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs +++ b/SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs @@ -21,7 +21,7 @@ namespace BLL /// 鏉ユ枃璇︾粏 public static Model.ReceiveFileManagerItem getReceiveFileManagerById(string receiveFileManagerId, string fileType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getReceiveFileManagerItem = (from x in db.InformationProject_ReceiveFileManager where x.ReceiveFileManagerId == receiveFileManagerId && x.FileType == fileType @@ -62,7 +62,7 @@ namespace BLL /// public static List getReceiveFileManagerList(string projectId, string fileType, string unitId, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getReceiveFileManagerItem = (from x in db.InformationProject_ReceiveFileManager where x.ProjectId == projectId && x.FileType == fileType @@ -122,7 +122,7 @@ namespace BLL /// public static void SaveReceiveFileManager(Model.ReceiveFileManagerItem newItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string menuId = string.Empty; Model.InformationProject_ReceiveFileManager newReceiveFile = new Model.InformationProject_ReceiveFileManager { @@ -188,7 +188,7 @@ namespace BLL /// 鍥炴墽鍗曡矾寰 public static void SaveReplyFileAttachUrl(string receiveFileManagerId, string replyFileAttachUrl) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getFile = db.InformationProject_ReceiveFileManager.FirstOrDefault(x => x.ReceiveFileManagerId == receiveFileManagerId); if (getFile != null) diff --git a/SGGL/BLL/API/HSSE/APIRectifyNoticesService.cs b/SGGL/BLL/API/HSSE/APIRectifyNoticesService.cs index 4e31ccb..b0ec405 100644 --- a/SGGL/BLL/API/HSSE/APIRectifyNoticesService.cs +++ b/SGGL/BLL/API/HSSE/APIRectifyNoticesService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.RectifyNoticesItem getRectifyNoticesById(string rectifyNoticesId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getRectifyNotices = from x in db.Check_RectifyNotices where x.RectifyNoticesId == rectifyNoticesId @@ -91,7 +91,7 @@ namespace BLL /// public static List getRectifyNoticesItemItem(string rectifyNoticesId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_RectifyNoticesItem where x.RectifyNoticesId == rectifyNoticesId @@ -120,7 +120,7 @@ namespace BLL /// public static List getRectifyNoticesFlowOperateItem(string rectifyNoticesId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.Check_RectifyNoticesFlowOperate where x.RectifyNoticesId == rectifyNoticesId @@ -181,7 +181,7 @@ namespace BLL /// public static void SaveRectifyNotices(Model.RectifyNoticesItem rectifyNotices) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { bool insertRectifyNoticesItemItem = false; Model.Check_RectifyNotices newRectifyNotices = new Model.Check_RectifyNotices diff --git a/SGGL/BLL/API/HSSE/APIResourcesService.cs b/SGGL/BLL/API/HSSE/APIResourcesService.cs index 1aab6df..ff87a9d 100644 --- a/SGGL/BLL/API/HSSE/APIResourcesService.cs +++ b/SGGL/BLL/API/HSSE/APIResourcesService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static List getTrainingListBySupTrainingId(string supTypeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_Training where x.SupTrainingId == supTypeId || (supTypeId == null && x.SupTrainingId == "0") @@ -40,7 +40,7 @@ namespace BLL /// public static List getTrainingItemListByTrainingId(string trainingId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TrainingItem where x.TrainingId == trainingId && x.IsPass == true @@ -63,7 +63,7 @@ namespace BLL /// public static Model.BaseInfoItem getTrainingItemByTrainingItemId(string trainingItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataInfo = from x in db.Training_TrainingItem where x.TrainingItemId == trainingItemId @@ -87,7 +87,7 @@ namespace BLL /// public static List getCompanyTrainingListBySupTrainingId(string supTypeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_CompanyTraining where x.SupCompanyTrainingId == supTypeId || (supTypeId == null && x.SupCompanyTrainingId == "0") @@ -111,7 +111,7 @@ namespace BLL /// public static List getCompanyTrainingItemListByTrainingId(string trainingId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_CompanyTrainingItem where x.CompanyTrainingId == trainingId @@ -134,7 +134,7 @@ namespace BLL /// public static Model.BaseInfoItem getCompanyTrainingItemByTrainingItemId(string trainingItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataInfo = from x in db.Training_CompanyTrainingItem where x.CompanyTrainingItemId == trainingItemId @@ -159,7 +159,7 @@ namespace BLL /// public static List getCompanySafetyInstitutionList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.HSSESystem_SafetyInstitution orderby x.EffectiveDate descending @@ -181,7 +181,7 @@ namespace BLL /// public static Model.BaseInfoItem getCompanySafetyInstitutionInfo(string safetyInstitutionId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataInfo = from x in db.HSSESystem_SafetyInstitution where x.SafetyInstitutionId == safetyInstitutionId @@ -205,7 +205,7 @@ namespace BLL /// public static List getTestTrainingListBySupTrainingId(string supTypeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_TestTraining where x.SupTrainingId == supTypeId || (supTypeId == null && x.SupTrainingId == "0") @@ -229,7 +229,7 @@ namespace BLL /// public static List getTestTrainingItemListByTrainingId(string testTrainingId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TestTrainingItem where x.TrainingId == testTrainingId @@ -252,7 +252,7 @@ namespace BLL /// public static Model.TestTrainingResourcesItem getTestTrainingItemByTrainingItemId(string trainingItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataInfo = from x in db.Training_TestTrainingItem where x.TrainingItemId == trainingItemId @@ -287,7 +287,7 @@ namespace BLL /// public static List getAccidentCaseListBySupAccidentCaseId(string supTypeId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.EduTrain_AccidentCase where x.SupAccidentCaseId == supTypeId || (supTypeId == null && x.SupAccidentCaseId == "0") @@ -311,7 +311,7 @@ namespace BLL /// public static List getAccidentCaseItemListById(string accidentCaseId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.EduTrain_AccidentCaseItem where x.AccidentCaseId == accidentCaseId @@ -333,7 +333,7 @@ namespace BLL /// public static Model.BaseInfoItem getAccidentCaseItemById(string accidentCaseItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataInfo = from x in db.EduTrain_AccidentCaseItem where x.AccidentCaseItemId == accidentCaseItemId @@ -359,7 +359,7 @@ namespace BLL /// public static List getCheckItemSetListBySupCheckItemId(string supTypeId, string checkType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Technique_CheckItemSet where x.CheckType == checkType && (x.SupCheckItem == supTypeId || (supTypeId == null && x.SupCheckItem == "0")) @@ -383,7 +383,7 @@ namespace BLL /// public static List getCheckItemSetItemListBycheckItemSetId(string checkItemSetId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Technique_CheckItemDetail where x.CheckItemSetId == checkItemSetId diff --git a/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs b/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs index f091e02..e829a76 100644 --- a/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs +++ b/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static List getSeDinMonthReportList(string projectId, string month, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); var getSeDinMonthReport = from x in db.SeDin_MonthReport @@ -89,7 +89,7 @@ namespace BLL /// public static Model.SeDinMonthReport1Item getSeDinMonthReportNullPage1(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ///椤圭洰缁忕悊 string projectManagerId = string.Empty; @@ -132,7 +132,7 @@ namespace BLL /// public static Model.SeDinMonthReport2Item getSeDinMonthReportNullPage2(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var newItem = new Model.SeDinMonthReport2Item(); var monthD = Funs.GetNewDateTime(month); @@ -226,7 +226,7 @@ namespace BLL /// public static List getSeDinMonthReport3ItemNull(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -274,7 +274,7 @@ namespace BLL /// public static List getSeDinMonthReportNullPage4(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -313,7 +313,7 @@ namespace BLL /// public static int getPersonsNum(List getPersons, string unitId, string type) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int num = 0; var getUnitPersons = getPersons.Where(x => x.UnitId == unitId); @@ -367,7 +367,7 @@ namespace BLL /// public static Model.SeDinMonthReport4OtherItem getSeDinMonthReportNullPage4Other(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -398,7 +398,7 @@ namespace BLL /// public static List getSeDinMonthReportNullPage5(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -494,7 +494,7 @@ namespace BLL /// public static Model.SeDinMonthReport7Item getSeDinMonthReportNullPage7(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -545,7 +545,7 @@ namespace BLL /// public static Model.SeDinMonthReport8Item getSeDinMonthReportNullPage8(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -580,7 +580,7 @@ namespace BLL /// public static List getSeDinMonthReport8ItemNull(string projectId, string month, DateTime? startDateD, DateTime? endDateD) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getLists = new List(); var getUnits = from x in db.Base_Unit @@ -636,7 +636,7 @@ namespace BLL /// public static Model.SeDinMonthReport9Item getSeDinMonthReportNullPage9(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -698,7 +698,7 @@ namespace BLL /// public static List getSeDinMonthReport9ItemRectificationNull(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -742,7 +742,7 @@ namespace BLL /// public static List getSeDinMonthReport9ItemSpecialNull(List getCheckSpecialAll, List getCheckSpecialYear, List getCheckSpecialMon) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List getLists = new List(); var getUnits = APIResourcesService.getCheckItemSetListBySupCheckItemId("0", "2"); @@ -771,7 +771,7 @@ namespace BLL /// public static List getSeDinMonthReport9ItemStoppageNull(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -810,7 +810,7 @@ namespace BLL /// public static Model.SeDinMonthReport10Item getSeDinMonthReportNullPage10(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -873,7 +873,7 @@ namespace BLL /// public static Model.SeDinMonthReport11Item getSeDinMonthReportNullPage11(string projectId, string month, string startDate, string endDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); @@ -946,7 +946,7 @@ namespace BLL /// public static Model.SeDinMonthReportItem getSeDinMonthReport0ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReportItem getInfo = new Model.SeDinMonthReportItem(); @@ -989,7 +989,7 @@ namespace BLL /// public static Model.SeDinMonthReport1Item getSeDinMonthReport1ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport1Item getInfo = new Model.SeDinMonthReport1Item(); @@ -1027,7 +1027,7 @@ namespace BLL /// public static Model.SeDinMonthReport2Item getSeDinMonthReport2ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport2Item getInfo = new Model.SeDinMonthReport2Item(); @@ -1064,7 +1064,7 @@ namespace BLL /// public static Model.SeDinMonthReportItem getSeDinMonthReport3ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReportItem getInfo = new Model.SeDinMonthReportItem(); @@ -1090,7 +1090,7 @@ namespace BLL /// public static List getSeDinMonthReport3Item(string monthReportId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.SeDin_MonthReport3 where x.MonthReportId == monthReportId @@ -1122,7 +1122,7 @@ namespace BLL /// public static List getSeDinMonthReport4ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); List getInfo = new List(); @@ -1156,7 +1156,7 @@ namespace BLL /// public static Model.SeDinMonthReport4OtherItem getSeDinMonthReport4OtherById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); if (monthD.HasValue) @@ -1191,7 +1191,7 @@ namespace BLL /// public static List getSeDinMonthReport5ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); List getInfo = new List(); @@ -1234,7 +1234,7 @@ namespace BLL /// public static Model.SeDinMonthReport6Item getSeDinMonthReport6ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport6Item getInfo = new Model.SeDinMonthReport6Item(); @@ -1281,7 +1281,7 @@ namespace BLL /// public static Model.SeDinMonthReport7Item getSeDinMonthReport7ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport7Item getInfo = new Model.SeDinMonthReport7Item(); @@ -1320,7 +1320,7 @@ namespace BLL /// public static Model.SeDinMonthReport8Item getSeDinMonthReport8ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport8Item getInfo = new Model.SeDinMonthReport8Item(); @@ -1355,7 +1355,7 @@ namespace BLL /// public static List getSeDinMonthReport8Item(string monthReportId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.SeDin_MonthReport8Item where x.MonthReportId == monthReportId @@ -1381,7 +1381,7 @@ namespace BLL /// public static Model.SeDinMonthReport9Item getSeDinMonthReport9ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport9Item getInfo = new Model.SeDinMonthReport9Item(); @@ -1421,7 +1421,7 @@ namespace BLL /// public static List getSeDinMonthReport9ItemRectification(string monthReportId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.SeDin_MonthReport9Item_Rectification where x.MonthReportId == monthReportId @@ -1453,7 +1453,7 @@ namespace BLL /// public static List getSeDinMonthReport9ItemSpecial(string monthReportId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.SeDin_MonthReport9Item_Special where x.MonthReportId == monthReportId @@ -1476,7 +1476,7 @@ namespace BLL /// public static List getSeDinMonthReport9ItemStoppage(string monthReportId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getInfo = from x in db.SeDin_MonthReport9Item_Stoppage where x.MonthReportId == monthReportId @@ -1504,7 +1504,7 @@ namespace BLL /// public static Model.SeDinMonthReport10Item getSeDinMonthReport10ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport10Item getInfo = new Model.SeDinMonthReport10Item(); @@ -1556,7 +1556,7 @@ namespace BLL /// public static Model.SeDinMonthReport11Item getSeDinMonthReport11ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport11Item getInfo = new Model.SeDinMonthReport11Item(); @@ -1590,7 +1590,7 @@ namespace BLL /// public static Model.SeDinMonthReport12Item getSeDinMonthReport12ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReport12Item getInfo = new Model.SeDinMonthReport12Item(); @@ -1638,7 +1638,7 @@ namespace BLL /// public static Model.SeDinMonthReportItem getSeDinMonthReport13ById(string projectId, string month) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var monthD = Funs.GetNewDateTime(month); Model.SeDinMonthReportItem getInfo = new Model.SeDinMonthReportItem(); @@ -1673,7 +1673,7 @@ namespace BLL /// public static string SaveSeDinMonthReport0(Model.SeDinMonthReportItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SeDin_MonthReport newReport = new Model.SeDin_MonthReport { @@ -1763,7 +1763,7 @@ namespace BLL /// public static string SaveSeDinMonthReport1(Model.SeDinMonthReport1Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SeDin_MonthReport1 newReport = new Model.SeDin_MonthReport1 { @@ -1813,7 +1813,7 @@ namespace BLL /// public static string SaveSeDinMonthReport2(Model.SeDinMonthReport2Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SeDin_MonthReport2 newReport = new Model.SeDin_MonthReport2 { @@ -1861,7 +1861,7 @@ namespace BLL /// public static string SaveSeDinMonthReport3(Model.SeDinMonthReportItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var updateReport = db.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == newItem.MonthReportId); if (updateReport != null) @@ -1918,7 +1918,7 @@ namespace BLL /// public static string SaveSeDinMonthReport4(Model.SeDinMonthReportItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var updateReport = db.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == newItem.MonthReportId); if (updateReport != null) @@ -1965,7 +1965,7 @@ namespace BLL /// public static string SaveSeDinMonthReport4Other(Model.SeDinMonthReport4OtherItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////鍒犻櫎 var delMonthReport4s = db.SeDin_MonthReport4Other.FirstOrDefault(x => x.MonthReportId == newItem.MonthReportId); @@ -2002,7 +2002,7 @@ namespace BLL /// public static string SaveSeDinMonthReport5(Model.SeDinMonthReportItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var updateReport = db.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == newItem.MonthReportId); @@ -2057,7 +2057,7 @@ namespace BLL /// public static string SaveSeDinMonthReport6(Model.SeDinMonthReport6Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getSeDinMonthReport6 = from x in db.SeDin_MonthReport6 where x.MonthReportId == newItem.MonthReportId select x; if (getSeDinMonthReport6.Count() > 0) @@ -2106,7 +2106,7 @@ namespace BLL /// public static string SaveSeDinMonthReport7(Model.SeDinMonthReport7Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getSeDinMonthReport7 = from x in db.SeDin_MonthReport7 where x.MonthReportId == newItem.MonthReportId select x; if (getSeDinMonthReport7.Count() > 0) @@ -2147,7 +2147,7 @@ namespace BLL /// public static string SaveSeDinMonthReport8(Model.SeDinMonthReport8Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getMonthReport8 = from x in db.SeDin_MonthReport8 where x.MonthReportId == newItem.MonthReportId select x; @@ -2212,7 +2212,7 @@ namespace BLL /// public static string SaveSeDinMonthReport9(Model.SeDinMonthReport9Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getMonthReport9 = from x in db.SeDin_MonthReport9 where x.MonthReportId == newItem.MonthReportId @@ -2343,7 +2343,7 @@ namespace BLL /// public static string SaveSeDinMonthReport10(Model.SeDinMonthReport10Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getMonthReport10 = from x in db.SeDin_MonthReport10 where x.MonthReportId == newItem.MonthReportId @@ -2397,7 +2397,7 @@ namespace BLL /// public static string SaveSeDinMonthReport11(Model.SeDinMonthReport11Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SeDin_MonthReport11 newReport = new Model.SeDin_MonthReport11 { @@ -2439,7 +2439,7 @@ namespace BLL /// public static string SaveSeDinMonthReport12(Model.SeDinMonthReport12Item newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SeDin_MonthReport12 newReport = new Model.SeDin_MonthReport12 { @@ -2509,7 +2509,7 @@ namespace BLL /// public static string SaveSeDinMonthReport13(Model.SeDinMonthReportItem newItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var updateReport = db.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == newItem.MonthReportId); if (updateReport != null) diff --git a/SGGL/BLL/API/HSSE/APIServerTestPlanService.cs b/SGGL/BLL/API/HSSE/APIServerTestPlanService.cs index a4b4c4b..bd65bfb 100644 --- a/SGGL/BLL/API/HSSE/APIServerTestPlanService.cs +++ b/SGGL/BLL/API/HSSE/APIServerTestPlanService.cs @@ -21,7 +21,7 @@ namespace BLL /// public static List getTestPlanList(string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Test_TestPlan where (x.States == states || states == null) @@ -54,7 +54,7 @@ namespace BLL /// public static Model.TestPlanItem getTestPlanByTestPlanId(string testPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Test_TestPlan where x.TestPlanId == testPlanId @@ -90,7 +90,7 @@ namespace BLL /// public static List getTestPlanTrainingListByTestPlanId(string testPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var getDataLists = (from x in db.Test_TestPlanTraining join y in db.Training_TestTraining on x.TrainingId equals y.TrainingId where x.TestPlanId == testPlanId diff --git a/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs b/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs index d04fdbe..e15c35f 100644 --- a/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs +++ b/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs @@ -21,7 +21,7 @@ namespace BLL /// public static Model.TestRecordItem getTestRecordInfo(string testPlanId, string testManId, string userType, string identityCard) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.TestRecordItem newTestRecord = new Model.TestRecordItem(); var getTestPlan = db.Test_TestPlan.FirstOrDefault(x => x.TestPlanId == testPlanId); @@ -105,7 +105,7 @@ namespace BLL /// 鑰冭瘯璁″垝璁板綍 public static Model.TestRecordItem SaveTestRecord(Model.TestRecordItem testRecord) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTestPlan = db.Test_TestPlan.FirstOrDefault(x => x.TestPlanId == testRecord.TestPlanId); if (getTestPlan != null) @@ -232,7 +232,7 @@ namespace BLL /// 鑰冭瘯浜哄憳 public static List getTestRecordListByTestPlanId(string testPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Test_TestRecord where x.TestPlanId == testPlanId @@ -266,7 +266,7 @@ namespace BLL /// public static Model.TestRecordItem getTestRecordByTestRecordId(string testRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Test_TestRecord join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId @@ -307,7 +307,7 @@ namespace BLL /// public static string CreateTestRecordItem(string testPlanId, string testRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTestPlan = db.Test_TestPlan.FirstOrDefault(x => x.TestPlanId == testPlanId); var getTestRecord = db.Test_TestRecord.FirstOrDefault(x => x.TestRecordId == testRecordId); @@ -439,7 +439,7 @@ namespace BLL /// 鑰冭瘯浜哄憳 public static List geTestRecordItemListByTestRecordId(string testRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Test_TestRecordItem where x.TestRecordId == testRecordId @@ -476,7 +476,7 @@ namespace BLL /// public static void getTestRecordItemAnswerBySelectedItem(Model.Test_TestRecordItem getTItemT, string selectedItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTItem = db.Test_TestRecordItem.FirstOrDefault(x => x.TestRecordItemId == getTItemT.TestRecordItemId); if (getTItem != null) @@ -532,7 +532,7 @@ namespace BLL public static decimal getSubmitTestRecord(string testRecordId) { decimal getCode = 0; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTestRecord = db.Test_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecordId); /////璇曞嵎 diff --git a/SGGL/BLL/API/HSSE/APITestPlanService.cs b/SGGL/BLL/API/HSSE/APITestPlanService.cs index 291f1f9..a965076 100644 --- a/SGGL/BLL/API/HSSE/APITestPlanService.cs +++ b/SGGL/BLL/API/HSSE/APITestPlanService.cs @@ -22,7 +22,7 @@ namespace BLL /// public static List getTestPlanListByProjectIdStates(string projectId, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TestPlan where x.ProjectId == projectId && (x.States == states || states == null) @@ -54,7 +54,7 @@ namespace BLL /// public static Model.TestPlanItem getTestPlanByTestPlanId(string testPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_TestPlan where x.TestPlanId == testPlanId @@ -97,7 +97,7 @@ namespace BLL public static string SaveTestPlan(Model.TestPlanItem getTestPlan) { string alterStr =string.Empty ; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Training_TestPlan newTestPlan = new Model.Training_TestPlan { @@ -303,7 +303,7 @@ namespace BLL /// public static void AddTrainingTestPlanTraining(List TestPlanItems, string testPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in TestPlanItems) { @@ -336,7 +336,7 @@ namespace BLL public static string SaveTestPlanByTrainingPlanId(string trainingPlanId,string userId) { string testPlanId = string.Empty; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////鍩硅璁″垝 var getTrainingPlan = db.Training_Plan.FirstOrDefault(x => x.PlanId == trainingPlanId); ; @@ -480,7 +480,7 @@ namespace BLL /// public static List getTestPlanTrainingListByTestPlanId(string testPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TestPlanTraining join y in db.Training_TestTraining on x.TrainingId equals y.TrainingId @@ -506,7 +506,7 @@ namespace BLL /// public static void SubmitTest(Model.Training_TestPlan getTestPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////鎵鏈変氦鍗风殑浜哄憳 浜ゅ嵎 骞惰绠楀垎鏁 var getTrainingTestRecords = from x in db.Training_TestRecord diff --git a/SGGL/BLL/API/HSSE/APITestRecordService.cs b/SGGL/BLL/API/HSSE/APITestRecordService.cs index f5a5748..340733a 100644 --- a/SGGL/BLL/API/HSSE/APITestRecordService.cs +++ b/SGGL/BLL/API/HSSE/APITestRecordService.cs @@ -18,7 +18,7 @@ namespace BLL /// 鑰冭瘯浜哄憳 public static List getTestRecordListByTestPlanId(string testPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TestRecord where x.TestPlanId == testPlanId @@ -49,7 +49,7 @@ namespace BLL /// public static Model.TestRecordItem getTestRecordByTestRecordId(string testRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_TestRecord join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId @@ -78,7 +78,7 @@ namespace BLL public static string CreateTestRecordItem(Model.Training_CompanyTrainingItem getCompanyTraining, string testRecordId, Model.SitePerson_Person person, Model.Sys_User user) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var trainingIds = getCompanyTraining.TestTrainingIds.Split(','); var testTrainings = db.Training_TestTraining.Where(x => trainingIds.Contains(x.TrainingId)); @@ -235,7 +235,7 @@ namespace BLL /// public static string CreateTestRecordItem(Model.Training_TestPlan getTestPlan, string testRecordId, Model.SitePerson_Person person) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTestRecord = db.Training_TestRecord.FirstOrDefault(x => x.TestRecordId == testRecordId); if (getTestRecord != null && !getTestRecord.TestStartTime.HasValue) @@ -367,7 +367,7 @@ namespace BLL /// public static string CreateFixTestRecordItem(Model.Training_TestPlan getTestPlan, string testRecordId, Model.SitePerson_Person person) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTestRecord = db.Training_TestRecord.FirstOrDefault(x => x.TestRecordId == testRecordId); if (getTestRecord != null && !getTestRecord.TestStartTime.HasValue) @@ -500,7 +500,7 @@ namespace BLL /// 鑰冭瘯璁板綍鍒楄〃 public static List getTrainingTestRecordListByProjectIdPersonId(string projectId, string personId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TestRecord join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId @@ -536,7 +536,7 @@ namespace BLL /// 鑰冭瘯璁板綍鍒楄〃 public static List getTrainingTestRecordListByProjectId(string projectId, string unitId, string workPostId, string strPass, string strParam) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TestRecord join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId @@ -599,7 +599,7 @@ namespace BLL /// public static string getUnitName(string testManId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string name = string.Empty; var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == testManId); @@ -620,7 +620,7 @@ namespace BLL /// 鑰冭瘯浜哄憳 public static List geTestRecordItemListByTestRecordId(string testRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TestRecordItem where x.TestRecordId == testRecordId @@ -658,7 +658,7 @@ namespace BLL /// 鑰冭瘯浜哄憳 public static Model.TestRecordItemItem geTestRecordItemByTestRecordItemId(string testRecordItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_TestRecordItem where x.TestRecordItemId == testRecordItemId @@ -696,7 +696,7 @@ namespace BLL /// public static void getTestRecordItemAnswerBySelectedItem(Model.Training_TestRecordItem getTItemT, string selectedItem) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTItem = db.Training_TestRecordItem.FirstOrDefault(x => x.TestRecordItemId == getTItemT.TestRecordItemId); if (getTItem != null) @@ -752,7 +752,7 @@ namespace BLL public static decimal getSubmitTestRecord(Model.Training_TestRecord testRecord) { decimal getCode = 0; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTestRecord = db.Training_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecord.TestRecordId); /////璇曞嵎 @@ -780,7 +780,7 @@ namespace BLL /// public static void updateAll(string testPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { //// 鑾峰彇鑰冭瘯璁″垝 var getTestPlan = db.Training_TestPlan.FirstOrDefault(x => x.TestPlanId == testPlanId); diff --git a/SGGL/BLL/API/HSSE/APITrainRecordService.cs b/SGGL/BLL/API/HSSE/APITrainRecordService.cs index 82a9ff4..a6036d0 100644 --- a/SGGL/BLL/API/HSSE/APITrainRecordService.cs +++ b/SGGL/BLL/API/HSSE/APITrainRecordService.cs @@ -18,7 +18,7 @@ namespace BLL /// public static List getTrainRecordListByProjectIdTrainTypeIdTrainStates(string projectId, string trainTypeId, string trainStates) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.EduTrain_TrainRecord where x.ProjectId == projectId && x.TrainTypeId == trainTypeId @@ -50,7 +50,7 @@ namespace BLL /// public static Model.TrainRecordItem getTrainRecordByTrainingId(string trainRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.EduTrain_TrainRecord where x.TrainingId == trainRecordId @@ -87,7 +87,7 @@ namespace BLL public static void InsertTrainRecord(Model.Training_TestPlan getTestPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////鑾峰彇鍩硅璁″垝 var getTrainingPlan = db.Training_Plan.FirstOrDefault(e => e.PlanId == getTestPlan.PlanId); diff --git a/SGGL/BLL/API/HSSE/APITrainTestRecordService.cs b/SGGL/BLL/API/HSSE/APITrainTestRecordService.cs index d73e5d5..66b96c1 100644 --- a/SGGL/BLL/API/HSSE/APITrainTestRecordService.cs +++ b/SGGL/BLL/API/HSSE/APITrainTestRecordService.cs @@ -19,7 +19,7 @@ namespace BLL /// public static List getTrainRecordListByProjectId(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TrainTestRecord where x.ProjectId == projectId @@ -50,7 +50,7 @@ namespace BLL /// public static Model.HSSE.TrainTestRecordItem getTrainRecordByTrainingId(string trainRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_TrainTestRecord where x.TrainingTestRecordId == trainRecordId @@ -83,7 +83,7 @@ namespace BLL public static void updateTrainRecord(Model.HSSE.TrainTestRecordItem x) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////鑾峰彇鍩硅璁″垝 Model.Training_TrainTestRecord newTrainRecord = db.Training_TrainTestRecord.FirstOrDefault(u => u.TrainingTestRecordId == x.TrainingTestRecordId); diff --git a/SGGL/BLL/API/HSSE/APITrainingPlanService.cs b/SGGL/BLL/API/HSSE/APITrainingPlanService.cs index 8e55c7e..4afdebb 100644 --- a/SGGL/BLL/API/HSSE/APITrainingPlanService.cs +++ b/SGGL/BLL/API/HSSE/APITrainingPlanService.cs @@ -18,7 +18,7 @@ namespace BLL /// public static List getTrainingPlanListByProjectIdTrainTypeIdTrainStates(string projectId, string trainTypeId, string states) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_Plan where x.ProjectId == projectId && (x.States == states || states == null) && x.TrainTypeId == trainTypeId @@ -56,7 +56,7 @@ namespace BLL /// public static Model.TrainingPlanItem getTrainingPlanByTrainingId(string planId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = from x in db.Training_Plan where x.PlanId == planId @@ -98,7 +98,7 @@ namespace BLL /// 鍩硅璁″垝浜哄憳 public static List getTrainingPlanItemListByTrainingPlanId(string trainingPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_PlanItem join y in db.Training_CompanyTraining on x.CompanyTrainingId equals y.CompanyTrainingId @@ -130,7 +130,7 @@ namespace BLL /// 鍩硅鏁欐潗绫诲瀷list public static void SaveTrainingPlan(Model.TrainingPlanItem trainingPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Training_Plan newTrainingPlan = new Model.Training_Plan { @@ -280,7 +280,7 @@ namespace BLL /// public static void AddTraining_Task(List trainingTasks, string planId, string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in trainingTasks) { @@ -308,7 +308,7 @@ namespace BLL /// public static void AddTraining_PlanItem(List trainingPlanItems, string planId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in trainingPlanItems) { diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs index 20913fc..13aa098 100644 --- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs +++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static List getTrainingTaskListByProjectIdPersonId(string projectId, string personId, string isRetakeCourse) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { personId = PersonService.GetPersonIdByUserId(personId); var getDataLists = (from x in db.Training_Task @@ -51,7 +51,7 @@ namespace BLL public static string getTrainingItemCode(string PlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var ids = db.Training_PlanItem.Where(xx => xx.PlanId == PlanId).Select(x => x.CompanyTrainingItemId).ToList(); var codes = db.Training_CompanyTrainingItem.Where(x => ids.Contains(x.CompanyTrainingItemId)).Select(x => x.CompanyTrainingItemCode); @@ -70,7 +70,7 @@ namespace BLL /// public static List getTrainingTaskItemListByTaskId(string taskId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////鐢熸垚鍩硅浠诲姟涓嬪煿璁槑缁 GetDataService.CreateTrainingTaskItemByTaskId(taskId); @@ -112,7 +112,7 @@ namespace BLL /// public static List getTrainingRecordItemListByProjectIdPersonId(string projectId, string personId, string isRetakeCourse) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TaskItem join t in db.Training_Task on x.TaskId equals t.TaskId @@ -158,7 +158,7 @@ namespace BLL public static string getTrainingTaskByPlanIdPersonIdCondition(string planId, string personId) { string alterString = string.Empty; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var task = db.Training_Task.FirstOrDefault(x => x.PlanId == planId && x.UserId == personId); if (task != null) @@ -237,7 +237,7 @@ namespace BLL /// public static void getTrainingTaskByPlanIdPersonId(string planId, string personId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var plan = db.Training_Plan.FirstOrDefault(e => e.PlanId == planId); Model.Training_Task newTask = new Model.Training_Task @@ -269,7 +269,7 @@ namespace BLL /// 鍩硅璁″垝浜哄憳 public static List getTrainingTaskListByTrainingPlanId(string trainingPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_Task where x.PlanId == trainingPlanId @@ -302,7 +302,7 @@ namespace BLL /// public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId, DateTime startTime, DateTime endTime, string VideoProgress) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Training_TaskItem where x.TaskItemId == taskItemId diff --git a/SGGL/BLL/BaseInfo/AccidentTypeService.cs b/SGGL/BLL/BaseInfo/AccidentTypeService.cs index 631793d..366012d 100644 --- a/SGGL/BLL/BaseInfo/AccidentTypeService.cs +++ b/SGGL/BLL/BaseInfo/AccidentTypeService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class AccidentTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浜嬫晠绫诲瀷 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddAccidentType(Model.Base_AccidentType accidentType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_AccidentType newAccidentType = new Model.Base_AccidentType { AccidentTypeId = accidentType.AccidentTypeId, @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdateAccidentType(Model.Base_AccidentType accidentType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_AccidentType newAccidentType = db.Base_AccidentType.FirstOrDefault(e => e.AccidentTypeId == accidentType.AccidentTypeId); if (newAccidentType != null) { @@ -61,7 +61,7 @@ namespace BLL /// public static void DeleteAccidentTypeById(string accidentTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_AccidentType accidentType = db.Base_AccidentType.FirstOrDefault(e => e.AccidentTypeId == accidentTypeId); if (accidentType != null) { diff --git a/SGGL/BLL/BaseInfo/BaseFactoryService.cs b/SGGL/BLL/BaseInfo/BaseFactoryService.cs index eaf7fe1..a07ab6e 100644 --- a/SGGL/BLL/BaseInfo/BaseFactoryService.cs +++ b/SGGL/BLL/BaseInfo/BaseFactoryService.cs @@ -11,7 +11,7 @@ namespace BLL public static class Base_FactoryService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/BaseInfo/CNProfessionalService.cs b/SGGL/BLL/BaseInfo/CNProfessionalService.cs index 43ca431..69503d8 100644 --- a/SGGL/BLL/BaseInfo/CNProfessionalService.cs +++ b/SGGL/BLL/BaseInfo/CNProfessionalService.cs @@ -10,7 +10,7 @@ namespace BLL { public class CNProfessionalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇瀹炰綋闆嗗悎 @@ -27,7 +27,7 @@ namespace BLL /// public static void AddCNProfessional(Model.Base_CNProfessional cNProfessional) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_CNProfessional newCNProfessional = new Model.Base_CNProfessional { CNProfessionalId = cNProfessional.CNProfessionalId, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateCNProfessional(Model.Base_CNProfessional cNProfessional) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_CNProfessional newCNProfessional = db.Base_CNProfessional.FirstOrDefault(e => e.CNProfessionalId == cNProfessional.CNProfessionalId); if (newCNProfessional != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteCNProfessionalById(string cNProfessionalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_CNProfessional cNProfessional = db.Base_CNProfessional.FirstOrDefault(e => e.CNProfessionalId == cNProfessionalId); { db.Base_CNProfessional.DeleteOnSubmit(cNProfessional); diff --git a/SGGL/BLL/BaseInfo/CertificateService.cs b/SGGL/BLL/BaseInfo/CertificateService.cs index b0b0c6c..a83986b 100644 --- a/SGGL/BLL/BaseInfo/CertificateService.cs +++ b/SGGL/BLL/BaseInfo/CertificateService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CertificateService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗瑰矖璇佷功 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddCertificate(Model.Base_Certificate certificate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Certificate newCertificate = new Model.Base_Certificate { CertificateId = certificate.CertificateId, @@ -48,7 +48,7 @@ namespace BLL /// public static void UpdateCertificate(Model.Base_Certificate certificate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Certificate newCertificate = db.Base_Certificate.FirstOrDefault(e => e.CertificateId == certificate.CertificateId); if (newCertificate != null) { @@ -67,7 +67,7 @@ namespace BLL /// public static void DeleteCertificateById(string certificateId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Certificate certificate = db.Base_Certificate.FirstOrDefault(e => e.CertificateId == certificateId); if (certificate != null) { diff --git a/SGGL/BLL/BaseInfo/CostTypeService.cs b/SGGL/BLL/BaseInfo/CostTypeService.cs index bb6d8dd..af2db50 100644 --- a/SGGL/BLL/BaseInfo/CostTypeService.cs +++ b/SGGL/BLL/BaseInfo/CostTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CostTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇璐圭敤绫诲瀷 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddCostType(Model.Base_CostType costType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_CostType newCostType = new Model.Base_CostType { CostTypeId = costType.CostTypeId, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateCostType(Model.Base_CostType costType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_CostType newCostType = db.Base_CostType.FirstOrDefault(e => e.CostTypeId == costType.CostTypeId); if (newCostType != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteCostTypeById(string costTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_CostType costType = db.Base_CostType.FirstOrDefault(e => e.CostTypeId == costTypeId); if (costType != null) { diff --git a/SGGL/BLL/BaseInfo/DesignProfessionalService.cs b/SGGL/BLL/BaseInfo/DesignProfessionalService.cs index 5f050ec..362499e 100644 --- a/SGGL/BLL/BaseInfo/DesignProfessionalService.cs +++ b/SGGL/BLL/BaseInfo/DesignProfessionalService.cs @@ -10,7 +10,7 @@ namespace BLL { public class DesignProfessionalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇瀹炰綋闆嗗悎 @@ -27,7 +27,7 @@ namespace BLL /// public static void AddDesignProfessional(Model.Base_DesignProfessional designProfessional) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DesignProfessional newDesignProfessional = new Model.Base_DesignProfessional { DesignProfessionalId = designProfessional.DesignProfessionalId, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateDesignProfessional(Model.Base_DesignProfessional designProfessional) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DesignProfessional newDesignProfessional = db.Base_DesignProfessional.FirstOrDefault(e => e.DesignProfessionalId == designProfessional.DesignProfessionalId); if (newDesignProfessional != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteDesignProfessionalById(string designProfessionalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DesignProfessional designProfessional = db.Base_DesignProfessional.FirstOrDefault(e => e.DesignProfessionalId == designProfessionalId); { db.Base_DesignProfessional.DeleteOnSubmit(designProfessional); diff --git a/SGGL/BLL/BaseInfo/EmergencyTypeService.cs b/SGGL/BLL/BaseInfo/EmergencyTypeService.cs index 00bdc4b..f0910f7 100644 --- a/SGGL/BLL/BaseInfo/EmergencyTypeService.cs +++ b/SGGL/BLL/BaseInfo/EmergencyTypeService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class EmergencyTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddEmergencyType(Model.Base_EmergencyType emergencyType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_EmergencyType newEmergencyType = new Model.Base_EmergencyType { EmergencyTypeId = emergencyType.EmergencyTypeId, @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdateEmergencyType(Model.Base_EmergencyType emergencyType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_EmergencyType newEmergencyType = db.Base_EmergencyType.FirstOrDefault(e => e.EmergencyTypeId == emergencyType.EmergencyTypeId); if (newEmergencyType != null) { @@ -61,7 +61,7 @@ namespace BLL /// public static void DeleteEmergencyTypeById(string emergencyTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_EmergencyType emergencyType = db.Base_EmergencyType.FirstOrDefault(e => e.EmergencyTypeId == emergencyTypeId); { db.Base_EmergencyType.DeleteOnSubmit(emergencyType); diff --git a/SGGL/BLL/BaseInfo/HSSEStandardListTypeService.cs b/SGGL/BLL/BaseInfo/HSSEStandardListTypeService.cs index 919e1f5..049739d 100644 --- a/SGGL/BLL/BaseInfo/HSSEStandardListTypeService.cs +++ b/SGGL/BLL/BaseInfo/HSSEStandardListTypeService.cs @@ -14,7 +14,7 @@ namespace BLL { public class HSSEStandardListTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鏍囧噯瑙勮寖绫诲埆淇℃伅 @@ -33,7 +33,7 @@ namespace BLL /// public static void AddHSSEStandardListType(Model.Base_HSSEStandardListType hSSEStandardListType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_HSSEStandardListType newHSSEStandardListType = new Model.Base_HSSEStandardListType { TypeId = hSSEStandardListType.TypeId, @@ -54,7 +54,7 @@ namespace BLL /// public static void UpdateHSSEStandardListType(string typeId, string typeCode, string typeName, string remark) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_HSSEStandardListType hSSEStandardListType = db.Base_HSSEStandardListType.FirstOrDefault(e => e.TypeId == typeId); if (hSSEStandardListType != null) { @@ -71,7 +71,7 @@ namespace BLL /// public static void DeleteHSSEStandardListType(string typeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_HSSEStandardListType hSSEStandardListType = db.Base_HSSEStandardListType.FirstOrDefault(e => e.TypeId == typeId); if (hSSEStandardListType != null) { diff --git a/SGGL/BLL/BaseInfo/HSSE_Hazard_HazardRegisterTypesService.cs b/SGGL/BLL/BaseInfo/HSSE_Hazard_HazardRegisterTypesService.cs index 790d909..927ee63 100644 --- a/SGGL/BLL/BaseInfo/HSSE_Hazard_HazardRegisterTypesService.cs +++ b/SGGL/BLL/BaseInfo/HSSE_Hazard_HazardRegisterTypesService.cs @@ -26,7 +26,7 @@ namespace BLL /// public static void AddHazardRegisterTypes(Model.HSSE_Hazard_HazardRegisterTypes types) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Hazard_HazardRegisterTypes newTitle = new Model.HSSE_Hazard_HazardRegisterTypes(); newTitle.RegisterTypesId = types.RegisterTypesId; newTitle.RegisterTypesName = types.RegisterTypesName; @@ -48,7 +48,7 @@ namespace BLL /// public static void UpdateHazardRegisterTypes(Model.HSSE_Hazard_HazardRegisterTypes types) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Hazard_HazardRegisterTypes newTitle = db.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(e => e.RegisterTypesId == types.RegisterTypesId); if (newTitle != null) { @@ -68,7 +68,7 @@ namespace BLL /// public static void DeleteTitle(string RegisterTypesId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Hazard_HazardRegisterTypes types = db.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(e => e.RegisterTypesId == RegisterTypesId); if (types != null) { diff --git a/SGGL/BLL/BaseInfo/InspectionAreaService.cs b/SGGL/BLL/BaseInfo/InspectionAreaService.cs index 15337cc..c2523af 100644 --- a/SGGL/BLL/BaseInfo/InspectionAreaService.cs +++ b/SGGL/BLL/BaseInfo/InspectionAreaService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class InspectionAreaService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -84,7 +84,7 @@ namespace BLL /// public static void AddInspectionArea(Model.Base_InspectionArea inspectionArea) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_InspectionArea newInspectionArea = new Model.Base_InspectionArea(); newInspectionArea.InspectionAreaId = inspectionArea.InspectionAreaId; newInspectionArea.InspectionAreaCode = inspectionArea.InspectionAreaCode; @@ -100,7 +100,7 @@ namespace BLL /// public static void UpdateInspectionArea(Model.Base_InspectionArea inspectionArea) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_InspectionArea newInspectionArea = db.Base_InspectionArea.FirstOrDefault(e => e.InspectionAreaId == inspectionArea.InspectionAreaId); if (newInspectionArea != null) { @@ -117,7 +117,7 @@ namespace BLL /// public static void DeleteInspectionAreaById(string inspectionAreaId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_InspectionArea newInspectionArea = db.Base_InspectionArea.FirstOrDefault(e => e.InspectionAreaId == inspectionAreaId); if (newInspectionArea != null) { @@ -160,7 +160,7 @@ namespace BLL /// public static bool IsExitInspectionAreaName(string inspectionAreaName, string inspectionAreaId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Base_InspectionArea where x.InspectionAreaName == inspectionAreaName && x.InspectionAreaId != inspectionAreaId select x; if (q.Count() > 0) { diff --git a/SGGL/BLL/BaseInfo/LawsRegulationsTypeService.cs b/SGGL/BLL/BaseInfo/LawsRegulationsTypeService.cs index 7a45345..06ee32b 100644 --- a/SGGL/BLL/BaseInfo/LawsRegulationsTypeService.cs +++ b/SGGL/BLL/BaseInfo/LawsRegulationsTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class LawsRegulationsTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁id鑾峰彇娉曞緥娉曡绫诲瀷淇℃伅 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddLawsRegulationsType(Model.Base_LawsRegulationsType lawsRegulationsType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_LawsRegulationsType newLawsRegulationsType = new Model.Base_LawsRegulationsType { Id = lawsRegulationsType.Id, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateLawsRegulationsType(Model.Base_LawsRegulationsType lawsRegulationsType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_LawsRegulationsType newLawsRegulationsType = db.Base_LawsRegulationsType.FirstOrDefault(e => e.Id == lawsRegulationsType.Id); if (newLawsRegulationsType != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteLawsRegulationsTypeById(string id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_LawsRegulationsType lawsRegulationsType = db.Base_LawsRegulationsType.FirstOrDefault(e => e.Id == id); if (lawsRegulationsType != null) { diff --git a/SGGL/BLL/BaseInfo/LicenseTypeService.cs b/SGGL/BLL/BaseInfo/LicenseTypeService.cs index dfd8d89..bc286fa 100644 --- a/SGGL/BLL/BaseInfo/LicenseTypeService.cs +++ b/SGGL/BLL/BaseInfo/LicenseTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class LicenseTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇璁稿彲璇佺被鍨 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddLicenseType(Model.Base_LicenseType licenseType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_LicenseType newLicenseType = new Model.Base_LicenseType { LicenseTypeId = licenseType.LicenseTypeId, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdateLicenseType(Model.Base_LicenseType licenseType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_LicenseType newLicenseType = db.Base_LicenseType.FirstOrDefault(e => e.LicenseTypeId == licenseType.LicenseTypeId); if (newLicenseType != null) { @@ -65,7 +65,7 @@ namespace BLL /// public static void DeleteLicenseTypeById(string licenseTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_LicenseType licenseType = db.Base_LicenseType.FirstOrDefault(e => e.LicenseTypeId == licenseTypeId); if (licenseType != null) { diff --git a/SGGL/BLL/BaseInfo/ManageRuleTypeService.cs b/SGGL/BLL/BaseInfo/ManageRuleTypeService.cs index 4d0d464..630e6bb 100644 --- a/SGGL/BLL/BaseInfo/ManageRuleTypeService.cs +++ b/SGGL/BLL/BaseInfo/ManageRuleTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ManageRuleTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇绠＄悊瑙勫畾鍒嗙被 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddManageRuleType(Model.Base_ManageRuleType manageRuleType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ManageRuleType newManageRuleType = new Model.Base_ManageRuleType { ManageRuleTypeId = manageRuleType.ManageRuleTypeId, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdateManageRuleType(Model.Base_ManageRuleType manageRuleType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ManageRuleType newManageRuleType = db.Base_ManageRuleType.FirstOrDefault(e => e.ManageRuleTypeId == manageRuleType.ManageRuleTypeId); if (newManageRuleType != null) { @@ -64,7 +64,7 @@ namespace BLL /// public static void DeleteManageRuleTypeById(string manageRuleTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ManageRuleType manageRuleType = db.Base_ManageRuleType.FirstOrDefault(e => e.ManageRuleTypeId == manageRuleTypeId); { db.Base_ManageRuleType.DeleteOnSubmit(manageRuleType); diff --git a/SGGL/BLL/BaseInfo/PersonManageService.cs b/SGGL/BLL/BaseInfo/PersonManageService.cs index b079192..fc5cb98 100644 --- a/SGGL/BLL/BaseInfo/PersonManageService.cs +++ b/SGGL/BLL/BaseInfo/PersonManageService.cs @@ -11,7 +11,7 @@ namespace BLL { public class PersonManageService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -126,7 +126,7 @@ namespace BLL /// public static void AddBSWelder(Model.BS_Welder welder) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.BS_Welder)); Model.BS_Welder newWelder = new Model.BS_Welder(); newWelder.WED_ID = newKeyID; @@ -160,7 +160,7 @@ namespace BLL /// public static void UpdateBSWelder(Model.BS_Welder welder) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BS_Welder newWelder = db.BS_Welder.First(e => e.WED_ID == welder.WED_ID); newWelder.WED_Code = welder.WED_Code; newWelder.WED_Name = welder.WED_Name; @@ -190,7 +190,7 @@ namespace BLL /// public static void UpdateBSWelderItem(Model.BS_Welder welder) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BS_Welder newWelder = db.BS_Welder.First(e => e.WED_ID == welder.WED_ID); newWelder.ThicknessMin = welder.ThicknessMin; newWelder.ThicknessMax = welder.ThicknessMax; @@ -223,7 +223,7 @@ namespace BLL /// public static void DeleteBSWelder(string WED_ID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BS_Welder teamGroup = db.BS_Welder.First(e => e.WED_ID == WED_ID); db.BS_Welder.DeleteOnSubmit(teamGroup); db.SubmitChanges(); diff --git a/SGGL/BLL/BaseInfo/PictureTypeService.cs b/SGGL/BLL/BaseInfo/PictureTypeService.cs index 3e57ddb..4c61816 100644 --- a/SGGL/BLL/BaseInfo/PictureTypeService.cs +++ b/SGGL/BLL/BaseInfo/PictureTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PictureTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰鍥剧墖鍒嗙被 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddPictureType(Model.Base_PictureType PictureType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PictureType newPictureType = new Model.Base_PictureType { PictureTypeId = PictureType.PictureTypeId, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdatePictureType(Model.Base_PictureType PictureType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PictureType newPictureType = db.Base_PictureType.FirstOrDefault(e => e.PictureTypeId == PictureType.PictureTypeId); if (newPictureType != null) { @@ -65,7 +65,7 @@ namespace BLL /// public static void DeletePictureTypeById(string PictureTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PictureType PictureType = db.Base_PictureType.FirstOrDefault(e => e.PictureTypeId == PictureTypeId); if (PictureType != null) { diff --git a/SGGL/BLL/BaseInfo/PositionService.cs b/SGGL/BLL/BaseInfo/PositionService.cs index 582f7f7..eb6515c 100644 --- a/SGGL/BLL/BaseInfo/PositionService.cs +++ b/SGGL/BLL/BaseInfo/PositionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PositionService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓婚敭 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddPosition(Model.Base_Position position) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Position newPosition = new Model.Base_Position { PositionId = position.PositionId, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdatePosition(Model.Base_Position position) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Position newPosition = db.Base_Position.FirstOrDefault(e => e.PositionId == position.PositionId); if (newPosition != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeletePositionById(string positionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Position position = db.Base_Position.FirstOrDefault(e => e.PositionId == positionId); if (position!=null) { diff --git a/SGGL/BLL/BaseInfo/PostService.cs b/SGGL/BLL/BaseInfo/PostService.cs index 417a1a3..f05416f 100644 --- a/SGGL/BLL/BaseInfo/PostService.cs +++ b/SGGL/BLL/BaseInfo/PostService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class PostService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -77,7 +77,7 @@ namespace BLL /// public static void AddPost(Model.Base_Post post) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Post newPost = new Model.Base_Post(); newPost.PostId = post.PostId; newPost.PostName = post.PostName; @@ -92,7 +92,7 @@ namespace BLL /// public static void UpdatePost(Model.Base_Post post) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Post newPost = db.Base_Post.FirstOrDefault(e => e.PostId == post.PostId); if (newPost != null) { @@ -108,7 +108,7 @@ namespace BLL /// public static void DeletePost(string postId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Post newPost = db.Base_Post.FirstOrDefault(e => e.PostId == postId); if (newPost != null) { diff --git a/SGGL/BLL/BaseInfo/PostTitleService.cs b/SGGL/BLL/BaseInfo/PostTitleService.cs index fd663c6..a6fffad 100644 --- a/SGGL/BLL/BaseInfo/PostTitleService.cs +++ b/SGGL/BLL/BaseInfo/PostTitleService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class PostTitleService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -35,7 +35,7 @@ namespace BLL /// public static void AddPostTitle(Model.Base_PostTitle postTitle) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PostTitle newPostTitle = new Model.Base_PostTitle { PostTitleId = postTitle.PostTitleId, @@ -54,7 +54,7 @@ namespace BLL /// public static void UpdatePostTitle(Model.Base_PostTitle postTitle) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PostTitle newPostTitle = db.Base_PostTitle.FirstOrDefault(e => e.PostTitleId == postTitle.PostTitleId); if (newPostTitle != null) { @@ -71,7 +71,7 @@ namespace BLL /// public static void DeletePostTitleById(string postTitleId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PostTitle postTitle = db.Base_PostTitle.FirstOrDefault(e => e.PostTitleId == postTitleId); { db.Base_PostTitle.DeleteOnSubmit(postTitle); diff --git a/SGGL/BLL/BaseInfo/PracticeCertificateService.cs b/SGGL/BLL/BaseInfo/PracticeCertificateService.cs index 19006b1..4d431b6 100644 --- a/SGGL/BLL/BaseInfo/PracticeCertificateService.cs +++ b/SGGL/BLL/BaseInfo/PracticeCertificateService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class PracticeCertificateService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鎵т笟璧勬牸璇佷功 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddPracticeCertificate(Model.Base_PracticeCertificate PracticeCertificate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PracticeCertificate newPracticeCertificate = new Model.Base_PracticeCertificate { PracticeCertificateId = PracticeCertificate.PracticeCertificateId, @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdatePracticeCertificate(Model.Base_PracticeCertificate PracticeCertificate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PracticeCertificate newPracticeCertificate = db.Base_PracticeCertificate.FirstOrDefault(e => e.PracticeCertificateId == PracticeCertificate.PracticeCertificateId); if (newPracticeCertificate != null) { @@ -61,7 +61,7 @@ namespace BLL /// public static void DeletePracticeCertificateById(string PracticeCertificateId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PracticeCertificate PracticeCertificate = db.Base_PracticeCertificate.FirstOrDefault(e => e.PracticeCertificateId == PracticeCertificateId); if (PracticeCertificate != null) { diff --git a/SGGL/BLL/BaseInfo/ProjectTypeService.cs b/SGGL/BLL/BaseInfo/ProjectTypeService.cs index 4518a24..32bce57 100644 --- a/SGGL/BLL/BaseInfo/ProjectTypeService.cs +++ b/SGGL/BLL/BaseInfo/ProjectTypeService.cs @@ -11,7 +11,7 @@ namespace BLL public static class ProjectTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -39,7 +39,7 @@ namespace BLL /// public static void AddProjectType(Model.Base_ProjectType ProjectType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ProjectType newProjectType = new Model.Base_ProjectType { ProjectTypeId = ProjectType.ProjectTypeId, @@ -58,7 +58,7 @@ namespace BLL /// public static void UpdateProjectType(Model.Base_ProjectType ProjectType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ProjectType newProjectType = db.Base_ProjectType.FirstOrDefault(e => e.ProjectTypeId == ProjectType.ProjectTypeId); if (newProjectType != null) { @@ -75,7 +75,7 @@ namespace BLL /// public static void DeleteProjectTypeById(string ProjectTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ProjectType ProjectType = db.Base_ProjectType.FirstOrDefault(e => e.ProjectTypeId == ProjectTypeId); { db.Base_ProjectType.DeleteOnSubmit(ProjectType); diff --git a/SGGL/BLL/BaseInfo/QualityQuestionTypeService.cs b/SGGL/BLL/BaseInfo/QualityQuestionTypeService.cs index bd8267f..5aa3cd3 100644 --- a/SGGL/BLL/BaseInfo/QualityQuestionTypeService.cs +++ b/SGGL/BLL/BaseInfo/QualityQuestionTypeService.cs @@ -10,7 +10,7 @@ namespace BLL { public class QualityQuestionTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇瀹炰綋闆嗗悎 @@ -27,7 +27,7 @@ namespace BLL /// public static void AddQualityQuestionType(Model.Base_QualityQuestionType qualityQuestionType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_QualityQuestionType newQualityQuestionType = new Model.Base_QualityQuestionType { QualityQuestionTypeId = qualityQuestionType.QualityQuestionTypeId, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdateQualityQuestionType(Model.Base_QualityQuestionType qualityQuestionType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_QualityQuestionType newQualityQuestionType = db.Base_QualityQuestionType.FirstOrDefault(e => e.QualityQuestionTypeId == qualityQuestionType.QualityQuestionTypeId); if (newQualityQuestionType != null) { @@ -64,7 +64,7 @@ namespace BLL /// public static void DeleteQualityQuestionTypeById(string qualityQuestionTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_QualityQuestionType qualityQuestionType = db.Base_QualityQuestionType.FirstOrDefault(e => e.QualityQuestionTypeId == qualityQuestionTypeId); { db.Base_QualityQuestionType.DeleteOnSubmit(qualityQuestionType); diff --git a/SGGL/BLL/BaseInfo/QuestionTypeService.cs b/SGGL/BLL/BaseInfo/QuestionTypeService.cs index d12e525..bf63927 100644 --- a/SGGL/BLL/BaseInfo/QuestionTypeService.cs +++ b/SGGL/BLL/BaseInfo/QuestionTypeService.cs @@ -9,7 +9,7 @@ namespace BLL public static class QuestionTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -27,7 +27,7 @@ namespace BLL /// public static void AddQuestionType(Model.Base_QuestionType questionType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_QuestionType newQuestionType = new Model.Base_QuestionType { QuestionTypeID = questionType.QuestionTypeID, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateQuestionType(Model.Base_QuestionType questionType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_QuestionType newQuestionType = db.Base_QuestionType.FirstOrDefault(e => e.QuestionTypeID == questionType.QuestionTypeID); if (newQuestionType != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteQuestionTypeById(string questionTypeID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_QuestionType questionType = db.Base_QuestionType.FirstOrDefault(e => e.QuestionTypeID == questionTypeID); { db.Base_QuestionType.DeleteOnSubmit(questionType); diff --git a/SGGL/BLL/BaseInfo/RiskLevelService.cs b/SGGL/BLL/BaseInfo/RiskLevelService.cs index 3e92769..541cc31 100644 --- a/SGGL/BLL/BaseInfo/RiskLevelService.cs +++ b/SGGL/BLL/BaseInfo/RiskLevelService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RiskLevelService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇璁稿彲璇佺被鍨 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddRiskLevel(Model.Base_RiskLevel reskLevel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_RiskLevel newreskLevel = new Model.Base_RiskLevel { RiskLevelId = reskLevel.RiskLevelId, @@ -50,7 +50,7 @@ namespace BLL /// public static void UpdateLicenseType(Model.Base_RiskLevel riskLevel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_RiskLevel newRiskLevel = db.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId == riskLevel.RiskLevelId); if (newRiskLevel != null) { @@ -71,7 +71,7 @@ namespace BLL /// public static void DeleteRiskLevelById(string riskLevelId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_RiskLevel riskLevel = db.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId== riskLevelId); if (riskLevel != null) { diff --git a/SGGL/BLL/BaseInfo/RulesRegulationsTypeService.cs b/SGGL/BLL/BaseInfo/RulesRegulationsTypeService.cs index 45340d5..c0726b8 100644 --- a/SGGL/BLL/BaseInfo/RulesRegulationsTypeService.cs +++ b/SGGL/BLL/BaseInfo/RulesRegulationsTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RulesRegulationsTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瑙勭珷鍒跺害绫诲埆 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddRulesRegulationsType(Model.Base_RulesRegulationsType rulesRegulationsType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_RulesRegulationsType newRulesRegulationsType = new Model.Base_RulesRegulationsType { RulesRegulationsTypeId = rulesRegulationsType.RulesRegulationsTypeId, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateRulesRegulationsType(Model.Base_RulesRegulationsType rulesRegulationsType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_RulesRegulationsType newRulesRegulationsType = db.Base_RulesRegulationsType.FirstOrDefault(e => e.RulesRegulationsTypeId == rulesRegulationsType.RulesRegulationsTypeId); if (newRulesRegulationsType != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteRulesRegulationsTypeById(string rulesRegulationsTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_RulesRegulationsType rulesRegulationType = db.Base_RulesRegulationsType.FirstOrDefault(e => e.RulesRegulationsTypeId == rulesRegulationsTypeId); if (rulesRegulationType != null) { diff --git a/SGGL/BLL/BaseInfo/SafetyMeasuresService.cs b/SGGL/BLL/BaseInfo/SafetyMeasuresService.cs index 72c9da3..d2e3536 100644 --- a/SGGL/BLL/BaseInfo/SafetyMeasuresService.cs +++ b/SGGL/BLL/BaseInfo/SafetyMeasuresService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SafetyMeasuresService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏鎺柦 @@ -62,7 +62,7 @@ namespace BLL /// public static void UpdateSafetyMeasures(Model.Base_SafetyMeasures SafetyMeasures) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SafetyMeasures newSafetyMeasures = db.Base_SafetyMeasures.FirstOrDefault(e => e.SafetyMeasuresId == SafetyMeasures.SafetyMeasuresId); if (newSafetyMeasures != null) { @@ -79,7 +79,7 @@ namespace BLL /// public static void DeleteSafetyMeasuresById(string SafetyMeasuresId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SafetyMeasures SafetyMeasures = db.Base_SafetyMeasures.FirstOrDefault(e => e.SafetyMeasuresId == SafetyMeasuresId); if (SafetyMeasures != null) { diff --git a/SGGL/BLL/BaseInfo/SecretLevelService.cs b/SGGL/BLL/BaseInfo/SecretLevelService.cs index c808658..247c1cc 100644 --- a/SGGL/BLL/BaseInfo/SecretLevelService.cs +++ b/SGGL/BLL/BaseInfo/SecretLevelService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class SecretLevelService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀵嗙骇 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddSecretLevel(Model.Base_SecretLevel secretLevel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SecretLevel newSecretLevel = new Model.Base_SecretLevel { SecretLevelId = secretLevel.SecretLevelId, @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdateSecretLevel(Model.Base_SecretLevel secretLevel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SecretLevel newSecretLevel = db.Base_SecretLevel.FirstOrDefault(e => e.SecretLevelId == secretLevel.SecretLevelId); if (newSecretLevel != null) { @@ -61,7 +61,7 @@ namespace BLL /// public static void DeleteSecretLevelById(string secretLevelId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SecretLevel secretLevel = db.Base_SecretLevel.FirstOrDefault(e => e.SecretLevelId == secretLevelId); if (secretLevel != null) { diff --git a/SGGL/BLL/BaseInfo/SolutionTempleteTypeService.cs b/SGGL/BLL/BaseInfo/SolutionTempleteTypeService.cs index 6bb5c3b..45cdd2f 100644 --- a/SGGL/BLL/BaseInfo/SolutionTempleteTypeService.cs +++ b/SGGL/BLL/BaseInfo/SolutionTempleteTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SolutionTempleteTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏂藉伐鏂规妯℃澘绫诲瀷 diff --git a/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs b/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs index d9edb36..c7b3d22 100644 --- a/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs +++ b/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class SpecialEquipmentService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏈哄叿璁惧 @@ -27,7 +27,7 @@ namespace BLL /// public static void AddSpecialEquipment(Model.Base_SpecialEquipment specialEquipment) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SpecialEquipment newSpecialEquipment = new Model.Base_SpecialEquipment { SpecialEquipmentId = specialEquipment.SpecialEquipmentId, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdateSpecialEquipment(Model.Base_SpecialEquipment specialEquipment) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SpecialEquipment newSpecialEquipment = db.Base_SpecialEquipment.FirstOrDefault(e => e.SpecialEquipmentId == specialEquipment.SpecialEquipmentId); if (newSpecialEquipment != null) { @@ -66,7 +66,7 @@ namespace BLL /// public static void DeleteSpecialEquipmentById(string specialEquipmentId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SpecialEquipment specialEquipment = db.Base_SpecialEquipment.FirstOrDefault(e => e.SpecialEquipmentId == specialEquipmentId); if (specialEquipment != null) { diff --git a/SGGL/BLL/BaseInfo/SpecialSchemeTypeService.cs b/SGGL/BLL/BaseInfo/SpecialSchemeTypeService.cs index 6f65ff8..4ef7f90 100644 --- a/SGGL/BLL/BaseInfo/SpecialSchemeTypeService.cs +++ b/SGGL/BLL/BaseInfo/SpecialSchemeTypeService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class SpecialSchemeTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddSpecialSchemeType(Model.Base_SpecialSchemeType specialSchemeType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SpecialSchemeType newSpecialSchemeType = new Model.Base_SpecialSchemeType { SpecialSchemeTypeId = specialSchemeType.SpecialSchemeTypeId, @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdateSpecialSchemeType(Model.Base_SpecialSchemeType specialSchemeType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SpecialSchemeType newSpecialSchemeType = db.Base_SpecialSchemeType.FirstOrDefault(e => e.SpecialSchemeTypeId == specialSchemeType.SpecialSchemeTypeId); if (newSpecialSchemeType != null) { @@ -62,7 +62,7 @@ namespace BLL /// public static void DeleteSpecialSchemeTypeById(string specialSchemeTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_SpecialSchemeType specialSchemeType = db.Base_SpecialSchemeType.FirstOrDefault(e => e.SpecialSchemeTypeId == specialSchemeTypeId); { db.Base_SpecialSchemeType.DeleteOnSubmit(specialSchemeType); diff --git a/SGGL/BLL/BaseInfo/SteelService.cs b/SGGL/BLL/BaseInfo/SteelService.cs index 9c9cff4..f73088e 100644 --- a/SGGL/BLL/BaseInfo/SteelService.cs +++ b/SGGL/BLL/BaseInfo/SteelService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class SteelService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -141,7 +141,7 @@ namespace BLL /// public static void AddSteel(Model.BS_Steel steel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BS_Steel newSteel = new Model.BS_Steel(); string newKeyID = SQLHelper.GetNewID(typeof(Model.BS_Steel)); @@ -163,7 +163,7 @@ namespace BLL /// public static void UpdateSteel(Model.BS_Steel steel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BS_Steel newSteel = db.BS_Steel.FirstOrDefault(e => e.STE_ID == steel.STE_ID); newSteel.STE_Code = steel.STE_Code; @@ -182,7 +182,7 @@ namespace BLL /// public static void DeleteSteel(string ste_Id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BS_Steel steel = db.BS_Steel.FirstOrDefault(e => e.STE_ID == ste_Id); db.BS_Steel.DeleteOnSubmit(steel); @@ -196,7 +196,7 @@ namespace BLL /// public static bool IsExitSteelCode(string ste_name ,string SteelId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.BS_Steel where x.STE_Name == ste_name && x.STE_ID != SteelId select x; diff --git a/SGGL/BLL/BaseInfo/TrainLevelService.cs b/SGGL/BLL/BaseInfo/TrainLevelService.cs index fbaf5b6..f062472 100644 --- a/SGGL/BLL/BaseInfo/TrainLevelService.cs +++ b/SGGL/BLL/BaseInfo/TrainLevelService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainLevelService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓婚敭 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddTrainLevel(Model.Base_TrainLevel trainLevel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TrainLevel newTrainLevel = new Model.Base_TrainLevel { TrainLevelId = trainLevel.TrainLevelId, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateTrainLevel(Model.Base_TrainLevel trainLevel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TrainLevel newTrainLevel = db.Base_TrainLevel.FirstOrDefault(e => e.TrainLevelId == trainLevel.TrainLevelId); if (newTrainLevel != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteTrainLevelById(string trainLevelId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TrainLevel trainLevel = db.Base_TrainLevel.FirstOrDefault(e => e.TrainLevelId == trainLevelId); if (trainLevel != null) { diff --git a/SGGL/BLL/BaseInfo/TrainTypeService.cs b/SGGL/BLL/BaseInfo/TrainTypeService.cs index a7b72b8..b21a5a3 100644 --- a/SGGL/BLL/BaseInfo/TrainTypeService.cs +++ b/SGGL/BLL/BaseInfo/TrainTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍩硅绫诲瀷 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddTrainType(Model.Base_TrainType trainType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TrainType newTrainType = new Model.Base_TrainType { TrainTypeId = trainType.TrainTypeId, @@ -49,7 +49,7 @@ namespace BLL /// public static void UpdateTrainType(Model.Base_TrainType trainType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TrainType newTrainType = db.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == trainType.TrainTypeId); if (newTrainType != null) { @@ -69,7 +69,7 @@ namespace BLL /// public static void DeleteTrainTypeById(string trainTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TrainType trainType = db.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == trainTypeId); if (trainType != null) { @@ -147,7 +147,7 @@ namespace BLL /// public static void AddTrainTypeItem(Model.Base_TrainTypeItem getTrainTypeItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TrainTypeItem newTrainTypeItem = new Model.Base_TrainTypeItem { TrainTypeItemId = SQLHelper.GetNewID(), @@ -167,7 +167,7 @@ namespace BLL /// public static void DeleteTrainTypeItemById(string trainTypeItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TrainTypeItem delTrainTypeItem = db.Base_TrainTypeItem.FirstOrDefault(e => e.TrainTypeItemId == trainTypeItemId); if (delTrainTypeItem != null) { diff --git a/SGGL/BLL/BaseInfo/UnitTypeService.cs b/SGGL/BLL/BaseInfo/UnitTypeService.cs index 677efc4..5167edb 100644 --- a/SGGL/BLL/BaseInfo/UnitTypeService.cs +++ b/SGGL/BLL/BaseInfo/UnitTypeService.cs @@ -8,7 +8,7 @@ namespace BLL public static class UnitTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -36,7 +36,7 @@ namespace BLL /// public static void AddUnitType(Model.Base_UnitType unitType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_UnitType newUnitType = new Model.Base_UnitType { UnitTypeId = unitType.UnitTypeId, @@ -55,7 +55,7 @@ namespace BLL /// public static void UpdateUnitType(Model.Base_UnitType unitType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_UnitType newUnitType = db.Base_UnitType.FirstOrDefault(e => e.UnitTypeId == unitType.UnitTypeId); if (newUnitType != null) { @@ -72,7 +72,7 @@ namespace BLL /// public static void DeleteUnitTypeById(string unitTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_UnitType unitType = db.Base_UnitType.FirstOrDefault(e => e.UnitTypeId == unitTypeId); { db.Base_UnitType.DeleteOnSubmit(unitType); diff --git a/SGGL/BLL/BaseInfo/VehicleService.cs b/SGGL/BLL/BaseInfo/VehicleService.cs index 7af7cec..c142f9d 100644 --- a/SGGL/BLL/BaseInfo/VehicleService.cs +++ b/SGGL/BLL/BaseInfo/VehicleService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class VehicleService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏈哄叿璁惧 @@ -27,7 +27,7 @@ namespace BLL /// public static void AddVehicle(Model.HSSE_Vehicle vehicle) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Vehicle newVehicle = new Model.HSSE_Vehicle { VehicleId = vehicle.VehicleId, @@ -53,7 +53,7 @@ namespace BLL /// public static void UpdateVehicle(Model.HSSE_Vehicle vehicle) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Vehicle newVehicle = db.HSSE_Vehicle.FirstOrDefault(e => e.VehicleId == vehicle.VehicleId); if (newVehicle != null) { @@ -78,7 +78,7 @@ namespace BLL /// public static void DeleteVehicleById(string vehicleId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Vehicle vehicle = db.HSSE_Vehicle.FirstOrDefault(e => e.VehicleId == vehicleId); if (vehicle != null) { diff --git a/SGGL/BLL/BaseInfo/WorkPostService.cs b/SGGL/BLL/BaseInfo/WorkPostService.cs index bd5be85..dfd8854 100644 --- a/SGGL/BLL/BaseInfo/WorkPostService.cs +++ b/SGGL/BLL/BaseInfo/WorkPostService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class WorkPostService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -29,7 +29,7 @@ namespace BLL /// public static void AddWorkPost(Model.Base_WorkPost workPost) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WorkPost newWorkPost = new Model.Base_WorkPost { WorkPostId = workPost.WorkPostId, @@ -52,7 +52,7 @@ namespace BLL /// public static void UpdateWorkPost(Model.Base_WorkPost workPost) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WorkPost newWorkPost = db.Base_WorkPost.FirstOrDefault(e => e.WorkPostId == workPost.WorkPostId); if (newWorkPost != null) { @@ -73,7 +73,7 @@ namespace BLL /// public static void DeleteWorkPostById(string workPostId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WorkPost workPost = db.Base_WorkPost.FirstOrDefault(e => e.WorkPostId == workPostId); { db.Base_WorkPost.DeleteOnSubmit(workPost); diff --git a/SGGL/BLL/BaseInfo/WorkStageService.cs b/SGGL/BLL/BaseInfo/WorkStageService.cs index cce824d..452b3b3 100644 --- a/SGGL/BLL/BaseInfo/WorkStageService.cs +++ b/SGGL/BLL/BaseInfo/WorkStageService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class WorkStageService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇宸ヤ綔闃舵 diff --git a/SGGL/BLL/CQMS/Check/CheckControlApproveService.cs b/SGGL/BLL/CQMS/Check/CheckControlApproveService.cs index 1e0a6d3..deafe53 100644 --- a/SGGL/BLL/CQMS/Check/CheckControlApproveService.cs +++ b/SGGL/BLL/CQMS/Check/CheckControlApproveService.cs @@ -10,7 +10,7 @@ namespace BLL { public class CheckControlApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇璐ㄩ噺宸℃妯℃澘鍒楄〃 /// @@ -40,7 +40,7 @@ namespace BLL /// 璐ㄩ噺宸℃缂栧彿 public static void DeleteCheckControlApprovesByCheckControlCode(string CheckControlCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_CheckControlApprove where x.CheckControlCode == CheckControlCode select x).ToList(); db.Check_CheckControlApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -53,7 +53,7 @@ namespace BLL /// public static IQueryable getList(string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var res = from x in db.Check_CheckControlApprove join ca in db.Check_CheckControl on x.CheckControlCode equals ca.CheckControlCode @@ -84,7 +84,7 @@ namespace BLL } public static void See(string CheckControlCode, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.Check_CheckControlApprove.FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -109,7 +109,7 @@ namespace BLL /// 璐ㄩ噺宸℃瀹℃壒瀹炰綋 public static void UpdateCheckControlApprove(Model.Check_CheckControlApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckControlApprove newApprove = db.Check_CheckControlApprove.First(e => e.CheckControlApproveId == approve.CheckControlApproveId && e.ApproveDate == null); newApprove.CheckControlCode = approve.CheckControlCode; newApprove.ApproveMan = approve.ApproveMan; @@ -126,7 +126,7 @@ namespace BLL /// 璐ㄩ噺宸℃瀹℃壒瀹炰綋 public static void AddCheckControlApprove(Model.Check_CheckControlApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_CheckControlApprove)); Model.Check_CheckControlApprove newApprove = new Model.Check_CheckControlApprove(); newApprove.CheckControlApproveId = newKeyID; @@ -142,7 +142,7 @@ namespace BLL } public static string AddCheckControlApproveForApi(Model.Check_CheckControlApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_CheckControlApprove)); Model.Check_CheckControlApprove newApprove = new Model.Check_CheckControlApprove(); @@ -215,7 +215,7 @@ namespace BLL } public static List GetListDataByCodeForApi(string code) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Check_CheckControlApprove where x.CheckControlCode == code && x.ApproveDate != null && x.ApproveType != "S" @@ -250,7 +250,7 @@ namespace BLL } public static Model.Check_CheckControlApprove getCurrApproveForApi(string checkControlCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckControlApprove newApprove = db.Check_CheckControlApprove.FirstOrDefault(e => e.CheckControlCode == checkControlCode && e.ApproveType != "S" && e.ApproveDate == null); if (newApprove != null) @@ -266,7 +266,7 @@ namespace BLL } public static void UpdateCheckControlApproveForApi(Model.Check_CheckControlApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckControlApprove newApprove = db.Check_CheckControlApprove.FirstOrDefault(e => e.CheckControlApproveId == approve.CheckControlApproveId && e.ApproveDate == null); if (newApprove != null) diff --git a/SGGL/BLL/CQMS/Check/CheckControlService.cs b/SGGL/BLL/CQMS/Check/CheckControlService.cs index f14d453..cb9fc80 100644 --- a/SGGL/BLL/CQMS/Check/CheckControlService.cs +++ b/SGGL/BLL/CQMS/Check/CheckControlService.cs @@ -12,14 +12,14 @@ namespace BLL { public class CheckControlService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁璐ㄩ噺妫鏌ヤ笌鎺у埗Id鍒犻櫎涓涓川閲忔鏌ヤ笌鎺у埗淇℃伅 /// /// public static void DeleteCheckControl(string CheckControlId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckControl CheckControl = db.Check_CheckControl.First(e => e.CheckControlCode == CheckControlId); var projectId = CheckControl.ProjectId; db.Check_CheckControl.DeleteOnSubmit(CheckControl); @@ -63,7 +63,7 @@ namespace BLL /// public static void AddCheckControl(Model.Check_CheckControl CheckControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckControl newCheckControl = new Model.Check_CheckControl(); newCheckControl.CheckControlCode = CheckControl.CheckControlCode; newCheckControl.ProposeUnitId = CheckControl.ProposeUnitId; @@ -93,7 +93,7 @@ namespace BLL } public static void AddCheckControlForApi(Model.Check_CheckControl CheckControl) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckControl newCheckControl = new Model.Check_CheckControl(); newCheckControl.CheckControlCode = CheckControl.CheckControlCode; @@ -133,7 +133,7 @@ namespace BLL } public static Model.Check_CheckControl GetCheckControlForApi(string CheckControlCode) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckControl x = db.Check_CheckControl.FirstOrDefault(e => e.CheckControlCode == CheckControlCode); x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode); @@ -219,7 +219,7 @@ namespace BLL /// public static void UpdateCheckControl(Model.Check_CheckControl CheckControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckControl newCheckControl = db.Check_CheckControl.First(e => e.CheckControlCode == CheckControl.CheckControlCode); newCheckControl.DocCode = CheckControl.DocCode; newCheckControl.ProposeUnitId = CheckControl.ProposeUnitId; @@ -246,7 +246,7 @@ namespace BLL } public static List GetListDataForApi(string state, string name, string projectId, int index, int page) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_CheckControl; List ids = new List(); @@ -360,7 +360,7 @@ namespace BLL // 鏌ヨ鏁伴噺 public static string GetListCountStr(string projectId, string searchWord, string unitId, string unitWork, string problemType, string professional, string dateA, string dateZ) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_CheckControl; @@ -422,7 +422,7 @@ namespace BLL } public static List GetListDataForApi(string state, string unitId, string unitWork, string problemType, string professional, string dateA, string dateZ, string projectId, int index, int page) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_CheckControl; @@ -605,7 +605,7 @@ namespace BLL public static void UpdateCheckControlForApi(Model.Check_CheckControl CheckControl) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckControl newCheckControl = db.Check_CheckControl.First(e => e.CheckControlCode == CheckControl.CheckControlCode); if (!string.IsNullOrEmpty(CheckControl.DocCode)) @@ -651,7 +651,7 @@ namespace BLL } public static int GetListCount(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_CheckControl; if (!string.IsNullOrEmpty(projectId)) @@ -668,7 +668,7 @@ namespace BLL // 椤圭洰璐ㄩ噺楠屾敹涓娆″悎鏍肩巼 public static string GetOneCount(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List TotalCheckDetailOKLists = SpotCheckDetailService.GetTotalOKSpotCheckDetailListByTime1(projectId, DateTime.Now); List TotalCheckDetailLists = SpotCheckDetailService.GetTotalAllSpotCheckDetailListByTime(projectId, DateTime.Now); @@ -688,7 +688,7 @@ namespace BLL // 椤圭洰鏂藉伐璧勬枡鍚屾鐜 public static string GetConstruction(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List totalCheckDetailDataOKLists = SpotCheckDetailService.GetAllDataOkSpotCheckDetailListByTime(projectId, DateTime.Now); List totalCheckDetailOKLists = SpotCheckDetailService.GetTotalOKSpotCheckDetailListByTime1(projectId, DateTime.Now); @@ -709,7 +709,7 @@ namespace BLL // 椤圭洰璐ㄩ噺楠屾敹涓娆″悎鏍肩巼 public static string GetQuSuccess(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List totalCheckLists = JointCheckDetailService.GetTotalJointCheckDetailListByTime(projectId, DateTime.Now); int a = totalCheckLists.Where(x => x.OK == 1).Count(); @@ -728,7 +728,7 @@ namespace BLL // 椤圭洰璐ㄩ噺鎺у埗鐐圭粺璁″畬鎴愮巼 public static string GetConSuccess(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Num num = new Model.Num(); var controlItemAndCycles = (from x in db.WBS_ControlItemAndCycle diff --git a/SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs b/SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs index 32a5fd3..9659a01 100644 --- a/SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs +++ b/SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class CheckEquipmentApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇璁捐鍙樻洿妯℃澘鍒楄〃 @@ -80,7 +80,7 @@ namespace BLL /// 璁捐鍙樻洿瀹℃壒瀹炰綋 public static string AddCheckEquipmentApprove(Model.Check_CheckEquipmentApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_CheckEquipmentApprove)); Model.Check_CheckEquipmentApprove newApprove = new Model.Check_CheckEquipmentApprove(); @@ -104,7 +104,7 @@ namespace BLL /// 妫瀹為獙璁惧鎵瑰疄浣 public static string AddCheckEquipmentApproveApi(Model.Check_CheckEquipmentApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_CheckEquipmentApprove)); Model.Check_CheckEquipmentApprove newApprove = new Model.Check_CheckEquipmentApprove(); @@ -128,7 +128,7 @@ namespace BLL /// 妫瀹為獙璁惧瀹炰綋 public static void UpdateCheckEquipmentApproveApi(Model.Check_CheckEquipmentApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckEquipmentApprove newApprove = db.Check_CheckEquipmentApprove.FirstOrDefault(e => e.CheckEquipmentApproveId == approve.CheckEquipmentApproveId && e.ApproveDate == null); //newApprove.CheckEquipmentId = approve.CheckEquipmentId; @@ -150,7 +150,7 @@ namespace BLL /// 璁捐鍙樻洿瀹℃壒瀹炰綋 public static void UpdateCheckEquipmentApprove(Model.Check_CheckEquipmentApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckEquipmentApprove newApprove = db.Check_CheckEquipmentApprove.First(e => e.CheckEquipmentApproveId == approve.CheckEquipmentApproveId && e.ApproveDate == null); newApprove.CheckEquipmentId = approve.CheckEquipmentId; @@ -170,7 +170,7 @@ namespace BLL /// 璁捐鍙樻洿缂栧彿 public static void DeleteCheckEquipmentApprovesByCheckEquipmentId(string CheckEquipmentId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Check_CheckEquipmentApprove where x.CheckEquipmentId == CheckEquipmentId select x).ToList(); db.Check_CheckEquipmentApprove.DeleteAllOnSubmit(q); @@ -223,7 +223,7 @@ namespace BLL // 褰撳墠鍔炵悊鐘舵 public static Model.Check_CheckEquipmentApprove CurrentApproveType(string code) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckEquipmentApprove newApprove = db.Check_CheckEquipmentApprove.FirstOrDefault(e => e.CheckEquipmentId == code && e.ApproveType != "S" && e.ApproveDate == null); diff --git a/SGGL/BLL/CQMS/Check/CheckEquipmentService.cs b/SGGL/BLL/CQMS/Check/CheckEquipmentService.cs index 36e9fe4..53acd3b 100644 --- a/SGGL/BLL/CQMS/Check/CheckEquipmentService.cs +++ b/SGGL/BLL/CQMS/Check/CheckEquipmentService.cs @@ -10,7 +10,7 @@ namespace BLL { public class CheckEquipmentService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -106,7 +106,7 @@ namespace BLL } public static Model.Check_CheckEquipment GetCheckEquipmentByCheckEquipmentIdForApi(string CheckEquipmentId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckEquipment res = db.Check_CheckEquipment.FirstOrDefault(a => a.CheckEquipmentId == CheckEquipmentId); //res.AttachUrl = AttachFileService.getFileUrl(res.CheckEquipmentId); @@ -147,7 +147,7 @@ namespace BLL /// 妫璇曢獙璁惧鍙婃祴閲忓櫒鍏蜂俊鎭疄浣 public static void AddCheckEquipment(Model.Check_CheckEquipment CheckEquipment) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckEquipment newCheckEquipment = new Model.Check_CheckEquipment(); newCheckEquipment.CheckEquipmentId = CheckEquipment.CheckEquipmentId; @@ -181,7 +181,7 @@ namespace BLL /// 妫璇曢獙璁惧鍙婃祴閲忓櫒鍏蜂俊鎭疄浣 public static void UpdateCheckEquipment(Model.Check_CheckEquipment CheckEquipment) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckEquipment newCheckEquipment = db.Check_CheckEquipment.First(e => e.CheckEquipmentId == CheckEquipment.CheckEquipmentId); if (!string.IsNullOrEmpty(CheckEquipment.UserUnitId)) @@ -220,7 +220,7 @@ namespace BLL /// 妫璇曢獙璁惧鍙婃祴閲忓櫒鍏蜂俊鎭疘d public static void DeleteCheckEquipment(string CheckEquipmentId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_CheckEquipment CheckEquipment = db.Check_CheckEquipment.First(e => e.CheckEquipmentId == CheckEquipmentId); @@ -280,7 +280,7 @@ namespace BLL { List listRes = new List(); List unitids = new List(); - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { if (!string.IsNullOrEmpty(name)) { diff --git a/SGGL/BLL/CQMS/Check/CheckFineService.cs b/SGGL/BLL/CQMS/Check/CheckFineService.cs index 17c7abe..4348f9a 100644 --- a/SGGL/BLL/CQMS/Check/CheckFineService.cs +++ b/SGGL/BLL/CQMS/Check/CheckFineService.cs @@ -12,14 +12,14 @@ namespace BLL { public class CheckFineService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁璐ㄩ噺妫鏌ヤ笌鎺у埗Id鍒犻櫎涓涓川閲忔鏌ヤ笌鎺у埗淇℃伅 /// /// public static void DeleteCheckList(string id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckFine CheckFine = db.Check_CheckFine.First(e => e.CheckFineId == id); db.Check_CheckFine.DeleteOnSubmit(CheckFine); db.SubmitChanges(); @@ -31,7 +31,7 @@ namespace BLL /// public static void AddCheckFine(Model.Check_CheckFine CheckControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckFine newCheckControl = new Model.Check_CheckFine(); newCheckControl.CheckFineId = CheckControl.CheckFineId; newCheckControl.CheckControlCode = CheckControl.CheckControlCode; @@ -69,7 +69,7 @@ namespace BLL /// public static void UpdateCheckControl(Model.Check_CheckFine CheckControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckFine newCheckControl = db.Check_CheckFine.First(e => e.CheckFineId == CheckControl.CheckFineId); newCheckControl.DocCode = CheckControl.DocCode; newCheckControl.ProposeUnitId = CheckControl.ProposeUnitId; @@ -95,7 +95,7 @@ namespace BLL public static int GetListCount(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_CheckFine; if (!string.IsNullOrEmpty(projectId)) diff --git a/SGGL/BLL/CQMS/Check/CheckMonthService.cs b/SGGL/BLL/CQMS/Check/CheckMonthService.cs index a4efdc3..251f3ca 100644 --- a/SGGL/BLL/CQMS/Check/CheckMonthService.cs +++ b/SGGL/BLL/CQMS/Check/CheckMonthService.cs @@ -9,7 +9,7 @@ namespace BLL { public class CheckMonthService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -81,7 +81,7 @@ namespace BLL /// public static void AddCheckMonth(Model.Check_CheckMonth CheckMonth) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckMonth newCheckMonth = new Model.Check_CheckMonth(); newCheckMonth.CheckMonthId = CheckMonth.CheckMonthId; newCheckMonth.ProjectId = CheckMonth.ProjectId; @@ -112,7 +112,7 @@ namespace BLL /// public static void UpdateCheckMonth(Model.Check_CheckMonth CheckMonth) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckMonth newCheckMonth = db.Check_CheckMonth.First(e => e.CheckMonthId == CheckMonth.CheckMonthId); newCheckMonth.ThisRectifyNum = CheckMonth.ThisRectifyNum; newCheckMonth.ThisOKRectifyNum = CheckMonth.ThisOKRectifyNum; @@ -137,7 +137,7 @@ namespace BLL /// public static void DeleteCheckMonth(string CheckMonthId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckMonth CheckMonth = db.Check_CheckMonth.First(e => e.CheckMonthId == CheckMonthId); db.Check_CheckMonth.DeleteOnSubmit(CheckMonth); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Check/DesignApproveService.cs b/SGGL/BLL/CQMS/Check/DesignApproveService.cs index fa1ceb7..3793b5d 100644 --- a/SGGL/BLL/CQMS/Check/DesignApproveService.cs +++ b/SGGL/BLL/CQMS/Check/DesignApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class DesignApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇璁捐鍙樻洿妯℃澘鍒楄〃 @@ -85,7 +85,7 @@ namespace BLL /// 璁捐鍙樻洿瀹℃壒瀹炰綋 public static void AddDesignApprove(Model.Check_DesignApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_DesignApprove)); Model.Check_DesignApprove newApprove = new Model.Check_DesignApprove(); newApprove.DesignApproveId = newKeyID; @@ -101,7 +101,7 @@ namespace BLL } public static string AddDesignApproveForApi(Model.Check_DesignApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_DesignApprove)); Model.Check_DesignApprove newApprove = new Model.Check_DesignApprove(); @@ -124,7 +124,7 @@ namespace BLL /// 璁捐鍙樻洿瀹℃壒瀹炰綋 public static void UpdateDesignApprove(Model.Check_DesignApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_DesignApprove newApprove = db.Check_DesignApprove.First(e => e.DesignApproveId == approve.DesignApproveId && e.ApproveDate == null); newApprove.DesignId = approve.DesignId; newApprove.ApproveMan = approve.ApproveMan; @@ -141,7 +141,7 @@ namespace BLL /// 璁捐鍙樻洿瀹℃壒瀹炰綋 public static void UpdateDesignApproveForApi(Model.Check_DesignApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_DesignApprove newApprove = db.Check_DesignApprove.FirstOrDefault(e => e.DesignApproveId == approve.DesignApproveId); if (newApprove != null) @@ -169,7 +169,7 @@ namespace BLL /// 璁捐鍙樻洿缂栧彿 public static void DeleteDesignApprovesByDesignId(string DesignId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_DesignApprove where x.DesignId == DesignId select x).ToList(); db.Check_DesignApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -187,7 +187,7 @@ namespace BLL } public static List getListDataByIdForApi(string DesignId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Check_DesignApprove where x.DesignId == DesignId && x.ApproveDate != null && x.ApproveType != "S" @@ -221,7 +221,7 @@ namespace BLL } public static Model.Check_DesignApprove getCurrApproveForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_DesignApprove newApprove = db.Check_DesignApprove.FirstOrDefault(e => e.DesignId == id && e.ApproveType != "S" && e.ApproveDate == null); if (newApprove != null) diff --git a/SGGL/BLL/CQMS/Check/DesignService.cs b/SGGL/BLL/CQMS/Check/DesignService.cs index 79ecb8b..4b11f7d 100644 --- a/SGGL/BLL/CQMS/Check/DesignService.cs +++ b/SGGL/BLL/CQMS/Check/DesignService.cs @@ -11,7 +11,7 @@ namespace BLL { public class DesignService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -63,7 +63,7 @@ namespace BLL } public static Model.Check_Design GetDesignByDesignIdForApi(string DesignId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_Design res = db.Check_Design.FirstOrDefault(x => x.DesignId == DesignId); @@ -83,7 +83,7 @@ namespace BLL /// 璁捐鍙樻洿淇℃伅瀹炰綋 public static void AddDesign(Model.Check_Design Design) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_Design newDesign = new Model.Check_Design(); newDesign.DesignId = Design.DesignId; newDesign.ProjectId = Design.ProjectId; @@ -113,7 +113,7 @@ namespace BLL } public static void AddDesignForApi(Model.Check_Design Design) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_Design newDesign = new Model.Check_Design(); newDesign.DesignId = Design.DesignId; @@ -149,7 +149,7 @@ namespace BLL /// 璁捐鍙樻洿淇℃伅瀹炰綋 public static void UpdateDesign(Model.Check_Design Design) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_Design newDesign = db.Check_Design.First(e => e.DesignId == Design.DesignId); newDesign.DesignCode = Design.DesignCode; newDesign.MainItemId = Design.MainItemId; @@ -179,7 +179,7 @@ namespace BLL /// 璁捐鍙樻洿淇℃伅Id public static void DeleteDesign(string DesignId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_Design Design = db.Check_Design.First(e => e.DesignId == DesignId); db.Check_Design.DeleteOnSubmit(Design); @@ -235,7 +235,7 @@ namespace BLL /// 缁撴潫鏃堕棿 public static IEnumerable GetDesignListByTime(string projectId, DateTime startTime, DateTime endTime) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return from x in db.Check_Design where x.ProjectId == projectId && x.DesignDate >= startTime && x.DesignDate < endTime select new @@ -329,7 +329,7 @@ namespace BLL } public static List getListDataForApi(string projectId, string unitName, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_Design; if (!string.IsNullOrEmpty(projectId)) @@ -462,7 +462,7 @@ namespace BLL public static List getListDataForApi(string carryUnitIds, string state, string mainItemId, string cNProfessionalCode, string designType, string designDateA, string designDateZ, string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_Design; if (!string.IsNullOrEmpty(projectId) && "undefined" != projectId) @@ -611,7 +611,7 @@ namespace BLL public static void UpdateDesignForApi(Model.Check_Design Design) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_Design newDesign = db.Check_Design.FirstOrDefault(e => e.DesignId == Design.DesignId); if (newDesign != null) diff --git a/SGGL/BLL/CQMS/Check/DrawApproveService.cs b/SGGL/BLL/CQMS/Check/DrawApproveService.cs index d615cba..433d679 100644 --- a/SGGL/BLL/CQMS/Check/DrawApproveService.cs +++ b/SGGL/BLL/CQMS/Check/DrawApproveService.cs @@ -15,7 +15,7 @@ namespace BLL /// 鍥剧焊瀹℃壒瀹炰綋 public static void AddDrawApprove(Model.Check_DrawApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_DrawApprove)); Model.Check_DrawApprove newApprove = new Model.Check_DrawApprove(); newApprove.DrawApproveId = newKeyID; @@ -36,7 +36,7 @@ namespace BLL /// 鍥剧焊瀹℃壒瀹炰綋 public static void UpdateDrawApprove(Model.Check_DrawApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_DrawApprove newApprove = db.Check_DrawApprove.First(e => e.DrawApproveId == approve.DrawApproveId && e.ApproveDate == null); newApprove.DrawId = approve.DrawId; newApprove.ApproveMan = approve.ApproveMan; @@ -54,7 +54,7 @@ namespace BLL /// 鍥剧焊瀹℃壒瀹炰綋 public static void UpdateDrawApproveForApi(Model.Check_DrawApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_DrawApprove newApprove = db.Check_DrawApprove.FirstOrDefault(e => e.DrawApproveId == approve.DrawApproveId); if (newApprove != null) @@ -83,7 +83,7 @@ namespace BLL /// 鍥剧焊缂栧彿 public static void DeleteDrawApprovesByDrawId(string DrawId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_DrawApprove where x.DrawId == DrawId select x).ToList(); db.Check_DrawApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -91,7 +91,7 @@ namespace BLL public static void See(string DrawId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var item = db.Check_DrawApprove.FirstOrDefault(x => x.DrawId == DrawId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (item != null) diff --git a/SGGL/BLL/CQMS/Check/DrawService.cs b/SGGL/BLL/CQMS/Check/DrawService.cs index 925e521..eaf2230 100644 --- a/SGGL/BLL/CQMS/Check/DrawService.cs +++ b/SGGL/BLL/CQMS/Check/DrawService.cs @@ -20,7 +20,7 @@ namespace BLL } public static Model.Check_Draw GetDrawForApi(string drawId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_Draw draw = db.Check_Draw.FirstOrDefault(x => x.DrawId == drawId); string mainItemName = string.Empty; @@ -48,7 +48,7 @@ namespace BLL /// public static void AddCheckDraw(Model.Check_Draw Draw) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_Draw newDraw = new Model.Check_Draw(); newDraw.DrawId = Draw.DrawId; newDraw.ProjectId = Draw.ProjectId; @@ -72,7 +72,7 @@ namespace BLL /// public static void UpdateCheckDraw(Model.Check_Draw Draw) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_Draw newDraw = db.Check_Draw.FirstOrDefault(e => e.DrawId == Draw.DrawId); if (newDraw != null) { @@ -97,7 +97,7 @@ namespace BLL /// public static void DeleteDrawById(string DrawId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_Draw Draw = db.Check_Draw.FirstOrDefault(e => e.DrawId == DrawId); if (Draw != null) { @@ -138,7 +138,7 @@ namespace BLL { List codes = new List(); - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { if (!string.IsNullOrEmpty(name)) { diff --git a/SGGL/BLL/CQMS/Check/FileCabinetService.cs b/SGGL/BLL/CQMS/Check/FileCabinetService.cs index 3367e4f..3d68f8c 100644 --- a/SGGL/BLL/CQMS/Check/FileCabinetService.cs +++ b/SGGL/BLL/CQMS/Check/FileCabinetService.cs @@ -9,7 +9,7 @@ namespace BLL { public class FileCabinetService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 澧炲姞淇℃伅 /// @@ -44,7 +44,7 @@ namespace BLL /// 淇℃伅Id public static void DeleteFileCabinet(string fileCabinetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Project_FileCabinet FileCabinet = db.Project_FileCabinet.FirstOrDefault(e => e.FileCabinetId == fileCabinetId); if (FileCabinet != null) { diff --git a/SGGL/BLL/CQMS/Check/JointCheckApproveService.cs b/SGGL/BLL/CQMS/Check/JointCheckApproveService.cs index 2df2b72..4dc7255 100644 --- a/SGGL/BLL/CQMS/Check/JointCheckApproveService.cs +++ b/SGGL/BLL/CQMS/Check/JointCheckApproveService.cs @@ -9,14 +9,14 @@ namespace BLL { public class JointCheckApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁璐ㄩ噺鍏辨缂栧彿鍒犻櫎瀵瑰簲鐨勬墍鏈夎川閲忓叡妫瀹℃壒淇℃伅 /// /// 璐ㄩ噺鍏辨缂栧彿 public static void DeleteJointCheckApprovesByJointCheckId(string JointCheckId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_JointCheckApprove where x.JointCheckId == JointCheckId select x).ToList(); db.Check_JointCheckApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -125,7 +125,7 @@ namespace BLL /// 璐ㄩ噺鍏辨瀹℃壒瀹炰綋 public static string AddJointCheckApproveForApi(Model.Check_JointCheckApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_JointCheckApprove)); Model.Check_JointCheckApprove newApprove = new Model.Check_JointCheckApprove(); @@ -144,7 +144,7 @@ namespace BLL } public static void AddJointCheckApprove(Model.Check_JointCheckApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_JointCheckApprove)); Model.Check_JointCheckApprove newApprove = new Model.Check_JointCheckApprove(); newApprove.JointCheckApproveId = newKeyID; @@ -165,7 +165,7 @@ namespace BLL /// 璐ㄩ噺鍏辨瀹℃壒瀹炰綋 public static void UpdateJointCheckApprove(Model.Check_JointCheckApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_JointCheckApprove newApprove = db.Check_JointCheckApprove.First(e => e.JointCheckApproveId == approve.JointCheckApproveId && e.ApproveDate == null); newApprove.JointCheckId = approve.JointCheckId; newApprove.ApproveMan = approve.ApproveMan; @@ -182,7 +182,7 @@ namespace BLL } public static void See(string JointCheckId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var item = db.Check_JointCheckApprove.FirstOrDefault(x => x.JointCheckId == JointCheckId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (item != null) @@ -263,7 +263,7 @@ namespace BLL } public static List getListDataByJcidForApi(string JointCheckId, string JointCheckDetailId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Check_JointCheckApprove where x.JointCheckId == JointCheckId && x.JointCheckDetailId == JointCheckDetailId && x.ApproveDate != null && x.ApproveType != "S" @@ -297,7 +297,7 @@ namespace BLL } public static Model.Check_JointCheckApprove getCurrApproveByDetailIdForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List res = new List(); @@ -309,7 +309,7 @@ namespace BLL } public static List getCurrApproveForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List res = new List(); @@ -345,7 +345,7 @@ namespace BLL } public static Model.Check_JointCheckApprove getCurrApproveByJoinCheckIdForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List res = new List(); Model.Check_JointCheckApprove item = db.Check_JointCheckApprove.FirstOrDefault(e => e.JointCheckId == id && e.ApproveType != "S" && e.ApproveDate == null); @@ -374,7 +374,7 @@ namespace BLL } public static Model.Check_JointCheckApprove UpdateJointCheckApproveForApi(Model.Check_JointCheckApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_JointCheckApprove newApprove = db.Check_JointCheckApprove.FirstOrDefault(e => e.JointCheckApproveId == approve.JointCheckApproveId); if (newApprove != null) diff --git a/SGGL/BLL/CQMS/Check/JointCheckDetailService.cs b/SGGL/BLL/CQMS/Check/JointCheckDetailService.cs index eb4e391..c194567 100644 --- a/SGGL/BLL/CQMS/Check/JointCheckDetailService.cs +++ b/SGGL/BLL/CQMS/Check/JointCheckDetailService.cs @@ -15,7 +15,7 @@ namespace BLL /// 璐ㄩ噺鍏辨鏄庣粏瀹炰綋 public static void UpdateJointCheckDetail(Model.Check_JointCheckDetail a) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_JointCheckDetail newJointCheckDetail = db.Check_JointCheckDetail.First(e => e.JointCheckDetailId == a.JointCheckDetailId); newJointCheckDetail.UnitWorkId = a.UnitWorkId; newJointCheckDetail.CNProfessionalCode = a.CNProfessionalCode; @@ -45,7 +45,7 @@ namespace BLL } public static Model.Check_JointCheckDetail GetJointCheckDetailByJointCheckDetailIdForApi(string JointCheckDetailId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.Check_JointCheckDetail.FirstOrDefault(e => e.JointCheckDetailId == JointCheckDetailId); res.AttachUrl = AttachFileService.getFileUrl(res.JointCheckDetailId); @@ -107,7 +107,7 @@ namespace BLL public static List GetListsForApi(string jointCheckId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_JointCheckDetail where x.JointCheckId == jointCheckId orderby x.CreateDate select x).ToList(); @@ -149,7 +149,7 @@ namespace BLL /// 璐ㄩ噺鍏辨鏄庣粏涓婚敭 public static void DeleteJointCheckDetailByJointCheckId(string JointCheckId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_JointCheckDetail where x.JointCheckId == JointCheckId select x).ToList(); db.Check_JointCheckDetail.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -160,7 +160,7 @@ namespace BLL /// 璐ㄩ噺鍏辨鏄庣粏瀹炰綋 public static void AddJointCheckDetail(Model.Check_JointCheckDetail a) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_JointCheckDetail newJointCheckDetail = new Model.Check_JointCheckDetail(); newJointCheckDetail.JointCheckDetailId = a.JointCheckDetailId; newJointCheckDetail.JointCheckId = a.JointCheckId; @@ -186,7 +186,7 @@ namespace BLL } public static void AddJointCheckDetailForApi(Model.Check_JointCheckDetail a) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_JointCheckDetail newJointCheckDetail = new Model.Check_JointCheckDetail(); newJointCheckDetail.JointCheckDetailId = a.JointCheckDetailId; @@ -236,7 +236,7 @@ namespace BLL } public static List getListDataForApi(string JointCheckId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.View_Check_JointCheckDetail; if (!string.IsNullOrEmpty(JointCheckId)) @@ -318,7 +318,7 @@ namespace BLL } public static void DeleteJointCheckDetailById(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Check_JointCheckDetail where x.JointCheckDetailId == id select x).ToList(); db.Check_JointCheckDetail.DeleteAllOnSubmit(q); @@ -327,7 +327,7 @@ namespace BLL } public static void UpdateJointCheckDetailForApi(Model.Check_JointCheckDetail a) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_JointCheckDetail newJointCheckDetail = db.Check_JointCheckDetail.FirstOrDefault(e => e.JointCheckDetailId == a.JointCheckDetailId); if (newJointCheckDetail != null) diff --git a/SGGL/BLL/CQMS/Check/JointCheckService.cs b/SGGL/BLL/CQMS/Check/JointCheckService.cs index 7e6a43e..f905142 100644 --- a/SGGL/BLL/CQMS/Check/JointCheckService.cs +++ b/SGGL/BLL/CQMS/Check/JointCheckService.cs @@ -34,7 +34,7 @@ namespace BLL /// public static void DeleteJointCheck(string JointCheckId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_JointCheck JointCheck = db.Check_JointCheck.First(e => e.JointCheckId == JointCheckId); db.Check_JointCheck.DeleteOnSubmit(JointCheck); db.SubmitChanges(); @@ -91,7 +91,7 @@ namespace BLL /// public static void AddJointCheck(Model.Check_JointCheck JointCheck) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_JointCheck newJointCheck = new Model.Check_JointCheck(); newJointCheck.JointCheckId = JointCheck.JointCheckId; newJointCheck.JointCheckCode = JointCheck.JointCheckCode; @@ -113,7 +113,7 @@ namespace BLL } public static void AddJointCheckForApi(Model.Check_JointCheck JointCheck) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_JointCheck newJointCheck = new Model.Check_JointCheck(); newJointCheck.JointCheckId = JointCheck.JointCheckId; @@ -147,7 +147,7 @@ namespace BLL /// public static void UpdateJointCheck(Model.Check_JointCheck JointCheck) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_JointCheck newJointCheck = db.Check_JointCheck.First(e => e.JointCheckId == JointCheck.JointCheckId); newJointCheck.JointCheckCode = JointCheck.JointCheckCode; newJointCheck.ProjectId = JointCheck.ProjectId; @@ -236,7 +236,7 @@ namespace BLL } public static Model.Check_JointCheck GetJointCheckForApi(string JointCheckId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.Check_JointCheck.FirstOrDefault(e => e.JointCheckId == JointCheckId); res.UnitId = res.UnitId + "$" + UnitService.getUnitNamesUnitIds(res.UnitId); @@ -268,7 +268,7 @@ namespace BLL } public static int GetListCount(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_JointCheck; @@ -282,7 +282,7 @@ namespace BLL } public static List GetListDataForApi(string name, string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_JointCheck; if (!string.IsNullOrEmpty(name)) @@ -352,7 +352,7 @@ namespace BLL } public static List GetListDataForApi(string name, string code, string unitId, string proposeUnitId, string type, string dateA, string dateZ, string projectId, string state, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_JointCheck; if (!string.IsNullOrEmpty(name) && "undefined" != name) @@ -487,7 +487,7 @@ namespace BLL } public static void UpdateJointCheckForApi(Model.Check_JointCheck JointCheck) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_JointCheck newJointCheck = db.Check_JointCheck.First(e => e.JointCheckId == JointCheck.JointCheckId); if (!string.IsNullOrEmpty(JointCheck.JointCheckCode)) diff --git a/SGGL/BLL/CQMS/Check/MonthSpotCheckDetailService.cs b/SGGL/BLL/CQMS/Check/MonthSpotCheckDetailService.cs index d4cfe13..ee46b37 100644 --- a/SGGL/BLL/CQMS/Check/MonthSpotCheckDetailService.cs +++ b/SGGL/BLL/CQMS/Check/MonthSpotCheckDetailService.cs @@ -8,7 +8,7 @@ namespace BLL { public class MonthSpotCheckDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鏈堟姤璐ㄩ噺楠屾敹鎯呭喌妯℃澘鍒楄〃 @@ -39,7 +39,7 @@ namespace BLL /// 鏈堟姤璐ㄩ噺楠屾敹鎯呭喌瀹炰綋 public static void AddMonthSpotCheckDetail(Model.Check_MonthSpotCheckDetail monthSpotCheckDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_MonthSpotCheckDetail newApprove = new Model.Check_MonthSpotCheckDetail(); newApprove.MonthSpotCheckDetailId = monthSpotCheckDetail.MonthSpotCheckDetailId; newApprove.CheckMonthId = monthSpotCheckDetail.CheckMonthId; @@ -60,7 +60,7 @@ namespace BLL /// 鏈堟姤璐ㄩ噺楠屾敹鎯呭喌缂栧彿 public static void DeleteMonthSpotCheckDetailsByCheckMonthId(string CheckMonthId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_MonthSpotCheckDetail where x.CheckMonthId == CheckMonthId select x).ToList(); if (q.Count() > 0) { @@ -75,7 +75,7 @@ namespace BLL /// 鏈堟姤璐ㄩ噺楠屾敹鎯呭喌缂栧彿 public static List GetMonthSpotCheckDetailsByCheckMonthId(string CheckMonthId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.Check_MonthSpotCheckDetail where x.CheckMonthId == CheckMonthId select x).ToList(); } } diff --git a/SGGL/BLL/CQMS/Check/RewardAndPunishService.cs b/SGGL/BLL/CQMS/Check/RewardAndPunishService.cs index 4606483..fd76d72 100644 --- a/SGGL/BLL/CQMS/Check/RewardAndPunishService.cs +++ b/SGGL/BLL/CQMS/Check/RewardAndPunishService.cs @@ -24,7 +24,7 @@ namespace BLL /// public static void AddRewardAndPunish(Model.Check_RewardAndPunish RewardAndPunish) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_RewardAndPunish newRewardAndPunish = new Model.Check_RewardAndPunish(); newRewardAndPunish.RewardAndPunishID = RewardAndPunish.RewardAndPunishID; newRewardAndPunish.ProjectId = RewardAndPunish.ProjectId; @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdateRewardAndPunish(Model.Check_RewardAndPunish RewardAndPunish) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_RewardAndPunish newRewardAndPunish = db.Check_RewardAndPunish.FirstOrDefault(e => e.RewardAndPunishID == RewardAndPunish.RewardAndPunishID); if (newRewardAndPunish != null) { @@ -66,7 +66,7 @@ namespace BLL /// public static void DeleteRewardAndPunishById(string RewardAndPunishID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_RewardAndPunish RewardAndPunish = db.Check_RewardAndPunish.FirstOrDefault(e => e.RewardAndPunishID == RewardAndPunishID); if (RewardAndPunish != null) { diff --git a/SGGL/BLL/CQMS/Check/SpecialEquipmentDetailService.cs b/SGGL/BLL/CQMS/Check/SpecialEquipmentDetailService.cs index 228559c..5e049fb 100644 --- a/SGGL/BLL/CQMS/Check/SpecialEquipmentDetailService.cs +++ b/SGGL/BLL/CQMS/Check/SpecialEquipmentDetailService.cs @@ -9,7 +9,7 @@ namespace BLL { public class SpecialEquipmentDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鏈堟姤鐗圭璁惧淇℃伅妯℃澘鍒楄〃 @@ -42,7 +42,7 @@ namespace BLL /// 鏈堟姤鐗圭璁惧淇℃伅瀹炰綋 public static void AddSpecialEquipmentDetail(Model.Check_SpecialEquipmentDetail specialEquipmentDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpecialEquipmentDetail newApprove = new Model.Check_SpecialEquipmentDetail(); newApprove.SpecialEquipmentDetailId = specialEquipmentDetail.SpecialEquipmentDetailId; newApprove.CheckMonthId = specialEquipmentDetail.CheckMonthId; @@ -65,7 +65,7 @@ namespace BLL /// 鏈堟姤鐗圭璁惧淇℃伅缂栧彿 public static void DeleteSpecialEquipmentDetailsByCheckMonthId(string CheckMonthId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_SpecialEquipmentDetail where x.CheckMonthId == CheckMonthId select x).ToList(); if (q.Count() > 0) { @@ -80,7 +80,7 @@ namespace BLL /// 鏈堟姤鐗圭璁惧淇℃伅缂栧彿 public static List GetList(string CheckMonthId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.Check_SpecialEquipmentDetail where x.CheckMonthId == CheckMonthId select x).ToList(); } } diff --git a/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs b/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs index 4c50381..d4250fe 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs @@ -8,7 +8,7 @@ namespace BLL { public class SpotCheckApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; public static Model.Check_SpotCheckApprove GetSpotApproveBySpotCheckDetailId(string spotCheckDetailId) { @@ -99,7 +99,7 @@ namespace BLL } public static Model.Check_SpotCheckApprove GetComplieForApi(string SpotCheckCode) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_Compile); } @@ -111,7 +111,7 @@ namespace BLL } public static void See(string SpotCheckCode, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -147,7 +147,7 @@ namespace BLL /// 瀹炰綋楠屾敹瀹℃壒瀹炰綋 public static void AddSpotCheckApprove(Model.Check_SpotCheckApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_SpotCheckApprove)); Model.Check_SpotCheckApprove newApprove = new Model.Check_SpotCheckApprove(); newApprove.SpotCheckApproveId = newKeyID; @@ -165,7 +165,7 @@ namespace BLL } public static string AddSpotCheckApproveForApi(Model.Check_SpotCheckApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_SpotCheckApprove)); Model.Check_SpotCheckApprove newApprove = new Model.Check_SpotCheckApprove(); @@ -190,7 +190,7 @@ namespace BLL /// 瀹炰綋楠屾敹瀹℃壒瀹炰綋 public static void UpdateSpotCheckApprove(Model.Check_SpotCheckApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpotCheckApprove newApprove = db.Check_SpotCheckApprove.First(e => e.SpotCheckApproveId == approve.SpotCheckApproveId && e.ApproveDate == null); newApprove.SpotCheckCode = approve.SpotCheckCode; newApprove.ApproveMan = approve.ApproveMan; @@ -208,7 +208,7 @@ namespace BLL /// 瀹炰綋楠屾敹缂栧彿 public static void DeleteSpotCheckApprovesBySpotCheckCode(string SpotCheckCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_SpotCheckApprove where x.SpotCheckCode == SpotCheckCode select x).ToList(); db.Check_SpotCheckApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -257,7 +257,7 @@ namespace BLL } public static Model.Check_SpotCheckApprove getCurrApproveForApi(string SpotCheckCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpotCheckApprove newApprove = db.Check_SpotCheckApprove.FirstOrDefault(e => e.SpotCheckCode == SpotCheckCode && e.ApproveType != "S" && e.ApproveDate == null); if (newApprove != null) { @@ -271,7 +271,7 @@ namespace BLL } public static void UpdateSpotCheckApproveForApi(Model.Check_SpotCheckApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_SpotCheckApprove newApprove = db.Check_SpotCheckApprove.First(e => e.SpotCheckApproveId == approve.SpotCheckApproveId); if (!string.IsNullOrEmpty(approve.SpotCheckCode)) @@ -297,7 +297,7 @@ namespace BLL /// 瀹炰綋楠屾敹缂栧彿 public static void DeleteSpotCheckApprovesBySpotCheckDetailId(string spotCheckDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_SpotCheckApprove where x.SpotCheckDetailId == spotCheckDetailId select x).ToList(); db.Check_SpotCheckApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs b/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs index 9f9b1b7..90b82a4 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs @@ -9,7 +9,7 @@ namespace BLL { public class SpotCheckDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇瀹炰綋楠屾敹璁板綍鏄庣粏 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddSpotCheckDetail(Model.Check_SpotCheckDetail SpotCheckDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpotCheckDetail newSpotCheckDetail = new Model.Check_SpotCheckDetail(); newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId; newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode; @@ -54,7 +54,7 @@ namespace BLL } public static void AddSpotCheckDetailForApi(Model.Check_SpotCheckDetail SpotCheckDetail) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_SpotCheckDetail newSpotCheckDetail = new Model.Check_SpotCheckDetail(); newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId; @@ -76,7 +76,7 @@ namespace BLL /// public static void UpdateSpotCheckDetail(Model.Check_SpotCheckDetail SpotCheckDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpotCheckDetail newSpotCheckDetail = db.Check_SpotCheckDetail.First(e => e.SpotCheckDetailId == SpotCheckDetail.SpotCheckDetailId); newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode; newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId; @@ -99,14 +99,14 @@ namespace BLL /// public static void DeleteSpotCheckDetail(string SpotCheckDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpotCheckDetail SpotCheckDetail = db.Check_SpotCheckDetail.First(e => e.SpotCheckDetailId == SpotCheckDetailId); db.Check_SpotCheckDetail.DeleteOnSubmit(SpotCheckDetail); db.SubmitChanges(); } public static void DeleteSpotCheckDetailForApi(string SpotCheckDetailId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_SpotCheckDetail SpotCheckDetail = db.Check_SpotCheckDetail.First(e => e.SpotCheckDetailId == SpotCheckDetailId); db.Check_SpotCheckDetail.DeleteOnSubmit(SpotCheckDetail); @@ -119,7 +119,7 @@ namespace BLL /// public static void DeleteAllSpotCheckDetail(string SpotCheckCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_SpotCheckDetail where x.SpotCheckCode == SpotCheckCode select x).ToList(); db.Check_SpotCheckDetail.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -158,7 +158,7 @@ namespace BLL /// public static List GetSpotCheckDetails(string SpotCheckCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_SpotCheckDetail join y in db.WBS_ControlItemAndCycle @@ -170,7 +170,7 @@ namespace BLL } public static List GetSpotCheckDetailsForApi(string SpotCheckCode) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_SpotCheckDetail join y in db.WBS_ControlItemAndCycle @@ -187,7 +187,7 @@ namespace BLL /// public static List GetOKSpotCheckDetails(string SpotCheckCode) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_SpotCheckDetail join y in db.WBS_ControlItemAndCycle @@ -199,7 +199,7 @@ namespace BLL } public static List GetOKSpotCheckDetailsForApi(string SpotCheckCode) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_SpotCheckDetail join y in db.WBS_ControlItemAndCycle @@ -216,7 +216,7 @@ namespace BLL /// public static List GetShowSpotCheckDetails(string SpotCheckCode) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_SpotCheckDetail join y in db.WBS_ControlItemAndCycle @@ -297,7 +297,7 @@ namespace BLL /// 宸ョ▼绫诲瀷 public static List GetOKSpotCheckDetailListByTime(string projectId, DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_SpotCheckDetail join y in db.Check_SpotCheck @@ -315,7 +315,7 @@ namespace BLL /// 宸ョ▼绫诲瀷 public static List GetTotalOKSpotCheckDetailListByTime(string projectId, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Check_SpotCheckDetail join y in db.Check_SpotCheck @@ -326,7 +326,7 @@ namespace BLL } public static void UpdateSpotCheckDetailForApi(Model.Check_SpotCheckDetail SpotCheckDetail) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_SpotCheckDetail newSpotCheckDetail = db.Check_SpotCheckDetail.First(e => e.SpotCheckDetailId == SpotCheckDetail.SpotCheckDetailId); if (!string.IsNullOrEmpty(SpotCheckDetail.SpotCheckCode)) diff --git a/SGGL/BLL/CQMS/Check/SpotCheckService.cs b/SGGL/BLL/CQMS/Check/SpotCheckService.cs index 4960341..bbe70da 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckService.cs @@ -11,7 +11,7 @@ namespace BLL { public class SpotCheckService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 娣诲姞瀹炰綋楠屾敹璁板綍 @@ -19,7 +19,7 @@ namespace BLL /// public static void AddSpotCheck(Model.Check_SpotCheck SpotCheck) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpotCheck newSpotCheck = new Model.Check_SpotCheck(); newSpotCheck.SpotCheckCode = SpotCheck.SpotCheckCode; newSpotCheck.DocCode = SpotCheck.DocCode; @@ -46,7 +46,7 @@ namespace BLL } public static void AddSpotCheckForApi(Model.Check_SpotCheck SpotCheck) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_SpotCheck newSpotCheck = new Model.Check_SpotCheck(); newSpotCheck.SpotCheckCode = SpotCheck.SpotCheckCode; @@ -79,7 +79,7 @@ namespace BLL /// public static void UpdateSpotCheck(Model.Check_SpotCheck SpotCheck) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpotCheck newSpotCheck = db.Check_SpotCheck.First(e => e.SpotCheckCode == SpotCheck.SpotCheckCode); newSpotCheck.DocCode = SpotCheck.DocCode; newSpotCheck.UnitId = SpotCheck.UnitId; @@ -108,7 +108,7 @@ namespace BLL /// public static void DeleteSpotCheck(string SpotCheckId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_SpotCheck SpotCheck = db.Check_SpotCheck.First(e => e.SpotCheckCode == SpotCheckId); db.Check_SpotCheck.DeleteOnSubmit(SpotCheck); db.SubmitChanges(); @@ -124,7 +124,7 @@ namespace BLL } public static Model.Check_SpotCheck GetSpotCheckBySpotCheckCodeForApi(string SpotCheckCode) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return db.Check_SpotCheck.FirstOrDefault(e => e.SpotCheckCode == SpotCheckCode); } @@ -351,7 +351,7 @@ namespace BLL } public static List GetListDataForApi(string name, string unitId, string startTime, string endTime, string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_SpotCheck; if (!string.IsNullOrEmpty(name) && "undefined" != name) @@ -439,7 +439,7 @@ namespace BLL } public static Model.Check_SpotCheck GetSpotCheckForApi(string SpotCheckCode) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_SpotCheck res = db.Check_SpotCheck.FirstOrDefault(e => e.SpotCheckCode == SpotCheckCode); res.JointCheckMans = res.JointCheckMans + "$" + BLL.UserService.getUserNamesUserIds(res.JointCheckMans); @@ -462,7 +462,7 @@ namespace BLL } public static void UpdateSpotCheckForUpdateForApi(Model.Check_SpotCheck SpotCheck) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_SpotCheck newSpotCheck = db.Check_SpotCheck.First(e => e.SpotCheckCode == SpotCheck.SpotCheckCode); if (!string.IsNullOrEmpty(SpotCheck.DocCode)) @@ -502,7 +502,7 @@ namespace BLL } public static void UpdateSpotCheckForApi(Model.Check_SpotCheck SpotCheck) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_SpotCheck newSpotCheck = db.Check_SpotCheck.First(e => e.SpotCheckCode == SpotCheck.SpotCheckCode); if (!string.IsNullOrEmpty(SpotCheck.DocCode)) diff --git a/SGGL/BLL/CQMS/Check/TechnicalContactListApproveService.cs b/SGGL/BLL/CQMS/Check/TechnicalContactListApproveService.cs index a2e7705..4fabca5 100644 --- a/SGGL/BLL/CQMS/Check/TechnicalContactListApproveService.cs +++ b/SGGL/BLL/CQMS/Check/TechnicalContactListApproveService.cs @@ -9,14 +9,14 @@ namespace BLL { public class TechnicalContactListApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; public static Model.Check_TechnicalContactListApprove GetSee(string TechnicalContactListId, string userId) { return db.Check_TechnicalContactListApprove.FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string TechnicalContactListId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var item = db.Check_TechnicalContactListApprove.FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (item != null) @@ -67,7 +67,7 @@ namespace BLL /// 宸ョ▼鑱旂粶鍗曠紪鍙 public static void DeleteTechnicalContactListApprovesByTechnicalContactListId(string TechnicalContactListId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Check_TechnicalContactListApprove where x.TechnicalContactListId == TechnicalContactListId select x).ToList(); db.Check_TechnicalContactListApprove.DeleteAllOnSubmit(q); @@ -80,7 +80,7 @@ namespace BLL /// 宸ョ▼鑱旂粶鍗曞鎵瑰疄浣 public static string AddTechnicalContactListApprove(Model.Check_TechnicalContactListApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_TechnicalContactListApprove)); Model.Check_TechnicalContactListApprove newApprove = new Model.Check_TechnicalContactListApprove(); @@ -105,7 +105,7 @@ namespace BLL /// 宸ョ▼鑱旂粶鍗曞鎵瑰疄浣 public static void UpdateTechnicalContactListApprove(Model.Check_TechnicalContactListApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_TechnicalContactListApprove newApprove = db.Check_TechnicalContactListApprove.First(e => e.TechnicalContactListApproveId == approve.TechnicalContactListApproveId && e.ApproveDate == null); newApprove.TechnicalContactListId = approve.TechnicalContactListId; @@ -140,7 +140,7 @@ namespace BLL } public static Model.Check_TechnicalContactListApprove GetTechnicalContactListApproveByApproveIdForApi(string approveId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return db.Check_TechnicalContactListApprove.FirstOrDefault(x => x.TechnicalContactListApproveId == approveId); } @@ -191,7 +191,7 @@ namespace BLL } public static List GetListDataByIdForApi(string TechnicalContactListId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Check_TechnicalContactListApprove @@ -226,7 +226,7 @@ namespace BLL } public static Model.Check_TechnicalContactListApprove getCurrApproveForApi(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_TechnicalContactListApprove newApprove = db.Check_TechnicalContactListApprove.FirstOrDefault(e => e.TechnicalContactListId == id && e.ApproveType != "S" && e.ApproveDate == null); @@ -243,7 +243,7 @@ namespace BLL } public static void UpdateTechnicalContactListApproveForApi(Model.Check_TechnicalContactListApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_TechnicalContactListApprove newApprove = db.Check_TechnicalContactListApprove.FirstOrDefault(e => e.TechnicalContactListApproveId == approve.TechnicalContactListApproveId); diff --git a/SGGL/BLL/CQMS/Check/TechnicalContactListService.cs b/SGGL/BLL/CQMS/Check/TechnicalContactListService.cs index 84ff8f5..b41b803 100644 --- a/SGGL/BLL/CQMS/Check/TechnicalContactListService.cs +++ b/SGGL/BLL/CQMS/Check/TechnicalContactListService.cs @@ -11,7 +11,7 @@ namespace BLL { public class TechnicalContactListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁宸ョ▼鑱旂粶鍗曚俊鎭疘d鍒犻櫎涓涓伐绋嬭仈缁滃崟淇℃伅淇℃伅 @@ -19,7 +19,7 @@ namespace BLL /// 宸ョ▼鑱旂粶鍗曚俊鎭疘d public static void DeleteTechnicalContactList(string TechnicalContactListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_TechnicalContactList TechnicalContactList = db.Check_TechnicalContactList.First(e => e.TechnicalContactListId == TechnicalContactListId); db.Check_TechnicalContactList.DeleteOnSubmit(TechnicalContactList); @@ -33,7 +33,7 @@ namespace BLL /// 宸ョ▼鑱旂粶鍗曚俊鎭疄浣 public static void AddTechnicalContactListForApi(Model.Check_TechnicalContactList TechnicalContactList) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_TechnicalContactList newTechnicalContactList = new Model.Check_TechnicalContactList(); newTechnicalContactList.TechnicalContactListId = TechnicalContactList.TechnicalContactListId; @@ -60,7 +60,7 @@ namespace BLL } public static void AddTechnicalContactList(Model.Check_TechnicalContactList TechnicalContactList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_TechnicalContactList newTechnicalContactList = new Model.Check_TechnicalContactList(); newTechnicalContactList.TechnicalContactListId = TechnicalContactList.TechnicalContactListId; newTechnicalContactList.ProjectId = TechnicalContactList.ProjectId; @@ -89,7 +89,7 @@ namespace BLL /// 宸ョ▼鑱旂粶鍗曞鎵瑰疄浣 public static void AddTechnicalContactListApprove(Model.Check_TechnicalContactListApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_TechnicalContactListApprove)); Model.Check_TechnicalContactListApprove newApprove = new Model.Check_TechnicalContactListApprove(); newApprove.TechnicalContactListApproveId = newKeyID; @@ -110,7 +110,7 @@ namespace BLL /// 宸ョ▼鑱旂粶鍗曚俊鎭疄浣 public static void UpdateTechnicalContactList(Model.Check_TechnicalContactList TechnicalContactList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_TechnicalContactList newTechnicalContactList = db.Check_TechnicalContactList.First(e => e.TechnicalContactListId == TechnicalContactList.TechnicalContactListId); newTechnicalContactList.Code = TechnicalContactList.Code; newTechnicalContactList.ProposedUnitId = TechnicalContactList.ProposedUnitId; @@ -412,7 +412,7 @@ namespace BLL /// public static IEnumerable getListData(string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_TechnicalContactList; if (!string.IsNullOrEmpty(projectId)) @@ -474,7 +474,7 @@ namespace BLL } public static Model.Check_TechnicalContactList GetTechnicalContactListByTechnicalContactListIdForApi(string TechnicalContactListId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_TechnicalContactList res = db.Check_TechnicalContactList.FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId); res.UnitWorkId = res.UnitWorkId + "$" + UnitWorkService.GetUnitWorkName(res.UnitWorkId); @@ -611,7 +611,7 @@ namespace BLL } public static int getListCount(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_TechnicalContactList; if (!string.IsNullOrEmpty(projectId)) @@ -623,7 +623,7 @@ namespace BLL } public static List getListDataForApi(string name, string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_TechnicalContactList; if (!string.IsNullOrEmpty(projectId)) @@ -706,7 +706,7 @@ namespace BLL } public static List getListDataForApi(string state, string contactListType, string isReply, string dateA, string dateZ, string proposedUnitId, string unitWorkId, string mainSendUnit, string cCUnitIds, string professional, string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Check_TechnicalContactList; if (!string.IsNullOrEmpty(state) && "undefined" != state) @@ -832,7 +832,7 @@ namespace BLL } public static void UpdateTechnicalContactListForApi(Model.Check_TechnicalContactList TechnicalContactList) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Check_TechnicalContactList newTechnicalContactList = db.Check_TechnicalContactList.FirstOrDefault(e => e.TechnicalContactListId == TechnicalContactList.TechnicalContactListId); diff --git a/SGGL/BLL/CQMS/Comprehensive/ContactListService.cs b/SGGL/BLL/CQMS/Comprehensive/ContactListService.cs index 54f15a8..50753bd 100644 --- a/SGGL/BLL/CQMS/Comprehensive/ContactListService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/ContactListService.cs @@ -17,7 +17,7 @@ namespace BLL.CQMS.Comprehensive /// 鏂规瀹℃煡Id public static void DeletetContactList(string ContactListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_ContactList visaApplication_Final = db.Comprehensive_ContactList.First(e => e.ContactListId == ContactListId); db.Comprehensive_ContactList.DeleteOnSubmit(visaApplication_Final); @@ -30,7 +30,7 @@ namespace BLL.CQMS.Comprehensive /// 鏂规瀹℃煡瀹炰綋 public static void AddtContactList(Model.Comprehensive_ContactList contactList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_ContactList newContactList = new Model.Comprehensive_ContactList(); newContactList.ContactListId = contactList.ContactListId; newContactList.ProjectId = contactList.ProjectId; @@ -49,7 +49,7 @@ namespace BLL.CQMS.Comprehensive /// 鏂规瀹℃煡瀹炰綋 public static void UpdatetContactList(Model.Comprehensive_ContactList contactList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_ContactList newContactList = db.Comprehensive_ContactList.FirstOrDefault(e => e.ContactListId == contactList.ContactListId); if (newContactList == null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs b/SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs index fcd5ab7..16c1ca9 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class DataDistributionService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -109,7 +109,7 @@ namespace BLL /// public static void AddDataDistribution(Model.Comprehensive_DataDistribution DataDistribution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DataDistribution newDataDistribution = new Model.Comprehensive_DataDistribution(); newDataDistribution.DataDistributionId = DataDistribution.DataDistributionId; newDataDistribution.ProjectId = DataDistribution.ProjectId; @@ -140,7 +140,7 @@ namespace BLL /// public static void UpdateDataDistribution(Model.Comprehensive_DataDistribution DataDistribution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DataDistribution newDataDistribution = db.Comprehensive_DataDistribution.FirstOrDefault(e => e.DataDistributionId == DataDistribution.DataDistributionId); if (newDataDistribution != null) { @@ -170,7 +170,7 @@ namespace BLL /// public static void DeleteDataDistribution(string specialDataDistributionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DataDistribution DataDistribution = db.Comprehensive_DataDistribution.FirstOrDefault(e => e.DataDistributionId == specialDataDistributionId); if (DataDistribution != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs b/SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs index 9686737..197dc4a 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class DataReceivingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -103,7 +103,7 @@ namespace BLL /// public static void AddDataReceiving(Model.Comprehensive_DataReceiving DataReceiving) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DataReceiving newDataReceiving = new Model.Comprehensive_DataReceiving(); newDataReceiving.DataReceivingId = DataReceiving.DataReceivingId; newDataReceiving.ProjectId = DataReceiving.ProjectId; @@ -134,7 +134,7 @@ namespace BLL /// public static void UpdateDataReceiving(Model.Comprehensive_DataReceiving DataReceiving) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DataReceiving newDataReceiving = db.Comprehensive_DataReceiving.FirstOrDefault(e => e.DataReceivingId == DataReceiving.DataReceivingId); if (newDataReceiving != null) { @@ -164,7 +164,7 @@ namespace BLL /// public static void DeleteDataReceiving(string dataReceivingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DataReceiving DataReceiving = db.Comprehensive_DataReceiving.FirstOrDefault(e => e.DataReceivingId == dataReceivingId); if (DataReceiving != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs index d53ea1f..bee3d5a 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class DesignChangeOrderService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -178,7 +178,7 @@ namespace BLL /// public static void AddDesignChangeOrder(Model.Comprehensive_DesignChangeOrder desginChangeOrder) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignChangeOrder newDesignChangeOrder = new Model.Comprehensive_DesignChangeOrder(); newDesignChangeOrder.DesignChangeOrderId = desginChangeOrder.DesignChangeOrderId; newDesignChangeOrder.ProjectId = desginChangeOrder.ProjectId; @@ -207,7 +207,7 @@ namespace BLL /// public static void UpdateDesignChangeOrder(Model.Comprehensive_DesignChangeOrder desginChangeOrder) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignChangeOrder newDesignChangeOrder = db.Comprehensive_DesignChangeOrder.FirstOrDefault(e => e.DesignChangeOrderId == desginChangeOrder.DesignChangeOrderId); if (newDesignChangeOrder != null) { @@ -235,7 +235,7 @@ namespace BLL /// public static void DeleteDesginChangeOrder(string desginChangeOrderId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignChangeOrder designChangeOrder = db.Comprehensive_DesignChangeOrder.FirstOrDefault(e => e.DesignChangeOrderId == desginChangeOrderId); if (designChangeOrder != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs index afbeae1..ad9259a 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class DesignDetailsService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -125,7 +125,7 @@ namespace BLL /// public static void AddDesignDetails(Model.Comprehensive_DesignDetails designDetails) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignDetails newDesignDetails = new Model.Comprehensive_DesignDetails(); newDesignDetails.DesignDetailsId = designDetails.DesignDetailsId; newDesignDetails.ProjectId = designDetails.ProjectId; @@ -153,7 +153,7 @@ namespace BLL /// public static void UpdateDesignDetails(Model.Comprehensive_DesignDetails designDetails) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignDetails newDesignDetails = db.Comprehensive_DesignDetails.FirstOrDefault(e => e.DesignDetailsId == designDetails.DesignDetailsId); if (newDesignDetails != null) { @@ -179,7 +179,7 @@ namespace BLL /// public static void DeleteDesignDetails(string designDetailsId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignDetails designDetails = db.Comprehensive_DesignDetails.FirstOrDefault(e => e.DesignDetailsId == designDetailsId); if (designDetails != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs index 7289c9c..7034eb4 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class DesignDrawingsService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -106,7 +106,7 @@ namespace BLL /// public static void AddDesignDrawings(Model.Comprehensive_DesignDrawings designDrawings) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignDrawings newDesignDrawings = new Model.Comprehensive_DesignDrawings(); newDesignDrawings.DesignDrawingsId = designDrawings.DesignDrawingsId; newDesignDrawings.ProjectId = designDrawings.ProjectId; @@ -134,7 +134,7 @@ namespace BLL /// public static void UpdateDesignDrawings(Model.Comprehensive_DesignDrawings designDrawings) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignDrawings newDesignDrawings = db.Comprehensive_DesignDrawings.FirstOrDefault(e => e.DesignDrawingsId == designDrawings.DesignDrawingsId); if (newDesignDrawings != null) { @@ -162,7 +162,7 @@ namespace BLL /// public static void DeleteDesignDrawingsById(string designDrawingsId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_DesignDrawings designDrawings = db.Comprehensive_DesignDrawings.FirstOrDefault(e => e.DesignDrawingsId == designDrawingsId); if (designDrawings != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/FinalFileService.cs b/SGGL/BLL/CQMS/Comprehensive/FinalFileService.cs index 964331e..1742463 100644 --- a/SGGL/BLL/CQMS/Comprehensive/FinalFileService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/FinalFileService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class FinalFileService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -25,7 +25,7 @@ namespace BLL public static Model.Comprehensive_FinalFile getFinalFile(string finalFileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_FinalFile FinalFile = db.Comprehensive_FinalFile.FirstOrDefault(e => e.FinalFileId == finalFileId); return FinalFile; @@ -36,7 +36,7 @@ namespace BLL /// public static void AddFinalFile(Model.Comprehensive_FinalFile FinalFile) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_FinalFile newFinalFile = new Model.Comprehensive_FinalFile(); newFinalFile.FinalFileId = FinalFile.FinalFileId; newFinalFile.ProjectId = FinalFile.ProjectId; @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateFinalFile(Model.Comprehensive_FinalFile FinalFile) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_FinalFile newFinalFile = db.Comprehensive_FinalFile.FirstOrDefault(e => e.FinalFileId == FinalFile.FinalFileId); if (newFinalFile != null) { @@ -79,7 +79,7 @@ namespace BLL /// public static void DeleteFinalFile(string finalFileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_FinalFile FinalFile = db.Comprehensive_FinalFile.FirstOrDefault(e => e.FinalFileId == finalFileId); if (FinalFile != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalItemService.cs b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalItemService.cs index 1c3d303..2cf8830 100644 --- a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalItemService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalItemService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class GeneralPlanApprovalItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -82,7 +82,7 @@ namespace BLL /// public static void AddGeneralPlanApprovalItem(Model.Comprehensive_GeneralPlanApprovalItem generalPlanApprovalItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_GeneralPlanApprovalItem newGeneralPlanApprovalItem = new Model.Comprehensive_GeneralPlanApprovalItem(); newGeneralPlanApprovalItem.GeneralPlanApprovalItemId = generalPlanApprovalItem.GeneralPlanApprovalItemId; newGeneralPlanApprovalItem.GeneralPlanApprovalId = generalPlanApprovalItem.GeneralPlanApprovalId; @@ -102,7 +102,7 @@ namespace BLL /// public static void UpdateGeneralPlanApprovalItem(Model.Comprehensive_GeneralPlanApprovalItem generalPlanApprovalItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_GeneralPlanApprovalItem newGeneralPlanApprovalItem = db.Comprehensive_GeneralPlanApprovalItem.FirstOrDefault(e => e.GeneralPlanApprovalItemId == generalPlanApprovalItem.GeneralPlanApprovalItemId); if (newGeneralPlanApprovalItem != null) { @@ -122,7 +122,7 @@ namespace BLL /// public static void DeleteGeneralPlanApprovalItemById(string generalPlanApprovalItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_GeneralPlanApprovalItem newGeneralPlanApprovalItem = db.Comprehensive_GeneralPlanApprovalItem.FirstOrDefault(e => e.GeneralPlanApprovalItemId == generalPlanApprovalItemId); if (newGeneralPlanApprovalItem != null) { @@ -141,7 +141,7 @@ namespace BLL /// public static void DeleteGeneralPlanApprovalItemByGeneralPlanApprovalId(string generalPlanApprovalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Comprehensive_GeneralPlanApprovalItem where x.GeneralPlanApprovalId == generalPlanApprovalId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs index 42c58e2..ec98702 100644 --- a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class GeneralPlanApprovalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -101,7 +101,7 @@ namespace BLL /// public static void AddGeneralPlanApproval(Model.Comprehensive_GeneralPlanApproval generalPlanApproval) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_GeneralPlanApproval newGeneralPlanApproval = new Model.Comprehensive_GeneralPlanApproval(); newGeneralPlanApproval.GeneralPlanApprovalId = generalPlanApproval.GeneralPlanApprovalId; newGeneralPlanApproval.ProjectId = generalPlanApproval.ProjectId; @@ -127,7 +127,7 @@ namespace BLL /// public static void UpdateGeneralPlanApproval(Model.Comprehensive_GeneralPlanApproval generalPlanApproval) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_GeneralPlanApproval newGeneralPlanApproval = db.Comprehensive_GeneralPlanApproval.FirstOrDefault(e => e.GeneralPlanApprovalId == generalPlanApproval.GeneralPlanApprovalId); if (newGeneralPlanApproval != null) { @@ -152,7 +152,7 @@ namespace BLL /// public static void DeleteGeneralPlanApproval(string generalPlanApprovalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_GeneralPlanApproval generalPlanApproval = db.Comprehensive_GeneralPlanApproval.FirstOrDefault(e => e.GeneralPlanApprovalId == generalPlanApprovalId); if (generalPlanApproval != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs index 9b1a20a..6f0243e 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs @@ -12,7 +12,7 @@ namespace BLL /// public class InspectionEquipmentService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -117,7 +117,7 @@ namespace BLL /// public static void AddInspectionEquipment(Model.Comprehensive_InspectionEquipment inspectionEquipment) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionEquipment newInspectionEquipment = new Model.Comprehensive_InspectionEquipment(); newInspectionEquipment.InspectionEquipmentId = inspectionEquipment.InspectionEquipmentId; newInspectionEquipment.ProjectId = inspectionEquipment.ProjectId; @@ -151,7 +151,7 @@ namespace BLL /// public static void UpdateInspectionEquipment(Model.Comprehensive_InspectionEquipment inspectionEquipment) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionEquipment newInspectionEquipment = db.Comprehensive_InspectionEquipment.FirstOrDefault(e => e.InspectionEquipmentId == inspectionEquipment.InspectionEquipmentId); if (newInspectionEquipment != null) { @@ -183,7 +183,7 @@ namespace BLL /// public static void DeleteInspectionEquipment(string inspectionEquipmentId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionEquipment inspectionEquipment = db.Comprehensive_InspectionEquipment.FirstOrDefault(e => e.InspectionEquipmentId == inspectionEquipmentId); if (inspectionEquipment != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs index 0661701..0577dbd 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class InspectionMachineService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -105,7 +105,7 @@ namespace BLL /// public static void AddInspectionMachine(Model.Comprehensive_InspectionMachine inspectionMachine) { - Model.SGGLDB db = Funs.DB; ; + Model.CNPCDB db = Funs.DB; ; Model.Comprehensive_InspectionMachine newInspectionMachine = new Model.Comprehensive_InspectionMachine(); newInspectionMachine.InspectionMachineId = inspectionMachine.InspectionMachineId; newInspectionMachine.ProjectId = inspectionMachine.ProjectId; @@ -139,7 +139,7 @@ namespace BLL /// public static void UpdateInspectionMachine(Model.Comprehensive_InspectionMachine inspectionMachine) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId); if (newInspectionMachine != null) { @@ -171,7 +171,7 @@ namespace BLL /// public static void DeleteInspectionMachine(string inspectionMachineId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionMachine inspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachineId); if (inspectionMachine != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs index 1fe8cfd..bce6258 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class InspectionPersonService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -39,7 +39,7 @@ namespace BLL /// public static void AddInspectionPerson(Model.Comprehensive_InspectionPerson inspectionPerson) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionPerson newInspectionPerson = new Model.Comprehensive_InspectionPerson(); newInspectionPerson.InspectionPersonId = inspectionPerson.InspectionPersonId; newInspectionPerson.ProjectId = inspectionPerson.ProjectId; @@ -71,7 +71,7 @@ namespace BLL /// public static void UpdateInspectionPerson(Model.Comprehensive_InspectionPerson inspectionPerson) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionPerson newInspectionPerson = db.Comprehensive_InspectionPerson.FirstOrDefault(e => e.InspectionPersonId == inspectionPerson.InspectionPersonId); if (newInspectionPerson != null) { @@ -102,7 +102,7 @@ namespace BLL /// public static void DeleteInspectionPerson(string inspectionPersonId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionPerson inspectionPerson = db.Comprehensive_InspectionPerson.FirstOrDefault(e => e.InspectionPersonId == inspectionPersonId); if (inspectionPerson != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalItemService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalItemService.cs index 97e775a..b529a79 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalItemService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalItemService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class MajorPlanApprovalItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -82,7 +82,7 @@ namespace BLL /// public static void AddMajorPlanApprovalItem(Model.Comprehensive_MajorPlanApprovalItem majorPlanApprovalItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_MajorPlanApprovalItem newMajorPlanApprovalItem = new Model.Comprehensive_MajorPlanApprovalItem(); newMajorPlanApprovalItem.MajorPlanApprovalItemId = majorPlanApprovalItem.MajorPlanApprovalItemId; newMajorPlanApprovalItem.MajorPlanApprovalId = majorPlanApprovalItem.MajorPlanApprovalId; @@ -102,7 +102,7 @@ namespace BLL /// public static void UpdateMajorPlanApprovalItem(Model.Comprehensive_MajorPlanApprovalItem majorPlanApprovalItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_MajorPlanApprovalItem newMajorPlanApprovalItem = db.Comprehensive_MajorPlanApprovalItem.FirstOrDefault(e => e.MajorPlanApprovalItemId == majorPlanApprovalItem.MajorPlanApprovalItemId); if (newMajorPlanApprovalItem != null) { @@ -122,7 +122,7 @@ namespace BLL /// public static void DeleteMajorPlanApprovalItemById(string majorPlanApprovalItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_MajorPlanApprovalItem newMajorPlanApprovalItem = db.Comprehensive_MajorPlanApprovalItem.FirstOrDefault(e => e.MajorPlanApprovalItemId == majorPlanApprovalItemId); if (newMajorPlanApprovalItem != null) { @@ -141,7 +141,7 @@ namespace BLL /// public static void DeleteMajorPlanApprovalItemByMajorPlanApprovalId(string majorPlanApprovalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Comprehensive_MajorPlanApprovalItem where x.MajorPlanApprovalId == majorPlanApprovalId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs index 95c6f94..6be7a84 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class MajorPlanApprovalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -101,7 +101,7 @@ namespace BLL /// public static void AddMajorPlanApproval(Model.Comprehensive_MajorPlanApproval majorPlanApproval) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = new Model.Comprehensive_MajorPlanApproval(); newMajorPlanApproval.MajorPlanApprovalId = majorPlanApproval.MajorPlanApprovalId; newMajorPlanApproval.ProjectId = majorPlanApproval.ProjectId; @@ -128,7 +128,7 @@ namespace BLL /// public static void UpdateMajorPlanApproval(Model.Comprehensive_MajorPlanApproval majorPlanApproval) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = db.Comprehensive_MajorPlanApproval.FirstOrDefault(e => e.MajorPlanApprovalId == majorPlanApproval.MajorPlanApprovalId); if (newMajorPlanApproval != null) { @@ -154,7 +154,7 @@ namespace BLL /// public static void DeleteMajorPlanApproval(string majorPlanApprovalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_MajorPlanApproval majorPlanApproval = db.Comprehensive_MajorPlanApproval.FirstOrDefault(e => e.MajorPlanApprovalId == majorPlanApprovalId); if (majorPlanApproval != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs index fbf7b80..28827ab 100644 --- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class NCRManagementService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -98,7 +98,7 @@ namespace BLL /// public static void AddNCRManagement(Model.Comprehensive_NCRManagement nCRManagement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_NCRManagement newNCRManagement = new Model.Comprehensive_NCRManagement(); newNCRManagement.NCRManagementId = nCRManagement.NCRManagementId; newNCRManagement.ProjectId = nCRManagement.ProjectId; @@ -126,7 +126,7 @@ namespace BLL /// public static void UpdateNCRManagement(Model.Comprehensive_NCRManagement nCRManagement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_NCRManagement newNCRManagement = db.Comprehensive_NCRManagement.FirstOrDefault(e => e.NCRManagementId == nCRManagement.NCRManagementId); if (newNCRManagement != null) { @@ -154,7 +154,7 @@ namespace BLL /// public static void DeleteNCRManagement(string nCRManagementId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_NCRManagement nCRManagement = db.Comprehensive_NCRManagement.FirstOrDefault(e => e.NCRManagementId == nCRManagementId); if (nCRManagement != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/PersonSteelService.cs b/SGGL/BLL/CQMS/Comprehensive/PersonSteelService.cs index a46498f..94a938c 100644 --- a/SGGL/BLL/CQMS/Comprehensive/PersonSteelService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/PersonSteelService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddDInspectionPersonItem(Model.Comprehensive_InspectionPersonSteel InspectionPersonItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionPersonSteel newInspectionPersonItem = new Model.Comprehensive_InspectionPersonSteel(); newInspectionPersonItem.InspectionPersonId = InspectionPersonItem.InspectionPersonId; newInspectionPersonItem.InspectionPersonSteelId = InspectionPersonItem.InspectionPersonSteelId; @@ -34,7 +34,7 @@ namespace BLL /// public static void DelPersonItem(string InspectionPersonId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List InspectionPerson = (from x in db.Comprehensive_InspectionPersonSteel where x.InspectionPersonId == InspectionPersonId select x).ToList(); if (InspectionPerson != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/PersonWeldMethodService.cs b/SGGL/BLL/CQMS/Comprehensive/PersonWeldMethodService.cs index 431a09b..9506b1e 100644 --- a/SGGL/BLL/CQMS/Comprehensive/PersonWeldMethodService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/PersonWeldMethodService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddInspectionPersonWeldMethod(Model.Comprehensive_InspectionPersonWeldMethod InspectionPersonWeldMethod) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_InspectionPersonWeldMethod newInspectionPersonWeldMethod = new Model.Comprehensive_InspectionPersonWeldMethod(); newInspectionPersonWeldMethod.InspectionPersonId = InspectionPersonWeldMethod.InspectionPersonId; newInspectionPersonWeldMethod.InspectionPersonWeldMethodId = InspectionPersonWeldMethod.InspectionPersonWeldMethodId; @@ -30,7 +30,7 @@ namespace BLL /// public static void DelInspectionPersonWeldMethod(string InspectionPersonId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List InspectionPerson = (from x in db.Comprehensive_InspectionPersonWeldMethod where x.InspectionPersonId == InspectionPersonId select x).ToList(); if (InspectionPerson != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs index f0707b1..12ad9d3 100644 --- a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class PressurePipeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -88,7 +88,7 @@ namespace BLL /// public static void AddPressurePipe(Model.Comprehensive_PressurePipe PressurePipe) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_PressurePipe newPressurePipe = new Model.Comprehensive_PressurePipe(); newPressurePipe.PressurePipeId = PressurePipe.PressurePipeId; newPressurePipe.Projctid = PressurePipe.Projctid; @@ -111,7 +111,7 @@ namespace BLL /// public static void UpdatePressurePipe(Model.Comprehensive_PressurePipe PressurePipe) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_PressurePipe newPressurePipe = db.Comprehensive_PressurePipe.FirstOrDefault(e => e.PressurePipeId == PressurePipe.PressurePipeId); if (newPressurePipe != null) { @@ -134,7 +134,7 @@ namespace BLL /// public static void DeletePressurePipe(string specialPressurePipeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_PressurePipe PressurePipe = db.Comprehensive_PressurePipe.FirstOrDefault(e => e.PressurePipeId == specialPressurePipeId); if (PressurePipe != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs b/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs index 1ccae10..8148aeb 100644 --- a/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class QualityAccidentService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -85,7 +85,7 @@ namespace BLL /// public static void AddQualityAccident(Model.Comprehensive_QualityAccident QualityAccident) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_QualityAccident newQualityAccident = new Model.Comprehensive_QualityAccident(); newQualityAccident.QualityAccidentId = QualityAccident.QualityAccidentId; newQualityAccident.ProjectId = QualityAccident.ProjectId; @@ -111,7 +111,7 @@ namespace BLL /// public static void UpdateQualityAccident(Model.Comprehensive_QualityAccident QualityAccident) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_QualityAccident newQualityAccident = db.Comprehensive_QualityAccident.FirstOrDefault(e => e.QualityAccidentId == QualityAccident.QualityAccidentId); if (newQualityAccident != null) { @@ -136,7 +136,7 @@ namespace BLL /// public static void DeleteQualityAccident(string specialQualityAccidentId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_QualityAccident QualityAccident = db.Comprehensive_QualityAccident.FirstOrDefault(e => e.QualityAccidentId == specialQualityAccidentId); if (QualityAccident != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs index e30fe57..7aa8b91 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class SiteVisaManagementService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -112,7 +112,7 @@ namespace BLL /// public static void AddSiteVisaManagement(Model.Comprehensive_SiteVisaManagement siteVisaMangement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_SiteVisaManagement newSiteVisaManagement = new Model.Comprehensive_SiteVisaManagement(); newSiteVisaManagement.VisaId = siteVisaMangement.VisaId; newSiteVisaManagement.ProjectId = siteVisaMangement.ProjectId; @@ -145,7 +145,7 @@ namespace BLL /// public static void UpdateSiteVisaManagement(Model.Comprehensive_SiteVisaManagement siteVisaMangement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_SiteVisaManagement newSiteVisaManagement = db.Comprehensive_SiteVisaManagement.FirstOrDefault(e => e.VisaId == siteVisaMangement.VisaId); if (newSiteVisaManagement != null) { @@ -178,7 +178,7 @@ namespace BLL /// public static void DeleteSiteVisaManagement(string visaId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_SiteVisaManagement siteVisaManagement = db.Comprehensive_SiteVisaManagement.FirstOrDefault(e => e.VisaId == visaId); if (siteVisaManagement != null) { diff --git a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs index 6d0f453..fd13419 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class SpecialEquipmentServices { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -93,7 +93,7 @@ namespace BLL /// public static void AddEquipment(Model.Comprehensive_SpecialEquipment SpecialEquipment) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_SpecialEquipment newEquipment = new Model.Comprehensive_SpecialEquipment(); newEquipment.SpecialEquipmentId = SpecialEquipment.SpecialEquipmentId; newEquipment.ProjectId = SpecialEquipment.ProjectId; @@ -115,7 +115,7 @@ namespace BLL /// public static void UpdateEquipment(Model.Comprehensive_SpecialEquipment SpecialEquipment) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_SpecialEquipment newEquipment = db.Comprehensive_SpecialEquipment.FirstOrDefault(e => e.SpecialEquipmentId == SpecialEquipment.SpecialEquipmentId); if (newEquipment != null) { @@ -137,7 +137,7 @@ namespace BLL /// public static void DeleteEquipment(string specialEquipmentId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Comprehensive_SpecialEquipment SpecialEquipment = db.Comprehensive_SpecialEquipment.FirstOrDefault(e => e.SpecialEquipmentId == specialEquipmentId); if (SpecialEquipment != null) { diff --git a/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogApproveService.cs b/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogApproveService.cs index 839cd80..806f99c 100644 --- a/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogApproveService.cs +++ b/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogApproveService.cs @@ -10,7 +10,7 @@ namespace BLL { public class CQMSConstructionLogApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇璐ㄩ噺宸℃妯℃澘鍒楄〃 /// @@ -40,7 +40,7 @@ namespace BLL /// 璐ㄩ噺宸℃缂栧彿 public static void DeleteConstructionLogApprovesByConstructionLogId(string ConstructionLogId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.CQMS_ConstructionLogApprove where x.ConstructionLogId == ConstructionLogId select x).ToList(); db.CQMS_ConstructionLogApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -53,7 +53,7 @@ namespace BLL /// public static IQueryable getList(string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var res = from x in db.CQMS_ConstructionLogApprove join ca in db.CQMS_ConstructionLog on x.ConstructionLogId equals ca.ConstructionLogId @@ -83,7 +83,7 @@ namespace BLL } public static void See(string ConstructionLogId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.CQMS_ConstructionLogApprove.FirstOrDefault(x => x.ConstructionLogId == ConstructionLogId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -108,7 +108,7 @@ namespace BLL /// 璐ㄩ噺宸℃瀹℃壒瀹炰綋 public static void UpdateConstructionLogApprove(Model.CQMS_ConstructionLogApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConstructionLogApprove newApprove = db.CQMS_ConstructionLogApprove.First(e => e.ConstructionLogApproveId == approve.ConstructionLogApproveId && e.ApproveDate == null); newApprove.ConstructionLogId = approve.ConstructionLogId; newApprove.ApproveMan = approve.ApproveMan; @@ -125,7 +125,7 @@ namespace BLL /// 璐ㄩ噺宸℃瀹℃壒瀹炰綋 public static void AddConstructionLogApprove(Model.CQMS_ConstructionLogApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.CQMS_ConstructionLogApprove)); Model.CQMS_ConstructionLogApprove newApprove = new Model.CQMS_ConstructionLogApprove(); newApprove.ConstructionLogApproveId = newKeyID; @@ -141,7 +141,7 @@ namespace BLL } public static string AddConstructionLogApproveForApi(Model.CQMS_ConstructionLogApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.CQMS_ConstructionLogApprove)); Model.CQMS_ConstructionLogApprove newApprove = new Model.CQMS_ConstructionLogApprove(); @@ -175,7 +175,7 @@ namespace BLL public static List GetListDataByCodeForApi(string code) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.CQMS_ConstructionLogApprove where x.ConstructionLogId == code && x.ApproveDate != null && x.ApproveType != "S" @@ -210,7 +210,7 @@ namespace BLL } public static Model.CQMS_ConstructionLogApprove getCurrApproveForApi(string ConstructionLogId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.CQMS_ConstructionLogApprove newApprove = db.CQMS_ConstructionLogApprove.FirstOrDefault(e => e.ConstructionLogId == ConstructionLogId && e.ApproveType != "S" && e.ApproveDate == null); if (newApprove != null) @@ -226,7 +226,7 @@ namespace BLL } public static void UpdateConstructionLogApproveForApi(Model.CQMS_ConstructionLogApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.CQMS_ConstructionLogApprove newApprove = db.CQMS_ConstructionLogApprove.FirstOrDefault(e => e.ConstructionLogApproveId == approve.ConstructionLogApproveId && e.ApproveDate == null); if (newApprove != null) diff --git a/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogImageProgressService.cs b/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogImageProgressService.cs index 02834d3..8a43e71 100644 --- a/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogImageProgressService.cs +++ b/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogImageProgressService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class CQMSConstructionLogImageProgressService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰绾ф柦宸ユ棩蹇 @@ -30,7 +30,7 @@ namespace BLL /// public static void AddConstructionLogImageProgress(Model.CQMS_ConstructionLogImageProgress ConstructionLogImageProgress) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConstructionLogImageProgress newConstructionLogImageProgress = new Model.CQMS_ConstructionLogImageProgress { ConstructionLogImageProgressId = ConstructionLogImageProgress.ConstructionLogImageProgressId, @@ -49,7 +49,7 @@ namespace BLL /// public static void UpdateConstructionLogImageProgress(Model.CQMS_ConstructionLogImageProgress ConstructionLogImageProgress) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConstructionLogImageProgress newConstructionLogImageProgress = db.CQMS_ConstructionLogImageProgress.FirstOrDefault(e => e.ConstructionLogId == ConstructionLogImageProgress.ConstructionLogId && e.UnitId == ConstructionLogImageProgress.UnitId); if (newConstructionLogImageProgress != null) { @@ -65,7 +65,7 @@ namespace BLL /// public static void DeleteConstructionLogImageProgressById(string ConstructionLogId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.CQMS_ConstructionLogImageProgress where x.ConstructionLogId == ConstructionLogId select x; if (q.Count() > 0) { @@ -80,7 +80,7 @@ namespace BLL /// public static void DeleteConstructionLogImageProgressByIdAndUnitId(string ConstructionLogId, string unitId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.CQMS_ConstructionLogImageProgress where x.ConstructionLogId == ConstructionLogId && x.UnitId == unitId select x; if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogItemService.cs b/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogItemService.cs index d6da2fa..e50e609 100644 --- a/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogItemService.cs +++ b/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogItemService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class CQMSConstructionLogItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰绾ф柦宸ユ棩蹇 @@ -30,7 +30,7 @@ namespace BLL /// public static void AddConstructionLogItem(Model.CQMS_ConstructionLogItem ConstructionLogItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConstructionLogItem newConstructionLogItem = new Model.CQMS_ConstructionLogItem { ConstructionLogItemId = ConstructionLogItem.ConstructionLogItemId, @@ -93,7 +93,7 @@ namespace BLL /// public static void UpdateConstructionLogItem(Model.CQMS_ConstructionLogItem ConstructionLogItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConstructionLogItem newConstructionLogItem = db.CQMS_ConstructionLogItem.FirstOrDefault(e => e.ConstructionLogId == ConstructionLogItem.ConstructionLogId && e.UnitId == ConstructionLogItem.UnitId); if (newConstructionLogItem != null) { @@ -153,7 +153,7 @@ namespace BLL /// public static void DeleteConstructionLogItemById(string ConstructionLogItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.CQMS_ConstructionLogItem where x.ConstructionLogItemId == ConstructionLogItemId select x; if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogService.cs b/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogService.cs index 89b7703..1003eed 100644 --- a/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogService.cs +++ b/SGGL/BLL/CQMS/ConstructionLog/CQMSConstructionLogService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class CQMSConstructionLogService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰绾ф柦宸ユ棩蹇 @@ -40,7 +40,7 @@ namespace BLL /// public static void AddConstructionLog(Model.CQMS_ConstructionLog ConstructionLog) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConstructionLog newConstructionLog = new Model.CQMS_ConstructionLog { ConstructionLogId = ConstructionLog.ConstructionLogId, @@ -102,7 +102,7 @@ namespace BLL /// public static void UpdateConstructionLog(Model.CQMS_ConstructionLog ConstructionLog) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConstructionLog newConstructionLog = db.CQMS_ConstructionLog.FirstOrDefault(e => e.ConstructionLogId == ConstructionLog.ConstructionLogId); if (newConstructionLog != null) { @@ -161,7 +161,7 @@ namespace BLL /// public static void DeleteConstructionLogById(string ConstructionLogId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConstructionLog ConstructionLog = db.CQMS_ConstructionLog.FirstOrDefault(e => e.ConstructionLogId == ConstructionLogId); if (ConstructionLog != null) { diff --git a/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs b/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs index ecaaf2f..80a9bcc 100644 --- a/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs +++ b/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs @@ -9,7 +9,7 @@ namespace BLL { public class DataTypeProjectService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -68,7 +68,7 @@ namespace BLL /// public static void AddDataTypeProject(Model.DataBase_DataTypeProject dataTypeProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.DataBase_DataTypeProject newDataTypeProject = new Model.DataBase_DataTypeProject(); newDataTypeProject.DataTypeProjectId = dataTypeProject.DataTypeProjectId; @@ -92,7 +92,7 @@ namespace BLL /// public static void UpdateDataTypeProject(Model.DataBase_DataTypeProject dataTypeProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.DataBase_DataTypeProject newDataTypeProject = db.DataBase_DataTypeProject.First(e => e.DataTypeProjectId == dataTypeProject.DataTypeProjectId); newDataTypeProject.DataTypeCode = dataTypeProject.DataTypeCode; newDataTypeProject.DataTypeName = dataTypeProject.DataTypeName; @@ -112,7 +112,7 @@ namespace BLL /// public static void DeleteDataTypeProject(string dataTypeProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.DataBase_DataTypeProject dataTypeProject = db.DataBase_DataTypeProject.First(e => e.DataTypeProjectId == dataTypeProjectId); db.DataBase_DataTypeProject.DeleteOnSubmit(dataTypeProject); db.SubmitChanges(); @@ -124,7 +124,7 @@ namespace BLL /// public static void DeleteAllDataTypeProject(string dataTypeProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.DataBase_DataTypeProject where x.SuperDataTypeId == dataTypeProjectId select x; db.DataBase_DataTypeProject.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Information/ConfirmFormApproveService.cs b/SGGL/BLL/CQMS/Information/ConfirmFormApproveService.cs index f5fd0f1..71f1fcd 100644 --- a/SGGL/BLL/CQMS/Information/ConfirmFormApproveService.cs +++ b/SGGL/BLL/CQMS/Information/ConfirmFormApproveService.cs @@ -10,13 +10,13 @@ namespace BLL { public static Model.CQMS_ConfirmFormApprove GetSee(string ConfirmFormId, string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.CQMS_ConfirmFormApprove.FirstOrDefault(x => x.ConfirmFormId == ConfirmFormId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string ConfirmFormId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.CQMS_ConfirmFormApprove.FirstOrDefault(x => x.ConfirmFormId == ConfirmFormId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -44,7 +44,7 @@ namespace BLL /// 宸ョ▼绛捐瘉纭鍗曞鎵归泦鍚 public static List GetNotAggreeApprovesByConfirmFormIdAndEdtion(string confirmFormId, int edtion) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.CQMS_ConfirmFormApprove where x.ConfirmFormId == confirmFormId && x.Edition == edtion && x.IsAgree == false select x).ToList(); } public static int? GetUserIdsApprovesBySignTypeEditon(string ConfirmFormId) @@ -64,7 +64,7 @@ namespace BLL /// 宸ョ▼绛捐瘉纭鍗曞鎵瑰疄浣 public static void UpdateConfirmFormApprove(Model.CQMS_ConfirmFormApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConfirmFormApprove newApprove = db.CQMS_ConfirmFormApprove.First(e => e.ConfirmFormApproveId == approve.ConfirmFormApproveId && e.ApproveDate == null); newApprove.ConfirmFormId = approve.ConfirmFormId; newApprove.ApproveMan = approve.ApproveMan; @@ -100,7 +100,7 @@ namespace BLL /// 宸ョ▼绛捐瘉纭鍗曞鎵归泦鍚 public static List GetConfirmFormApprovesByConfirmFormId(string ConfirmFormId, string state) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var reDate = (from x in db.CQMS_ConfirmFormApprove where x.ConfirmFormId == ConfirmFormId && x.ApproveType == BLL.Const.ConfirmForm_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { @@ -120,7 +120,7 @@ namespace BLL /// public static IList getListData(string ConfirmFormId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.CQMS_ConfirmFormApprove where x.ConfirmFormId == ConfirmFormId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -171,7 +171,7 @@ namespace BLL /// public static void delSolutionApprove(string confirmFormId, string man) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_ConfirmFormApprove where x.ConfirmFormId == confirmFormId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList(); db.CQMS_ConfirmFormApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -185,7 +185,7 @@ namespace BLL /// 宸ョ▼绛捐瘉纭鍗曠紪鍙 public static void DeleteConfirmFormApprovesByConfirmFormId(string ConfirmFormId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_ConfirmFormApprove where x.ConfirmFormId == ConfirmFormId select x).ToList(); db.CQMS_ConfirmFormApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Information/ConfirmFormDetailService.cs b/SGGL/BLL/CQMS/Information/ConfirmFormDetailService.cs index 38136c5..16814a9 100644 --- a/SGGL/BLL/CQMS/Information/ConfirmFormDetailService.cs +++ b/SGGL/BLL/CQMS/Information/ConfirmFormDetailService.cs @@ -14,7 +14,7 @@ namespace BLL /// 宸ョ▼绛捐瘉纭鍗曟槑缁嗗疄浣 public static void AddConfirmFormDetail(Model.CQMS_ConfirmFormDetail a) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConfirmFormDetail newConfirmFormDetail = new Model.CQMS_ConfirmFormDetail(); newConfirmFormDetail.ConfirmFormDetailId = a.ConfirmFormDetailId; newConfirmFormDetail.ConfirmFormId = a.ConfirmFormId; @@ -35,7 +35,7 @@ namespace BLL /// 宸ョ▼绛捐瘉纭鍗曟槑缁嗗疄浣 public static void UpdateConfirmFormDetail(Model.CQMS_ConfirmFormDetail a) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConfirmFormDetail newConfirmFormDetail = db.CQMS_ConfirmFormDetail.First(e => e.ConfirmFormDetailId == a.ConfirmFormDetailId); newConfirmFormDetail.SortIndex = a.SortIndex; newConfirmFormDetail.JobContent = a.JobContent; @@ -142,7 +142,7 @@ namespace BLL /// 宸ョ▼绛捐瘉纭鍗曟槑缁嗕富閿 public static void DeleteConfirmFormDetailByConfirmFormId(string ConfirmFormId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.CQMS_ConfirmFormDetail where x.ConfirmFormId == ConfirmFormId select x).ToList(); db.CQMS_ConfirmFormDetail.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -150,7 +150,7 @@ namespace BLL public static void DeleteConfirmFormDetailById(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.CQMS_ConfirmFormDetail where x.ConfirmFormDetailId == id select x).ToList(); db.CQMS_ConfirmFormDetail.DeleteAllOnSubmit(q); diff --git a/SGGL/BLL/CQMS/Information/ConfirmFormService.cs b/SGGL/BLL/CQMS/Information/ConfirmFormService.cs index 2fcba8e..76bd92d 100644 --- a/SGGL/BLL/CQMS/Information/ConfirmFormService.cs +++ b/SGGL/BLL/CQMS/Information/ConfirmFormService.cs @@ -38,7 +38,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗旾d public static void DeleteConfirmForm(string confirmFormId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConfirmForm confirmForm = db.CQMS_ConfirmForm.First(e => e.ConfirmFormId == confirmFormId); db.CQMS_ConfirmForm.DeleteOnSubmit(confirmForm); @@ -51,7 +51,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗曞疄浣 public static void AddConfirmForm(Model.CQMS_ConfirmForm confirmForm) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConfirmForm newConfirmForm = new Model.CQMS_ConfirmForm(); newConfirmForm.ConfirmFormId = confirmForm.ConfirmFormId; newConfirmForm.ProjectId = confirmForm.ProjectId; @@ -75,7 +75,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗曞疄浣 public static void UpdateConfirmForm(Model.CQMS_ConfirmForm confirmForm) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_ConfirmForm newConfirmForm = db.CQMS_ConfirmForm.First(e => e.ConfirmFormId == confirmForm.ConfirmFormId); newConfirmForm.SecretLevelId = confirmForm.SecretLevelId; newConfirmForm.ConfirmFormCode = confirmForm.ConfirmFormCode; diff --git a/SGGL/BLL/CQMS/Information/ContactSheetApproveService.cs b/SGGL/BLL/CQMS/Information/ContactSheetApproveService.cs index f4786ae..1b14ddf 100644 --- a/SGGL/BLL/CQMS/Information/ContactSheetApproveService.cs +++ b/SGGL/BLL/CQMS/Information/ContactSheetApproveService.cs @@ -8,7 +8,7 @@ namespace BLL { public class ContactSheetApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁璁捐鍙樻洿缂栧彿鑾峰彇涓涓璁″彉鏇村鎵逛俊鎭 /// @@ -40,7 +40,7 @@ namespace BLL /// 璁捐鍙樻洿瀹℃壒瀹炰綋 public static void AddContactSheetApprove(Model.CQMS_Information_ContactSheetApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.CQMS_Information_ContactSheetApprove)); Model.CQMS_Information_ContactSheetApprove newApprove = new Model.CQMS_Information_ContactSheetApprove(); newApprove.ContactSheetAuditId = newKeyID; @@ -57,7 +57,7 @@ namespace BLL public static void UpdateContactSheetApprove(Model.CQMS_Information_ContactSheetApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_Information_ContactSheetApprove newApprove = db.CQMS_Information_ContactSheetApprove.First(e => e.ContactSheetAuditId == approve.ContactSheetAuditId && e.AuditDate == null); newApprove.ContactSheetId = approve.ContactSheetId; diff --git a/SGGL/BLL/CQMS/Information/ContactSheetService.cs b/SGGL/BLL/CQMS/Information/ContactSheetService.cs index fe48636..522ceb9 100644 --- a/SGGL/BLL/CQMS/Information/ContactSheetService.cs +++ b/SGGL/BLL/CQMS/Information/ContactSheetService.cs @@ -71,7 +71,7 @@ namespace BLL #endregion public static void AddConfirmForm(Model.CQMS_Information_ContactSheet CheckControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_Information_ContactSheet newCheckControl = new Model.CQMS_Information_ContactSheet(); newCheckControl.ContactSheetId = CheckControl.ContactSheetId; newCheckControl.ContactSheetCode = CheckControl.ContactSheetCode; @@ -107,13 +107,13 @@ namespace BLL public static CQMS_Information_ContactSheet GetConfirmFormById(string contactSheetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.CQMS_Information_ContactSheet.Where(e => e.ContactSheetId == contactSheetId).FirstOrDefault(); } public static void UpdateConfirmForm(CQMS_Information_ContactSheet CheckControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_Information_ContactSheet newCheckControl = db.CQMS_Information_ContactSheet.First(e => e.ContactSheetId == CheckControl.ContactSheetId); newCheckControl.ContactSheetCode = CheckControl.ContactSheetCode; newCheckControl.DraftReasonCode = CheckControl.DraftReasonCode; @@ -146,7 +146,7 @@ namespace BLL public static void updateDistribute(List userId, string contactSheetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var distributes = db.CQMS_Information_ContactSheetDistribute.Where(e => e.ContactSheetId == contactSheetId); foreach (var dis in distributes) { @@ -181,7 +181,7 @@ namespace BLL public static List getCListByProjectId(string projectId, string contactSheetId) { - Model.SGGLDB dc = Funs.DB; + Model.CNPCDB dc = Funs.DB; List res = (from c in dc.CQMS_Information_ContactSheet where c.ProjectId == projectId && c.CIType == "C" && c.ContactSheetId != contactSheetId select c).ToList(); @@ -190,7 +190,7 @@ namespace BLL public static List GetDistributesUserId(string contactSheetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var distributes = db.CQMS_Information_ContactSheetDistribute.Where(e => e.ContactSheetId == contactSheetId).Select(e=>e.UserId); return distributes.ToList(); diff --git a/SGGL/BLL/CQMS/Information/CostReportApproveService.cs b/SGGL/BLL/CQMS/Information/CostReportApproveService.cs index 218a652..04cd902 100644 --- a/SGGL/BLL/CQMS/Information/CostReportApproveService.cs +++ b/SGGL/BLL/CQMS/Information/CostReportApproveService.cs @@ -10,13 +10,13 @@ namespace BLL { public static Model.CQMS_CostReportApprove GetSee(string CostReportId, string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.CQMS_CostReportApprove.FirstOrDefault(x => x.CostReportId == CostReportId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string CostReportId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.CQMS_CostReportApprove.FirstOrDefault(x => x.CostReportId == CostReportId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -35,7 +35,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄥ鎵归泦鍚 public static List GetNotAggreeApprovesByCostReportIdAndEdtion(string costReportId, int edtion) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.CQMS_CostReportApprove where x.CostReportId == costReportId && x.Edition == edtion && x.IsAgree == false select x).ToList(); } @@ -67,7 +67,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄥ鎵瑰疄浣 public static void UpdateCostReportApprove(Model.CQMS_CostReportApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_CostReportApprove newApprove = db.CQMS_CostReportApprove.First(e => e.CostReportApproveId == approve.CostReportApproveId && e.ApproveDate == null); newApprove.CostReportId = approve.CostReportId; newApprove.ApproveMan = approve.ApproveMan; @@ -103,7 +103,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄥ鎵归泦鍚 public static List GetCostReportApprovesByCostReportId(string CostReportId, string state) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var reDate = (from x in db.CQMS_CostReportApprove where x.CostReportId == CostReportId && x.ApproveType == BLL.Const.CostReport_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { @@ -123,7 +123,7 @@ namespace BLL /// public static IList getListData(string CostReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.CQMS_CostReportApprove where x.CostReportId == CostReportId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -174,7 +174,7 @@ namespace BLL /// public static void delSolutionApprove(string costReportId, string man) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_CostReportApprove where x.CostReportId == costReportId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList(); db.CQMS_CostReportApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -188,7 +188,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄧ紪鍙 public static void DeleteCostReportApprovesByCostReportId(string CostReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_CostReportApprove where x.CostReportId == CostReportId select x).ToList(); db.CQMS_CostReportApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Information/CostReportDetailService.cs b/SGGL/BLL/CQMS/Information/CostReportDetailService.cs index 0e31756..fc93968 100644 --- a/SGGL/BLL/CQMS/Information/CostReportDetailService.cs +++ b/SGGL/BLL/CQMS/Information/CostReportDetailService.cs @@ -14,7 +14,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄦ槑缁嗗疄浣 public static void AddCostReportDetail(Model.CQMS_CostReportDetail a) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_CostReportDetail newCostReportDetail = new Model.CQMS_CostReportDetail(); newCostReportDetail.CostReportDetailId = a.CostReportDetailId; newCostReportDetail.CostReportId = a.CostReportId; @@ -33,7 +33,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄦ槑缁嗗疄浣 public static void UpdateCostReportDetail(Model.CQMS_CostReportDetail a) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_CostReportDetail newCostReportDetail = db.CQMS_CostReportDetail.First(e => e.CostReportDetailId == a.CostReportDetailId); newCostReportDetail.SortIndex = a.SortIndex; newCostReportDetail.PlanCost = a.PlanCost; @@ -137,7 +137,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄦ槑缁嗕富閿 public static void DeleteCostReportDetailByCostReportId(string CostReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.CQMS_CostReportDetail where x.CostReportId == CostReportId select x).ToList(); db.CQMS_CostReportDetail.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -145,7 +145,7 @@ namespace BLL public static void DeleteCostReportDetailById(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.CQMS_CostReportDetail where x.CostReportDetailId == id select x).ToList(); db.CQMS_CostReportDetail.DeleteAllOnSubmit(q); diff --git a/SGGL/BLL/CQMS/Information/CostReportService.cs b/SGGL/BLL/CQMS/Information/CostReportService.cs index b0b304c..0d7f61d 100644 --- a/SGGL/BLL/CQMS/Information/CostReportService.cs +++ b/SGGL/BLL/CQMS/Information/CostReportService.cs @@ -38,7 +38,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛↖d public static void DeleteCostReport(string costReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_CostReport costReport = db.CQMS_CostReport.First(e => e.CostReportId == costReportId); db.CQMS_CostReport.DeleteOnSubmit(costReport); @@ -51,7 +51,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄥ疄浣 public static void AddCostReport(Model.CQMS_CostReport costReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_CostReport newCostReport = new Model.CQMS_CostReport(); newCostReport.CostReportId = costReport.CostReportId; newCostReport.ProjectId = costReport.ProjectId; @@ -78,7 +78,7 @@ namespace BLL /// 宸ョ▼绛捐瘉璐圭敤鎶ュ琛ㄥ疄浣 public static void UpdateCostReport(Model.CQMS_CostReport costReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_CostReport newCostReport = db.CQMS_CostReport.First(e => e.CostReportId == costReport.CostReportId); newCostReport.SecretLevelId = costReport.SecretLevelId; newCostReport.CostReportCode = costReport.CostReportCode; @@ -207,7 +207,7 @@ namespace BLL /// public static List GetCostReportList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.CQMS_CostReport where x.ProjectId == projectId && x.State == BLL.Const.CostReport_Complete diff --git a/SGGL/BLL/CQMS/Information/StatementApproveService.cs b/SGGL/BLL/CQMS/Information/StatementApproveService.cs index 9a16a6f..0f3b508 100644 --- a/SGGL/BLL/CQMS/Information/StatementApproveService.cs +++ b/SGGL/BLL/CQMS/Information/StatementApproveService.cs @@ -10,13 +10,13 @@ namespace BLL { public static Model.CQMS_StatementApprove GetSee(string StatementId, string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.CQMS_StatementApprove.FirstOrDefault(x => x.StatementId == StatementId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string StatementId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.CQMS_StatementApprove.FirstOrDefault(x => x.StatementId == StatementId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -35,7 +35,7 @@ namespace BLL /// 宸ョ▼绛捐瘉缁撶畻鍗曞鎵归泦鍚 public static List GetNotAggreeApprovesByStatementIdAndEdtion(string statementId, int edtion) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.CQMS_StatementApprove where x.StatementId == statementId && x.Edition == edtion && x.IsAgree == false select x).ToList(); } @@ -67,7 +67,7 @@ namespace BLL /// 宸ョ▼绛捐瘉缁撶畻鍗曞鎵瑰疄浣 public static void UpdateStatementApprove(Model.CQMS_StatementApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_StatementApprove newApprove = db.CQMS_StatementApprove.First(e => e.StatementApproveId == approve.StatementApproveId && e.ApproveDate == null); newApprove.StatementId = approve.StatementId; newApprove.ApproveMan = approve.ApproveMan; @@ -103,7 +103,7 @@ namespace BLL /// 宸ョ▼绛捐瘉缁撶畻鍗曞鎵归泦鍚 public static List GetStatementApprovesByStatementId(string StatementId, string state) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var reDate = (from x in db.CQMS_StatementApprove where x.StatementId == StatementId && x.ApproveType == BLL.Const.Statement_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { @@ -123,7 +123,7 @@ namespace BLL /// public static IList getListData(string StatementId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.CQMS_StatementApprove where x.StatementId == StatementId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -174,7 +174,7 @@ namespace BLL /// public static void delSolutionApprove(string statementId, string man) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_StatementApprove where x.StatementId == statementId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList(); db.CQMS_StatementApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -188,7 +188,7 @@ namespace BLL /// 宸ョ▼绛捐瘉缁撶畻鍗曠紪鍙 public static void DeleteStatementApprovesByStatementId(string StatementId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_StatementApprove where x.StatementId == StatementId select x).ToList(); db.CQMS_StatementApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Information/StatementService.cs b/SGGL/BLL/CQMS/Information/StatementService.cs index cc895e0..8005d2e 100644 --- a/SGGL/BLL/CQMS/Information/StatementService.cs +++ b/SGGL/BLL/CQMS/Information/StatementService.cs @@ -36,7 +36,7 @@ namespace BLL /// 宸ョ▼绛捐瘉缁撶畻鍗旾d public static void DeleteStatement(string statementId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_Statement statement = db.CQMS_Statement.First(e => e.StatementId == statementId); db.CQMS_Statement.DeleteOnSubmit(statement); @@ -49,7 +49,7 @@ namespace BLL /// 宸ョ▼绛捐瘉缁撶畻鍗曞疄浣 public static void AddStatement(Model.CQMS_Statement statement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_Statement newStatement = new Model.CQMS_Statement(); newStatement.StatementId = statement.StatementId; newStatement.ProjectId = statement.ProjectId; @@ -78,7 +78,7 @@ namespace BLL /// 宸ョ▼绛捐瘉缁撶畻鍗曞疄浣 public static void UpdateStatement(Model.CQMS_Statement statement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_Statement newStatement = db.CQMS_Statement.First(e => e.StatementId == statement.StatementId); newStatement.SecretLevelId = statement.SecretLevelId; newStatement.StatementCode = statement.StatementCode; @@ -219,7 +219,7 @@ namespace BLL /// public static List GetStatementList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.CQMS_Statement where x.ProjectId == projectId && x.State == BLL.Const.Statement_Complete diff --git a/SGGL/BLL/CQMS/Information/VisaApplicationApproveService.cs b/SGGL/BLL/CQMS/Information/VisaApplicationApproveService.cs index 8762159..5e51b0f 100644 --- a/SGGL/BLL/CQMS/Information/VisaApplicationApproveService.cs +++ b/SGGL/BLL/CQMS/Information/VisaApplicationApproveService.cs @@ -10,13 +10,13 @@ namespace BLL { public static Model.CQMS_VisaApplicationApprove GetSee(string VisaApplicationId, string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.CQMS_VisaApplicationApprove.FirstOrDefault(x => x.VisaApplicationId == VisaApplicationId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string VisaApplicationId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.CQMS_VisaApplicationApprove.FirstOrDefault(x => x.VisaApplicationId == VisaApplicationId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -60,7 +60,7 @@ namespace BLL /// 宸ョ▼绛捐瘉鐢宠/璇勫琛ㄥ鎵瑰疄浣 public static void UpdateVisaApplicationApprove(Model.CQMS_VisaApplicationApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_VisaApplicationApprove newApprove = db.CQMS_VisaApplicationApprove.First(e => e.VisaApplicationApproveId == approve.VisaApplicationApproveId && e.ApproveDate == null); newApprove.VisaApplicationId = approve.VisaApplicationId; newApprove.ApproveMan = approve.ApproveMan; @@ -96,7 +96,7 @@ namespace BLL /// 宸ョ▼绛捐瘉鐢宠/璇勫琛ㄥ鎵归泦鍚 public static List GetVisaApplicationApprovesByVisaApplicationId(string VisaApplicationId, string state) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var reDate = (from x in db.CQMS_VisaApplicationApprove where x.VisaApplicationId == VisaApplicationId && x.ApproveType == BLL.Const.VisaApplication_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { @@ -115,7 +115,7 @@ namespace BLL /// 宸ョ▼绛捐瘉鐢宠/璇勫琛ㄥ鎵归泦鍚 public static List GetHQNotAggreeApprovesByVisaApplicationIdAndEdtion(string visaApplicationId, int edtion) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.CQMS_VisaApplicationApprove where x.VisaApplicationId == visaApplicationId && x.Edition == edtion && x.IsAgree == false select x).ToList(); } /// @@ -126,7 +126,7 @@ namespace BLL /// public static IList getListData(string VisaApplicationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.CQMS_VisaApplicationApprove where x.VisaApplicationId == VisaApplicationId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -177,7 +177,7 @@ namespace BLL /// public static void delSolutionApprove(string visaApplicationId, string man) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_VisaApplicationApprove where x.VisaApplicationId == visaApplicationId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList(); db.CQMS_VisaApplicationApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -191,7 +191,7 @@ namespace BLL /// 宸ョ▼绛捐瘉鐢宠/璇勫琛ㄧ紪鍙 public static void DeleteVisaApplicationApprovesByVisaApplicationId(string VisaApplicationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_VisaApplicationApprove where x.VisaApplicationId == VisaApplicationId select x).ToList(); db.CQMS_VisaApplicationApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Information/VisaApplicationFinalService.cs b/SGGL/BLL/CQMS/Information/VisaApplicationFinalService.cs index 4ddd107..c29b701 100644 --- a/SGGL/BLL/CQMS/Information/VisaApplicationFinalService.cs +++ b/SGGL/BLL/CQMS/Information/VisaApplicationFinalService.cs @@ -17,7 +17,7 @@ namespace BLL /// 鏂规瀹℃煡Id public static void DeleteVisaApplication(string visaApplicationFinalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_VisaApplication_Final visaApplication_Final = db.CQMS_VisaApplication_Final.First(e => e.VisaApplicationFinalId == visaApplicationFinalId); db.CQMS_VisaApplication_Final.DeleteOnSubmit(visaApplication_Final); @@ -30,7 +30,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void AddVisaApplication(Model.CQMS_VisaApplication_Final constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_VisaApplication_Final newConstructSolution = new Model.CQMS_VisaApplication_Final(); newConstructSolution.VisaApplicationFinalId = constructSolution.VisaApplicationFinalId; newConstructSolution.ProjectId = constructSolution.ProjectId; @@ -48,7 +48,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void UpdateVisaApplication(Model.CQMS_VisaApplication_Final constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_VisaApplication_Final newConstructSolution = db.CQMS_VisaApplication_Final.FirstOrDefault(e => e.VisaApplicationFinalId == constructSolution.VisaApplicationFinalId); if (newConstructSolution == null) { diff --git a/SGGL/BLL/CQMS/Information/VisaApplicationService.cs b/SGGL/BLL/CQMS/Information/VisaApplicationService.cs index 4f17ea7..f32ef3b 100644 --- a/SGGL/BLL/CQMS/Information/VisaApplicationService.cs +++ b/SGGL/BLL/CQMS/Information/VisaApplicationService.cs @@ -36,7 +36,7 @@ namespace BLL /// 宸ョ▼绛捐瘉鐢宠/璇勫琛↖d public static void DeleteVisaApplication(string visaApplicationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_VisaApplication visaApplication = db.CQMS_VisaApplication.First(e => e.VisaApplicationId == visaApplicationId); db.CQMS_VisaApplication.DeleteOnSubmit(visaApplication); @@ -49,7 +49,7 @@ namespace BLL /// 宸ョ▼绛捐瘉鐢宠/璇勫琛ㄥ疄浣 public static void AddVisaApplication(Model.CQMS_VisaApplication visaApplication) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_VisaApplication newVisaApplication = new Model.CQMS_VisaApplication(); newVisaApplication.VisaApplicationId = visaApplication.VisaApplicationId; newVisaApplication.ProjectId = visaApplication.ProjectId; @@ -77,7 +77,7 @@ namespace BLL /// 宸ョ▼绛捐瘉鐢宠/璇勫琛ㄥ疄浣 public static void UpdateVisaApplication(Model.CQMS_VisaApplication visaApplication) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_VisaApplication newVisaApplication = db.CQMS_VisaApplication.First(e => e.VisaApplicationId == visaApplication.VisaApplicationId); newVisaApplication.SecretLevelId = visaApplication.SecretLevelId; newVisaApplication.VisaApplicationCode = visaApplication.VisaApplicationCode; diff --git a/SGGL/BLL/CQMS/Information/WorkOrderApproveService.cs b/SGGL/BLL/CQMS/Information/WorkOrderApproveService.cs index 1261f63..f3fd110 100644 --- a/SGGL/BLL/CQMS/Information/WorkOrderApproveService.cs +++ b/SGGL/BLL/CQMS/Information/WorkOrderApproveService.cs @@ -10,13 +10,13 @@ namespace BLL { public static Model.CQMS_WorkOrderApprove GetSee(string WorkOrderId, string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.CQMS_WorkOrderApprove.FirstOrDefault(x => x.WorkOrderId == WorkOrderId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string WorkOrderId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.CQMS_WorkOrderApprove.FirstOrDefault(x => x.WorkOrderId == WorkOrderId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -44,7 +44,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗曞鎵归泦鍚 public static List GetNotAggreeApprovesByWorkOrderIdAndEdtion(string workOrderId, int edtion) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.CQMS_WorkOrderApprove where x.WorkOrderId == workOrderId && x.Edition == edtion && x.IsAgree == false select x).ToList(); } public static int? GetUserIdsApprovesBySignTypeEditon(string WorkOrderId) @@ -64,7 +64,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗曞鎵瑰疄浣 public static void UpdateWorkOrderApprove(Model.CQMS_WorkOrderApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_WorkOrderApprove newApprove = db.CQMS_WorkOrderApprove.First(e => e.WorkOrderApproveId == approve.WorkOrderApproveId && e.ApproveDate == null); newApprove.WorkOrderId = approve.WorkOrderId; newApprove.ApproveMan = approve.ApproveMan; @@ -100,7 +100,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗曞鎵归泦鍚 public static List GetWorkOrderApprovesByWorkOrderId(string WorkOrderId, string state) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var reDate = (from x in db.CQMS_WorkOrderApprove where x.WorkOrderId == WorkOrderId && x.ApproveType == BLL.Const.WorkOrder_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { @@ -120,7 +120,7 @@ namespace BLL /// public static IList getListData(string WorkOrderId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.CQMS_WorkOrderApprove where x.WorkOrderId == WorkOrderId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -171,7 +171,7 @@ namespace BLL /// public static void delSolutionApprove(string workOrderId, string man) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_WorkOrderApprove where x.WorkOrderId == workOrderId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList(); db.CQMS_WorkOrderApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -185,7 +185,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗曠紪鍙 public static void DeleteWorkOrderApprovesByWorkOrderId(string WorkOrderId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.CQMS_WorkOrderApprove where x.WorkOrderId == WorkOrderId select x).ToList(); db.CQMS_WorkOrderApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Information/WorkOrderFinalService.cs b/SGGL/BLL/CQMS/Information/WorkOrderFinalService.cs index fe10e01..5e6ee1c 100644 --- a/SGGL/BLL/CQMS/Information/WorkOrderFinalService.cs +++ b/SGGL/BLL/CQMS/Information/WorkOrderFinalService.cs @@ -17,7 +17,7 @@ namespace BLL /// 鏂规瀹℃煡Id public static void DeleteWorkOrder(string WorkOrderFinalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_WorkOrder_Final visaApplication_Final = db.CQMS_WorkOrder_Final.First(e => e.WorkOrderFinalId == WorkOrderFinalId); db.CQMS_WorkOrder_Final.DeleteOnSubmit(visaApplication_Final); @@ -30,7 +30,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void AddWorkOrder(Model.CQMS_WorkOrder_Final constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_WorkOrder_Final newConstructSolution = new Model.CQMS_WorkOrder_Final(); newConstructSolution.WorkOrderFinalId = constructSolution.WorkOrderFinalId; newConstructSolution.ProjectId = constructSolution.ProjectId; @@ -48,7 +48,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void UpdateWorkOrder(Model.CQMS_WorkOrder_Final constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_WorkOrder_Final newConstructSolution = db.CQMS_WorkOrder_Final.FirstOrDefault(e => e.WorkOrderFinalId == constructSolution.WorkOrderFinalId); if (newConstructSolution == null) { diff --git a/SGGL/BLL/CQMS/Information/WorkOrderService.cs b/SGGL/BLL/CQMS/Information/WorkOrderService.cs index 1aa0e2e..d9bc1b4 100644 --- a/SGGL/BLL/CQMS/Information/WorkOrderService.cs +++ b/SGGL/BLL/CQMS/Information/WorkOrderService.cs @@ -36,7 +36,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗旾d public static void DeleteWorkOrder(string workOrderId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_WorkOrder workOrder = db.CQMS_WorkOrder.First(e => e.WorkOrderId == workOrderId); db.CQMS_WorkOrder.DeleteOnSubmit(workOrder); @@ -49,7 +49,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗曞疄浣 public static void AddWorkOrder(Model.CQMS_WorkOrder workOrder) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_WorkOrder newWorkOrder = new Model.CQMS_WorkOrder(); newWorkOrder.WorkOrderId = workOrder.WorkOrderId; newWorkOrder.ProjectId = workOrder.ProjectId; @@ -74,7 +74,7 @@ namespace BLL /// 宸ョ▼绛捐瘉宸ヤ綔濮旀墭鍗曞疄浣 public static void UpdateWorkOrder(Model.CQMS_WorkOrder workOrder) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CQMS_WorkOrder newWorkOrder = db.CQMS_WorkOrder.First(e => e.WorkOrderId == workOrder.WorkOrderId); newWorkOrder.SecretLevelId = workOrder.SecretLevelId; newWorkOrder.WorkOrderCode = workOrder.WorkOrderCode; @@ -189,7 +189,7 @@ namespace BLL /// public static List GetWorkOrderList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.CQMS_WorkOrder where x.ProjectId == projectId && x.State == BLL.Const.WorkOrder_Complete diff --git a/SGGL/BLL/CQMS/ManageReport/ComprehensiveService.cs b/SGGL/BLL/CQMS/ManageReport/ComprehensiveService.cs index eb03d12..43fd695 100644 --- a/SGGL/BLL/CQMS/ManageReport/ComprehensiveService.cs +++ b/SGGL/BLL/CQMS/ManageReport/ComprehensiveService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ComprehensiveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏈懆锛堟湀锛夋姤缁煎悎淇℃伅 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddComprehensive(Model.Report_Comprehensive comprehensive) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_Comprehensive newComprehensive = new Model.Report_Comprehensive(); newComprehensive.ComprehensiveId = comprehensive.ComprehensiveId; newComprehensive.ReportId = comprehensive.ReportId; @@ -55,7 +55,7 @@ namespace BLL /// public static void DeleteComprehensiveByReportId(string reportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Report_Comprehensive where x.ReportId == reportId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/ManageReport/ConstructionProblemsService.cs b/SGGL/BLL/CQMS/ManageReport/ConstructionProblemsService.cs index 9cd3201..a19904a 100644 --- a/SGGL/BLL/CQMS/ManageReport/ConstructionProblemsService.cs +++ b/SGGL/BLL/CQMS/ManageReport/ConstructionProblemsService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ConstructionProblemsService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏂藉伐杩囩▼闂 @@ -48,7 +48,7 @@ namespace BLL /// public static void AddConstructionProblems(Model.Report_ConstructionProblems constructionProblems) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_ConstructionProblems newConstructionProblems = new Model.Report_ConstructionProblems(); newConstructionProblems.ConstructionProblemsId = constructionProblems.ConstructionProblemsId; newConstructionProblems.ReportId = constructionProblems.ReportId; @@ -67,7 +67,7 @@ namespace BLL /// public static void DeleteConstructionProblemsByReportId(string reportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Report_ConstructionProblems where x.ReportId == reportId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/ManageReport/NextQualityControlService.cs b/SGGL/BLL/CQMS/ManageReport/NextQualityControlService.cs index cddf26d..e52d929 100644 --- a/SGGL/BLL/CQMS/ManageReport/NextQualityControlService.cs +++ b/SGGL/BLL/CQMS/ManageReport/NextQualityControlService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class NextQualityControlService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓嬪懆璐ㄩ噺鎺у埗鐐 @@ -41,7 +41,7 @@ namespace BLL /// public static void AddNextQualityControl(Model.Report_NextQualityControl nextQualityControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_NextQualityControl newNextQualityControl = new Model.Report_NextQualityControl(); newNextQualityControl.NextQualityControlId = nextQualityControl.NextQualityControlId; newNextQualityControl.ReportId = nextQualityControl.ReportId; @@ -56,7 +56,7 @@ namespace BLL /// public static void DeleteNextQualityControlByReportId(string reportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Report_NextQualityControl where x.ReportId == reportId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/ManageReport/QualityGoalService.cs b/SGGL/BLL/CQMS/ManageReport/QualityGoalService.cs index 9610bba..264b7a6 100644 --- a/SGGL/BLL/CQMS/ManageReport/QualityGoalService.cs +++ b/SGGL/BLL/CQMS/ManageReport/QualityGoalService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class QualityGoalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏈懆锛堟湀锛夋姤缁煎悎淇℃伅 @@ -38,7 +38,7 @@ namespace BLL /// public static void Add_QualityGoal(Model.Report_QualityGoal comprehensive) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_QualityGoal newComprehensive = new Model.Report_QualityGoal(); newComprehensive.ReportId = comprehensive.ReportId; newComprehensive.ProjectId = comprehensive.ProjectId; @@ -73,7 +73,7 @@ namespace BLL /// public static void Delete_QualityGoalByReportId(string reportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Report_QualityGoal where x.ReportId == reportId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/ManageReport/RowMaterialProblemService.cs b/SGGL/BLL/CQMS/ManageReport/RowMaterialProblemService.cs index 008a42a..8f4bb41 100644 --- a/SGGL/BLL/CQMS/ManageReport/RowMaterialProblemService.cs +++ b/SGGL/BLL/CQMS/ManageReport/RowMaterialProblemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RowMaterialProblemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍘熸潗鏂欓棶棰 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddRowMaterialProblem(Model.Report_RowMaterialProblem rowMaterialProblem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_RowMaterialProblem newRowMaterialProblem = new Model.Report_RowMaterialProblem(); newRowMaterialProblem.RowMaterialProblemId = rowMaterialProblem.RowMaterialProblemId; newRowMaterialProblem.ReportId = rowMaterialProblem.ReportId; @@ -57,7 +57,7 @@ namespace BLL /// public static void DeleteRowMaterialProbleByReportId(string reportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Report_RowMaterialProblem where x.ReportId == reportId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/ManageReport/ThisWeekOrMonthContentService.cs b/SGGL/BLL/CQMS/ManageReport/ThisWeekOrMonthContentService.cs index 23c15ec..020f59f 100644 --- a/SGGL/BLL/CQMS/ManageReport/ThisWeekOrMonthContentService.cs +++ b/SGGL/BLL/CQMS/ManageReport/ThisWeekOrMonthContentService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ThisWeekOrMonthContentService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏈懆涓昏宸ヤ綔鍐呭 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddThisWeekOrMonthContent(Model.Report_ThisWeekOrMonthContent thisWeekOrMonthContent) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_ThisWeekOrMonthContent newThisWeekOrMonthContent = new Model.Report_ThisWeekOrMonthContent(); newThisWeekOrMonthContent.ContentId = thisWeekOrMonthContent.ContentId; newThisWeekOrMonthContent.ReportId = thisWeekOrMonthContent.ReportId; @@ -53,7 +53,7 @@ namespace BLL /// public static void DeleteThisWeekOrMonthContentByReportId(string reportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Report_ThisWeekOrMonthContent where x.ReportId == reportId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/ManageReport/WeekAndMonthReportService.cs b/SGGL/BLL/CQMS/ManageReport/WeekAndMonthReportService.cs index 4b3db3c..16f10d5 100644 --- a/SGGL/BLL/CQMS/ManageReport/WeekAndMonthReportService.cs +++ b/SGGL/BLL/CQMS/ManageReport/WeekAndMonthReportService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class WeekAndMonthReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -79,7 +79,7 @@ namespace BLL /// public static void AddWeekAndMonthReport(Model.Report_WeekAndMonthReport report) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_WeekAndMonthReport newReport = new Model.Report_WeekAndMonthReport(); newReport.ReportId = report.ReportId; newReport.Period = report.Period; @@ -97,7 +97,7 @@ namespace BLL /// public static void UpdateWeekAndMonthReport(Model.Report_WeekAndMonthReport report) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_WeekAndMonthReport newReport = db.Report_WeekAndMonthReport.FirstOrDefault(e => e.ReportId == report.ReportId); if (newReport != null) { @@ -116,7 +116,7 @@ namespace BLL /// public static void DeleteWeekAndMonthReportById(string reportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Report_WeekAndMonthReport report = db.Report_WeekAndMonthReport.FirstOrDefault(e => e.ReportId == reportId); if (report != null) { diff --git a/SGGL/BLL/CQMS/ProcessControl/HotProessManageService.cs b/SGGL/BLL/CQMS/ProcessControl/HotProessManageService.cs index 8607a07..df4e93e 100644 --- a/SGGL/BLL/CQMS/ProcessControl/HotProessManageService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/HotProessManageService.cs @@ -9,7 +9,7 @@ namespace BLL public static class HotProessManageService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -107,7 +107,7 @@ namespace BLL /// public static void AddHotProessManage(Model.ProcessControl_HotProessManage hotProessManage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_HotProessManage newHotProessManage = new Model.ProcessControl_HotProessManage(); newHotProessManage.HotProessManageId = hotProessManage.HotProessManageId; newHotProessManage.ProjectId = hotProessManage.ProjectId; @@ -129,7 +129,7 @@ namespace BLL /// public static void UpdateHotProessManage(Model.ProcessControl_HotProessManage hotProessManage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_HotProessManage newHotProessManage = db.ProcessControl_HotProessManage.FirstOrDefault(e => e.HotProessManageId == hotProessManage.HotProessManageId); if (newHotProessManage != null) { @@ -152,7 +152,7 @@ namespace BLL /// public static void DeleteHotProessManage(string hotProessManageId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_HotProessManage inspectionManagement = db.ProcessControl_HotProessManage.FirstOrDefault(e => e.HotProessManageId == hotProessManageId); if (inspectionManagement != null) { diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementApproveService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementApproveService.cs index a2b3605..be41f98 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementApproveService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementApproveService.cs @@ -10,20 +10,20 @@ namespace BLL.CQMS.ProcessControl { public static void DeleteAllApproveDetail(string InspectionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.ProcessControl_InspectionManagementApprove where x.InspectionId == InspectionId select x).ToList(); db.ProcessControl_InspectionManagementApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); } public static Model.ProcessControl_InspectionManagementApprove GetSee(string InspectionId, string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.ProcessControl_InspectionManagementApprove.FirstOrDefault(x => x.InspectionId == InspectionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string InspectionId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.ProcessControl_InspectionManagementApprove.FirstOrDefault(x => x.InspectionId == InspectionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -35,7 +35,7 @@ namespace BLL.CQMS.ProcessControl } public static IList getListData(string InspectionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.ProcessControl_InspectionManagementApprove where x.InspectionId == InspectionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -61,7 +61,7 @@ namespace BLL.CQMS.ProcessControl /// 鏂藉伐鏂规瀹℃壒瀹炰綋 public static void UpdateApprove(Model.ProcessControl_InspectionManagementApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_InspectionManagementApprove newApprove = db.ProcessControl_InspectionManagementApprove.FirstOrDefault(e => e.InspectionManagementApproveId == approve.InspectionManagementApproveId); newApprove.InspectionId = approve.InspectionId; newApprove.ApproveMan = approve.ApproveMan; diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs index 36af93f..e9cccbe 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs @@ -9,7 +9,7 @@ namespace BLL { public class InspectionManagementDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍏辨璁板綍鏄庣粏 @@ -37,7 +37,7 @@ namespace BLL /// public static void AddInspectionDetail(Model.ProcessControl_InspectionManagementDetail InspectionDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_InspectionManagementDetail newInspectionDetail = new Model.ProcessControl_InspectionManagementDetail(); newInspectionDetail.InspectionDetailId = InspectionDetail.InspectionDetailId; newInspectionDetail.InspectionId = InspectionDetail.InspectionId; @@ -51,7 +51,7 @@ namespace BLL } public static void AddInspectionDetailForApi(Model.ProcessControl_InspectionManagementDetail InspectionDetail) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.ProcessControl_InspectionManagementDetail newInspectionDetail = new Model.ProcessControl_InspectionManagementDetail(); newInspectionDetail.InspectionDetailId = InspectionDetail.InspectionDetailId; @@ -71,7 +71,7 @@ namespace BLL /// public static void UpdateInspectionDetail(Model.ProcessControl_InspectionManagementDetail InspectionDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_InspectionManagementDetail newInspectionDetail = db.ProcessControl_InspectionManagementDetail.First(e => e.InspectionDetailId == InspectionDetail.InspectionDetailId); newInspectionDetail.UnitWorkId = InspectionDetail.UnitWorkId; newInspectionDetail.Branch = InspectionDetail.Branch; @@ -87,14 +87,14 @@ namespace BLL /// public static void DeleteInspectionDetail(string InspectionDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_InspectionManagementDetail InspectionDetail = db.ProcessControl_InspectionManagementDetail.First(e => e.InspectionDetailId == InspectionDetailId); db.ProcessControl_InspectionManagementDetail.DeleteOnSubmit(InspectionDetail); db.SubmitChanges(); } public static void DeleteInspectionDetailForApi(string InspectionDetailId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.ProcessControl_InspectionManagementDetail InspectionDetail = db.ProcessControl_InspectionManagementDetail.First(e => e.InspectionDetailId == InspectionDetailId); db.ProcessControl_InspectionManagementDetail.DeleteOnSubmit(InspectionDetail); @@ -107,7 +107,7 @@ namespace BLL /// public static void DeleteAllInspectionDetail(string InspectionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.ProcessControl_InspectionManagementDetail where x.InspectionId == InspectionId select x).ToList(); db.ProcessControl_InspectionManagementDetail.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -137,7 +137,7 @@ namespace BLL /// public static List GetInspectionDetails(string InspectionId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.ProcessControl_InspectionManagementDetail where x.InspectionId == InspectionId @@ -146,7 +146,7 @@ namespace BLL } public static List GetInspectionDetailsForApi(string InspectionId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.ProcessControl_InspectionManagementDetail where x.InspectionId == InspectionId @@ -160,7 +160,7 @@ namespace BLL /// public static List GetOKInspectionDetails(string InspectionId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.ProcessControl_InspectionManagementDetail join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId @@ -170,7 +170,7 @@ namespace BLL } public static List GetOKInspectionDetailsForApi(string InspectionId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.ProcessControl_InspectionManagementDetail join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs index 9db5a63..083735c 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class InspectionManagementService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -225,7 +225,7 @@ namespace BLL /// public static void AddInspectionManagement(Model.ProcessControl_InspectionManagement inspectionManagement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_InspectionManagement newInspectionManagement = new Model.ProcessControl_InspectionManagement(); newInspectionManagement.InspectionId = inspectionManagement.InspectionId; newInspectionManagement.ProjectId = inspectionManagement.ProjectId; @@ -268,7 +268,7 @@ namespace BLL /// public static void UpdateInspectionManagement(Model.ProcessControl_InspectionManagement inspectionManagement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_InspectionManagement newInspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(e => e.InspectionId == inspectionManagement.InspectionId); if (newInspectionManagement != null) { @@ -307,7 +307,7 @@ namespace BLL /// public static void DeleteInspectionManagement(string inspectionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_InspectionManagement inspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(e => e.InspectionId == inspectionId); if (inspectionManagement != null) { diff --git a/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestService.cs b/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestService.cs index 7dd6edb..12c61b5 100644 --- a/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class NondestructiveTestService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -36,7 +36,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string UnitWorkId, string unitId, string welderCode, string startDate, string endDate, int startRowIndex, int maximumRows) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; IQueryable q = from x in db.ProcessControl_NondestructiveTest where x.ProjectId == projectId orderby x.NondestructiveTestDate descending @@ -110,7 +110,7 @@ namespace BLL /// public static void AddNondestructiveTest(Model.ProcessControl_NondestructiveTest nondestructiveTest) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_NondestructiveTest newNondestructiveTest = new Model.ProcessControl_NondestructiveTest(); newNondestructiveTest.NondestructiveTestId = nondestructiveTest.NondestructiveTestId; newNondestructiveTest.ProjectId = nondestructiveTest.ProjectId; @@ -137,7 +137,7 @@ namespace BLL /// public static void UpdateNondestructiveTest(Model.ProcessControl_NondestructiveTest nondestructiveTest) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_NondestructiveTest newNondestructiveTest = db.ProcessControl_NondestructiveTest.FirstOrDefault(e => e.NondestructiveTestId == nondestructiveTest.NondestructiveTestId); if (newNondestructiveTest != null) { @@ -164,7 +164,7 @@ namespace BLL /// public static void DeleteNondestructiveTest(string nondestructiveTestId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_NondestructiveTest nondestructiveTest = db.ProcessControl_NondestructiveTest.FirstOrDefault(e => e.NondestructiveTestId == nondestructiveTestId); if (nondestructiveTest != null) { diff --git a/SGGL/BLL/CQMS/ProcessControl/TestPackageManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/TestPackageManagementService.cs index 0903645..d46a285 100644 --- a/SGGL/BLL/CQMS/ProcessControl/TestPackageManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/TestPackageManagementService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class TestPackageManagementService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -95,7 +95,7 @@ namespace BLL /// public static void AddTestPackageManagement(Model.ProcessControl_TestPackageManagement testPackageManagement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_TestPackageManagement newTestPackageManagement = new Model.ProcessControl_TestPackageManagement(); newTestPackageManagement.TestPackageManagementId = testPackageManagement.TestPackageManagementId; newTestPackageManagement.ProjectId = testPackageManagement.ProjectId; @@ -118,7 +118,7 @@ namespace BLL /// public static void UpdateTestPackageManagement(Model.ProcessControl_TestPackageManagement testPackageManagement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_TestPackageManagement newTestPackageManagement = db.ProcessControl_TestPackageManagement.FirstOrDefault(e => e.TestPackageManagementId == testPackageManagement.TestPackageManagementId); if (newTestPackageManagement != null) { @@ -141,7 +141,7 @@ namespace BLL /// public static void DeleteTestPackageManagementById(string testPackageManagementId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProcessControl_TestPackageManagement newTestPackageManagement = db.ProcessControl_TestPackageManagement.FirstOrDefault(e => e.TestPackageManagementId == testPackageManagementId); if (newTestPackageManagement != null) { diff --git a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs index a878b5a..008947d 100644 --- a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs +++ b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs @@ -32,13 +32,13 @@ namespace BLL } public static Model.Solution_CQMSConstructSolutionApprove GetSee(string ConstructSolutionId, string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string ConstructSolutionId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -76,7 +76,7 @@ namespace BLL /// 鏂藉伐鏂规瀹℃壒瀹炰綋 public static void UpdateConstructSolutionApprove(Model.Solution_CQMSConstructSolutionApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_CQMSConstructSolutionApprove newApprove = db.Solution_CQMSConstructSolutionApprove.First(e => e.ConstructSolutionApproveId == approve.ConstructSolutionApproveId); newApprove.ConstructSolutionId = approve.ConstructSolutionId; newApprove.ApproveMan = approve.ApproveMan; @@ -112,7 +112,7 @@ namespace BLL /// 鏂藉伐鏂规瀹℃壒闆嗗悎 public static List GetConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId, string state) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var reDate = (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { @@ -132,7 +132,7 @@ namespace BLL /// public static IList getListData(string ConstructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" && x.SignType != "S" orderby x.ApproveDate @@ -154,7 +154,7 @@ namespace BLL } public static IList getListDataForExport(string ConstructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveType, x.Edition @@ -205,7 +205,7 @@ namespace BLL /// public static void delSolutionApprove(string constructSolutionId, string man) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == constructSolutionId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList(); db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -219,7 +219,7 @@ namespace BLL /// public static void delApprove(string ConstructSolutionApproveId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var del = db.Solution_CQMSConstructSolutionApprove.Where(c => c.ConstructSolutionApproveId == ConstructSolutionApproveId).FirstOrDefault(); db.Solution_CQMSConstructSolutionApprove.DeleteOnSubmit(del); db.SubmitChanges(); @@ -235,7 +235,7 @@ namespace BLL /// 鏂藉伐鏂规缂栧彿 public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList(); db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -297,7 +297,7 @@ namespace BLL } public static void AddConstructSolutionApproveForApi(Model.Solution_CQMSConstructSolutionApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_CQMSConstructSolutionApprove newApprove = new Model.Solution_CQMSConstructSolutionApprove(); if (string.IsNullOrWhiteSpace(approve.ConstructSolutionApproveId)) @@ -322,7 +322,7 @@ namespace BLL } public static List getListDataForApi(string ConstructSolutionId, int edition) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S" @@ -360,7 +360,7 @@ namespace BLL } public static List getListDataForApi(string ConstructSolutionId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" @@ -400,7 +400,7 @@ namespace BLL } public static Model.Solution_CQMSConstructSolutionApprove getCurrApproveForApi(string ConstructSolutionId, string approveMan, int edition) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_CQMSConstructSolutionApprove newApprove = db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(e => e.ConstructSolutionId == ConstructSolutionId && e.ApproveMan == approveMan && e.Edition == edition && e.ApproveType != "S" && e.ApproveDate == null); if (newApprove != null) @@ -416,7 +416,7 @@ namespace BLL } public static List getConApproveForApi(string ConstructSolutionId, int edition) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List res = new List(); var newApproves = db.Solution_CQMSConstructSolutionApprove.Where(e => e.ConstructSolutionId == ConstructSolutionId && e.Edition == edition && e.ApproveType == "2").ToList(); @@ -446,7 +446,7 @@ namespace BLL } public static List getConApprovesForApi(string ConstructSolutionId, int edition) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List res = new List(); var newApproves = db.Solution_CQMSConstructSolutionApprove.Where(e => e.ConstructSolutionId == ConstructSolutionId && e.Edition == edition).ToList(); @@ -476,7 +476,7 @@ namespace BLL } public static Model.Solution_CQMSConstructSolutionApprove UpdateConstructSolutionApproveForApi(Model.Solution_CQMSConstructSolutionApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_CQMSConstructSolutionApprove newApprove = db.Solution_CQMSConstructSolutionApprove.First(e => e.ConstructSolutionApproveId == approve.ConstructSolutionApproveId); if (!string.IsNullOrEmpty(approve.ConstructSolutionId)) diff --git a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionFinalService.cs b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionFinalService.cs index 0ca2ad7..285c5d2 100644 --- a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionFinalService.cs +++ b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionFinalService.cs @@ -17,7 +17,7 @@ namespace BLL /// 鏂规瀹℃煡Id public static void DeleteConstructSolution(string constructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_CQMSConstructSolution_Final constructSolution = db.Solution_CQMSConstructSolution_Final.First(e => e.ConstructSolutionId == constructSolutionId); db.Solution_CQMSConstructSolution_Final.DeleteOnSubmit(constructSolution); @@ -30,7 +30,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void AddConstructSolution(Model.Solution_CQMSConstructSolution_Final constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_CQMSConstructSolution_Final newConstructSolution = new Model.Solution_CQMSConstructSolution_Final(); newConstructSolution.ConstructSolutionId = constructSolution.ConstructSolutionId; newConstructSolution.ProjectId = constructSolution.ProjectId; @@ -51,7 +51,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void UpdateConstructSolution(Model.Solution_CQMSConstructSolution_Final constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_CQMSConstructSolution_Final newConstructSolution = db.Solution_CQMSConstructSolution_Final.FirstOrDefault(e => e.ConstructSolutionId == constructSolution.ConstructSolutionId); if (newConstructSolution == null) { diff --git a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs index 09f29e0..c0b5a65 100644 --- a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs +++ b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs @@ -36,7 +36,7 @@ namespace BLL /// 鏂规瀹℃煡Id public static void DeleteConstructSolution(string constructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_CQMSConstructSolution constructSolution = db.Solution_CQMSConstructSolution.First(e => e.ConstructSolutionId == constructSolutionId); db.Solution_CQMSConstructSolution.DeleteOnSubmit(constructSolution); @@ -49,7 +49,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void AddConstructSolution(Model.Solution_CQMSConstructSolution constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_CQMSConstructSolution newConstructSolution = new Model.Solution_CQMSConstructSolution(); newConstructSolution.ConstructSolutionId = constructSolution.ConstructSolutionId; newConstructSolution.Code = constructSolution.Code; @@ -74,7 +74,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void UpdateConstructSolution(Model.Solution_CQMSConstructSolution constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_CQMSConstructSolution newConstructSolution = db.Solution_CQMSConstructSolution.FirstOrDefault(e => e.ConstructSolutionId == constructSolution.ConstructSolutionId); if (newConstructSolution == null) { @@ -153,7 +153,7 @@ namespace BLL } public static Model.Solution_CQMSConstructSolution GetConstructSolutionByConstructSolutionIdForApi(string constructSolutionId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_CQMSConstructSolution solution = db.Solution_CQMSConstructSolution.FirstOrDefault(x => x.ConstructSolutionId == constructSolutionId); solution.AttachUrl = AttachFileService.getFileUrl(solution.ConstructSolutionId+solution.Edition); @@ -234,7 +234,7 @@ namespace BLL } public static List getListDataForApi(string name, string unitId, string unitWork, string cNProfessionalCodes, string solutionType, string state, string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Solution_CQMSConstructSolution; @@ -402,7 +402,7 @@ namespace BLL } public static void UpdateConstructSolutionForApi(Model.Solution_CQMSConstructSolution constructSolution) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_CQMSConstructSolution newConstructSolution = db.Solution_CQMSConstructSolution.First(e => e.ConstructSolutionId == constructSolution.ConstructSolutionId); if (!string.IsNullOrEmpty(constructSolution.Code)) diff --git a/SGGL/BLL/CQMS/Unqualified/WorkContactApproveService.cs b/SGGL/BLL/CQMS/Unqualified/WorkContactApproveService.cs index d124de3..0d77472 100644 --- a/SGGL/BLL/CQMS/Unqualified/WorkContactApproveService.cs +++ b/SGGL/BLL/CQMS/Unqualified/WorkContactApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class WorkContactApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -41,7 +41,7 @@ namespace BLL /// 宸ヤ綔鑱旂郴鍗曚富閿 public static void DeleteWorkContactApproveByWorkContactId(string noticeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var data = (from x in db.Unqualified_WorkContactApprove where x.WorkContactId == noticeId select x).ToList(); if (data != null) { @@ -56,7 +56,7 @@ namespace BLL /// 宸ヤ綔鑱旂郴鍗曞鎵瑰疄浣 public static void AddWorkContactApprove(Model.Unqualified_WorkContactApprove workContactApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Unqualified_WorkContactApprove)); Model.Unqualified_WorkContactApprove newWorkContactApprove = new Model.Unqualified_WorkContactApprove(); newWorkContactApprove.WorkContactApproveId = newKeyID; @@ -73,7 +73,7 @@ namespace BLL } public static string AddWorkContactApproveForApi(Model.Unqualified_WorkContactApprove workContactApprove) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.Unqualified_WorkContactApprove)); Model.Unqualified_WorkContactApprove newWorkContactApprove = new Model.Unqualified_WorkContactApprove(); @@ -96,7 +96,7 @@ namespace BLL } public static void See(string WorkContactId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == WorkContactId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -121,7 +121,7 @@ namespace BLL /// 宸ヤ綔鑱旂郴鍗曞鎵瑰疄浣 public static void UpdateWorkContactApprove(Model.Unqualified_WorkContactApprove workContactApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Unqualified_WorkContactApprove newWorkContactApprove = db.Unqualified_WorkContactApprove.First(e => e.WorkContactApproveId == workContactApprove.WorkContactApproveId); newWorkContactApprove.WorkContactId = workContactApprove.WorkContactId; newWorkContactApprove.ApproveMan = workContactApprove.ApproveMan; @@ -179,14 +179,14 @@ namespace BLL } public static Model.Unqualified_WorkContactApprove GetWorkContactApproveById(string WorkContactApproveId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return db.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactApproveId == WorkContactApproveId); } } public static List getListDataByIdForApi(string workContactId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Unqualified_WorkContactApprove where x.WorkContactId == workContactId && x.ApproveDate != null && x.ApproveType != "S" @@ -224,7 +224,7 @@ namespace BLL } public static Model.Unqualified_WorkContactApprove getCurrApproveForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Unqualified_WorkContactApprove newWorkContactApprove = db.Unqualified_WorkContactApprove.FirstOrDefault(e => e.WorkContactId == id && e.ApproveType != "S" && e.ApproveDate == null); if (newWorkContactApprove != null) @@ -243,7 +243,7 @@ namespace BLL /// 宸ヤ綔鑱旂郴鍗曞鎵瑰疄浣 public static void UpdateWorkContactApproveForApi(Model.Unqualified_WorkContactApprove workContactApprove) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Unqualified_WorkContactApprove newWorkContactApprove = db.Unqualified_WorkContactApprove.FirstOrDefault(e => e.WorkContactApproveId == workContactApprove.WorkContactApproveId); diff --git a/SGGL/BLL/CQMS/Unqualified/WorkContactService.cs b/SGGL/BLL/CQMS/Unqualified/WorkContactService.cs index d45bf66..95bec23 100644 --- a/SGGL/BLL/CQMS/Unqualified/WorkContactService.cs +++ b/SGGL/BLL/CQMS/Unqualified/WorkContactService.cs @@ -73,7 +73,7 @@ namespace BLL /// 宸ヤ綔鑱旂郴鍗曚俊鎭疘d public static void DeleteWorkContact(string workContactId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Unqualified_WorkContact workContact = db.Unqualified_WorkContact.First(e => e.WorkContactId == workContactId); db.Unqualified_WorkContact.DeleteOnSubmit(workContact); @@ -194,7 +194,7 @@ namespace BLL } public static Model.Unqualified_WorkContact GetWorkContactByWorkContactIdForApi(string workContactId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.Unqualified_WorkContact.FirstOrDefault(x => x.WorkContactId == workContactId); //Model.Base_Unit unit = db.Base_Unit.FirstOrDefault(e => e.UnitId == res.ProposedUnitId); @@ -263,7 +263,7 @@ namespace BLL /// 宸ヤ綔鑱旂郴鍗曚俊鎭疄浣 public static void AddWorkContact(Model.Unqualified_WorkContact workContact) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Unqualified_WorkContact newWorkContact = new Model.Unqualified_WorkContact(); newWorkContact.WorkContactId = workContact.WorkContactId; newWorkContact.ProjectId = workContact.ProjectId; @@ -286,7 +286,7 @@ namespace BLL } public static void AddWorkContactForApi(Model.Unqualified_WorkContact workContact) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Unqualified_WorkContact newWorkContact = new Model.Unqualified_WorkContact(); newWorkContact.WorkContactId = workContact.WorkContactId; @@ -315,7 +315,7 @@ namespace BLL /// 宸ヤ綔鑱旂郴鍗曚俊鎭疄浣 public static void UpdateWorkContact(Model.Unqualified_WorkContact workContact) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Unqualified_WorkContact newWorkContact = db.Unqualified_WorkContact.First(e => e.WorkContactId == workContact.WorkContactId); newWorkContact.Code = workContact.Code; newWorkContact.ProposedUnitId = workContact.ProposedUnitId; @@ -332,7 +332,7 @@ namespace BLL } public static List getListDataForApi(string projectId, string name, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Unqualified_WorkContact; if (!string.IsNullOrEmpty(projectId)) @@ -405,7 +405,7 @@ namespace BLL public static List getListDataForApi(string code, string proposedUnitId, string mainSendUnitId, string cCUnitId, string cause, string contents, string dateA, string dateZ, string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Unqualified_WorkContact; if (!string.IsNullOrEmpty(code) && "undefined" != code) @@ -509,7 +509,7 @@ namespace BLL } public static void UpdateWorkContactForApi(Model.Unqualified_WorkContact workContact) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Unqualified_WorkContact newWorkContact = db.Unqualified_WorkContact.FirstOrDefault(e => e.WorkContactId == workContact.WorkContactId); if (newWorkContact != null) @@ -542,7 +542,7 @@ namespace BLL } public static int getListCount(string projectId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Unqualified_WorkContact; if (!string.IsNullOrEmpty(projectId)) diff --git a/SGGL/BLL/CQMS/WBS/BreakdownProjectAuditRecordService.cs b/SGGL/BLL/CQMS/WBS/BreakdownProjectAuditRecordService.cs index 0581c0c..d111e0f 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownProjectAuditRecordService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownProjectAuditRecordService.cs @@ -9,7 +9,7 @@ namespace BLL { public class BreakdownProjectAuditRecordService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; @@ -29,7 +29,7 @@ namespace BLL /// public static void AddBreakdownProject(Model.WBS_BreakdownProjectAuditRecord breakdownProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_BreakdownProjectAuditRecord newBreakdownProject = new Model.WBS_BreakdownProjectAuditRecord(); newBreakdownProject.AuditId = breakdownProject.AuditId; @@ -52,7 +52,7 @@ namespace BLL /// public static void UpdateBreakdownProject(Model.WBS_BreakdownProjectAuditRecord breakdownProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_BreakdownProjectAuditRecord newBreakdownProject = db.WBS_BreakdownProjectAuditRecord.First(e => e.AuditId == breakdownProject.AuditId); newBreakdownProject.ProjectId = breakdownProject.ProjectId; newBreakdownProject.AuditName = breakdownProject.AuditName; @@ -71,7 +71,7 @@ namespace BLL /// public static void DeleteBreakdown(string AuditId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_BreakdownProjectAuditRecord breakdownProject = db.WBS_BreakdownProjectAuditRecord.First(e => e.AuditId == AuditId); db.WBS_BreakdownProjectAuditRecord.DeleteOnSubmit(breakdownProject); db.SubmitChanges(); @@ -83,7 +83,7 @@ namespace BLL /// public static void DeleteAllBreakdown(string divisionProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.WBS_BreakdownProjectAuditRecord where x.ProjectId == divisionProjectId select x; if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs index 881910b..0993258 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs @@ -9,7 +9,7 @@ namespace BLL { public class BreakdownProjectService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -234,7 +234,7 @@ namespace BLL /// public static void AddBreakdownProject(Model.WBS_BreakdownProject breakdownProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_BreakdownProject newBreakdownProject = new Model.WBS_BreakdownProject(); newBreakdownProject.BreakdownProjectId = breakdownProject.BreakdownProjectId; @@ -272,7 +272,7 @@ namespace BLL /// public static void UpdateBreakdownProject(Model.WBS_BreakdownProject breakdownProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_BreakdownProject newBreakdownProject = db.WBS_BreakdownProject.First(e => e.BreakdownProjectId == breakdownProject.BreakdownProjectId); newBreakdownProject.BreakdownCode = breakdownProject.BreakdownCode; newBreakdownProject.BreakdownName = breakdownProject.BreakdownName; @@ -299,7 +299,7 @@ namespace BLL /// public static void DeleteBreakdown(string breakdownProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_BreakdownProject breakdownProject = db.WBS_BreakdownProject.First(e => e.BreakdownProjectId == breakdownProjectId); db.WBS_BreakdownProject.DeleteOnSubmit(breakdownProject); db.SubmitChanges(); @@ -311,7 +311,7 @@ namespace BLL /// public static void DeleteAllBreakdown(string divisionProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.WBS_BreakdownProject where x.DivisionProjectId == divisionProjectId select x; if (q.Count() > 0) { @@ -326,7 +326,7 @@ namespace BLL /// public static void DeleteAllBreakdownByUnitWorkId(string unitWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.WBS_BreakdownProject where x.UnitWorkId == unitWorkId select x; db.WBS_BreakdownProject.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/WBS/BreakdownService.cs b/SGGL/BLL/CQMS/WBS/BreakdownService.cs index f858d9c..7f881c5 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownService.cs @@ -9,7 +9,7 @@ namespace BLL { public class BreakdownService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -89,7 +89,7 @@ namespace BLL /// public static void AddBreakdown(Model.WBS_Breakdown breakdown) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_Breakdown newBreakdown = new Model.WBS_Breakdown(); newBreakdown.BreakdownId = breakdown.BreakdownId; @@ -120,7 +120,7 @@ namespace BLL /// public static void UpdateBreakdown(Model.WBS_Breakdown breakdown) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_Breakdown newBreakdown = db.WBS_Breakdown.First(e => e.BreakdownId == breakdown.BreakdownId); newBreakdown.BreakdownCode = breakdown.BreakdownCode; newBreakdown.BreakdownName = breakdown.BreakdownName; @@ -146,7 +146,7 @@ namespace BLL /// public static void DeleteBreakdown(string breakdownId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_Breakdown breakdown = db.WBS_Breakdown.First(e => e.BreakdownId == breakdownId); db.WBS_Breakdown.DeleteOnSubmit(breakdown); db.SubmitChanges(); @@ -158,7 +158,7 @@ namespace BLL /// public static void DeleteAllBreakdown(string divisionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.WBS_Breakdown where x.DivisionId == divisionId select x; if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs b/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs index 96d6bd6..86b898f 100644 --- a/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs +++ b/SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs @@ -18,7 +18,7 @@ namespace BLL } public static Model.WBS_ControlItemAndCycle GetControlItemAndCycleByIdForApi(string ControlItemAndCycleId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return db.WBS_ControlItemAndCycle.FirstOrDefault(e => e.ControlItemAndCycleId == ControlItemAndCycleId); } @@ -44,7 +44,7 @@ namespace BLL /// public static void AddControlItemAndCycle(Model.WBS_ControlItemAndCycle ControlItemAndCycle) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemAndCycle newControlItemAndCycle = new Model.WBS_ControlItemAndCycle(); //string newKeyID = SQLHelper.GetNewID(typeof(Model.WBS_ControlItemAndCycle)); newControlItemAndCycle.ControlItemAndCycleId = ControlItemAndCycle.ControlItemAndCycleId; @@ -77,7 +77,7 @@ namespace BLL /// public static void UpdateControlItemAndCycle(Model.WBS_ControlItemAndCycle ControlItemAndCycle) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemAndCycle newControlItemAndCycle = db.WBS_ControlItemAndCycle.First(e => e.ControlItemAndCycleId == ControlItemAndCycle.ControlItemAndCycleId); newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode; newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId; @@ -108,7 +108,7 @@ namespace BLL /// public static void DeleteControlItemAndCycle(string ControlItemAndCycleId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemAndCycle ControlItemAndCycle = db.WBS_ControlItemAndCycle.First(e => e.ControlItemAndCycleId == ControlItemAndCycleId); db.WBS_ControlItemAndCycle.DeleteOnSubmit(ControlItemAndCycle); db.SubmitChanges(); @@ -131,7 +131,7 @@ namespace BLL /// public static void DeleteAllControlItemAndCycle(string WorkPackageId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List q = (from x in db.WBS_ControlItemAndCycle where x.WorkPackageId == WorkPackageId orderby x.ControlItemAndCycleCode select x).ToList(); db.WBS_ControlItemAndCycle.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -143,7 +143,7 @@ namespace BLL /// public static void DeleteAllControlItemAndCycleByUnitWorkId(string unitWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List q = (from x in db.WBS_ControlItemAndCycle join y in db.WBS_WorkPackage on x.WorkPackageId equals y.WorkPackageId @@ -164,7 +164,7 @@ namespace BLL } public static List GetListByWorkPackageIdForApi(string WorkPackageId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = (from x in db.WBS_ControlItemAndCycle where x.WorkPackageId == WorkPackageId orderby x.ControlItemAndCycleCode select x).ToList(); foreach (var item in res) diff --git a/SGGL/BLL/CQMS/WBS/ControlItemInitService.cs b/SGGL/BLL/CQMS/WBS/ControlItemInitService.cs index d0c9778..2b8aaaf 100644 --- a/SGGL/BLL/CQMS/WBS/ControlItemInitService.cs +++ b/SGGL/BLL/CQMS/WBS/ControlItemInitService.cs @@ -41,7 +41,7 @@ namespace BLL /// public static void AddControlItemInit(Model.WBS_ControlItemInit controlItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemInit newControlItem = new Model.WBS_ControlItemInit(); newControlItem.ControlItemCode = controlItem.ControlItemCode; @@ -65,7 +65,7 @@ namespace BLL /// public static void UpdateControlItemInit(Model.WBS_ControlItemInit controlItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemInit newControlItem = db.WBS_ControlItemInit.First(e => e.ControlItemCode == controlItem.ControlItemCode); newControlItem.WorkPackageCode = controlItem.WorkPackageCode; @@ -87,7 +87,7 @@ namespace BLL /// public static void DeleteControlItemInit(string controlItemCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemInit controlItem = db.WBS_ControlItemInit.First(e => e.ControlItemCode == controlItemCode); db.WBS_ControlItemInit.DeleteOnSubmit(controlItem); db.SubmitChanges(); @@ -99,7 +99,7 @@ namespace BLL /// public static void DeleteAllControlItemInit(string workPackageCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List q = (from x in db.WBS_ControlItemInit where x.WorkPackageCode == workPackageCode orderby x.ControlItemCode select x).ToList(); db.WBS_ControlItemInit.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/WBS/ControlItemProjectService.cs b/SGGL/BLL/CQMS/WBS/ControlItemProjectService.cs index fda30ec..b871119 100644 --- a/SGGL/BLL/CQMS/WBS/ControlItemProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/ControlItemProjectService.cs @@ -40,7 +40,7 @@ namespace BLL /// public static void AddControlItemProject(Model.WBS_ControlItemProject controlItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemProject newControlItem = new Model.WBS_ControlItemProject(); newControlItem.ControlItemCode = controlItem.ControlItemCode; @@ -66,7 +66,7 @@ namespace BLL /// public static void UpdateControlItemProject(Model.WBS_ControlItemProject controlItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemProject newControlItem = db.WBS_ControlItemProject.First(e => e.ControlItemCode == controlItem.ControlItemCode); newControlItem.WorkPackageCode = controlItem.WorkPackageCode; @@ -89,7 +89,7 @@ namespace BLL /// public static void DeleteAllControlItemProject(string workPackageCode, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List q = (from x in db.WBS_ControlItemProject where x.WorkPackageCode == workPackageCode && x.ProjectId == projectId orderby x.ControlItemCode select x).ToList(); db.WBS_ControlItemProject.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -101,7 +101,7 @@ namespace BLL /// public static void DeleteControlItemProject(string controlItemCode, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemProject controlItem = db.WBS_ControlItemProject.First(e => e.ControlItemCode == controlItemCode && e.ProjectId == projectId); db.WBS_ControlItemProject.DeleteOnSubmit(controlItem); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs index bcbb800..138636e 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs @@ -9,7 +9,7 @@ namespace BLL { public class DivisionProjectService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -66,7 +66,7 @@ namespace BLL /// public static void AddDivisionProject(Model.WBS_DivisionProject divisionProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject(); newDivisionProject.DivisionProjectId = divisionProject.DivisionProjectId; @@ -89,7 +89,7 @@ namespace BLL /// public static void UpdateDivisionProject(Model.WBS_DivisionProject divisionProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_DivisionProject newDivisionProject = db.WBS_DivisionProject.First(e => e.DivisionProjectId == divisionProject.DivisionProjectId); newDivisionProject.DivisionCode = divisionProject.DivisionCode; newDivisionProject.DivisionName = divisionProject.DivisionName; @@ -108,7 +108,7 @@ namespace BLL /// public static void DeleteDivisionProject(string divisionProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_DivisionProject divisionProject = db.WBS_DivisionProject.First(e => e.DivisionProjectId == divisionProjectId); db.WBS_DivisionProject.DeleteOnSubmit(divisionProject); db.SubmitChanges(); @@ -120,7 +120,7 @@ namespace BLL /// public static void DeleteDivisionProjectByUnitWorkId(string unitWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.WBS_DivisionProject where x.UnitWorkId == unitWorkId select x; if (q.Count() > 0) { diff --git a/SGGL/BLL/CQMS/WBS/DivisionService.cs b/SGGL/BLL/CQMS/WBS/DivisionService.cs index 1918d60..61de1fd 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionService.cs @@ -9,7 +9,7 @@ namespace BLL { public class DivisionService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -66,7 +66,7 @@ namespace BLL /// public static void AddDivision(Model.WBS_Division division) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_Division newDivision = new Model.WBS_Division(); newDivision.DivisionId = division.DivisionId; @@ -86,7 +86,7 @@ namespace BLL /// public static void UpdateDivision(Model.WBS_Division division) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_Division newDivision = db.WBS_Division.First(e => e.DivisionId == division.DivisionId); newDivision.DivisionCode = division.DivisionCode; newDivision.DivisionName = division.DivisionName; @@ -104,7 +104,7 @@ namespace BLL /// public static void DeleteDivision(string divisionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_Division division = db.WBS_Division.First(e => e.DivisionId == divisionId); db.WBS_Division.DeleteOnSubmit(division); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/WBS/ProjectQualityService.cs b/SGGL/BLL/CQMS/WBS/ProjectQualityService.cs index 89f7951..ceec855 100644 --- a/SGGL/BLL/CQMS/WBS/ProjectQualityService.cs +++ b/SGGL/BLL/CQMS/WBS/ProjectQualityService.cs @@ -10,7 +10,7 @@ namespace BLL { public class ProjectQualityService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// diff --git a/SGGL/BLL/CQMS/WBS/WBSsearchService.cs b/SGGL/BLL/CQMS/WBS/WBSsearchService.cs index 6e4ad37..a235a27 100644 --- a/SGGL/BLL/CQMS/WBS/WBSsearchService.cs +++ b/SGGL/BLL/CQMS/WBS/WBSsearchService.cs @@ -15,7 +15,7 @@ namespace BLL /// public static List getWBSlistForApi(string projectId, int index, int page, string unitWorkId = "", string ControlItemContent = "", string ControlPoint = "", string ControlItemDef = "", string HGForms = "") { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.View_WBS_ControlItemAndCycle; if (!string.IsNullOrEmpty(projectId) && "undefined" != projectId) @@ -112,7 +112,7 @@ namespace BLL /// public static void AddControlItemInit(Model.WBS_ControlItemInit controlItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemInit newControlItem = new Model.WBS_ControlItemInit(); newControlItem.ControlItemCode = controlItem.ControlItemCode; @@ -136,7 +136,7 @@ namespace BLL /// public static void UpdateControlItemInit(Model.WBS_ControlItemInit controlItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemInit newControlItem = db.WBS_ControlItemInit.First(e => e.ControlItemCode == controlItem.ControlItemCode); newControlItem.WorkPackageCode = controlItem.WorkPackageCode; @@ -158,7 +158,7 @@ namespace BLL /// public static void DeleteControlItemInit(string controlItemCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_ControlItemInit controlItem = db.WBS_ControlItemInit.First(e => e.ControlItemCode == controlItemCode); db.WBS_ControlItemInit.DeleteOnSubmit(controlItem); db.SubmitChanges(); @@ -170,7 +170,7 @@ namespace BLL /// public static void DeleteAllControlItemInit(string workPackageCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List q = (from x in db.WBS_ControlItemInit where x.WorkPackageCode == workPackageCode orderby x.ControlItemCode select x).ToList(); db.WBS_ControlItemInit.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs index a67368d..433113a 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs @@ -15,7 +15,7 @@ namespace BLL /// public static void AddWorkPackageInit(Model.WBS_WorkPackageInit workPack) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackageInit newPack = new Model.WBS_WorkPackageInit(); newPack.WorkPackageCode = workPack.WorkPackageCode; newPack.SuperWorkPack = workPack.SuperWorkPack; @@ -33,7 +33,7 @@ namespace BLL /// public static void UpdateWorkPackageInit(Model.WBS_WorkPackageInit workPack) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackageInit newPack = db.WBS_WorkPackageInit.First(e => e.WorkPackageCode == workPack.WorkPackageCode); newPack.IsChild = workPack.IsChild; newPack.PackageContent = workPack.PackageContent; @@ -47,7 +47,7 @@ namespace BLL /// public static void DeleteWorkPackageInit(string workPackageCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackageInit delWorkPack = db.WBS_WorkPackageInit.First(e => e.WorkPackageCode == workPackageCode); db.WBS_WorkPackageInit.DeleteOnSubmit(delWorkPack); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageProjectService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageProjectService.cs index d0ba508..3ace7a8 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageProjectService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddWorkPackageProject(Model.WBS_WorkPackageProject workPack) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackageProject newPack = new Model.WBS_WorkPackageProject(); newPack.WorkPackageCode = workPack.WorkPackageCode; newPack.ProjectId = workPack.ProjectId; @@ -33,7 +33,7 @@ namespace BLL /// public static void UpdateWorkPackageProject(Model.WBS_WorkPackageProject workPack) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackageProject newPack = db.WBS_WorkPackageProject.First(e => e.WorkPackageCode == workPack.WorkPackageCode); newPack.WorkPackageCode = workPack.WorkPackageCode; newPack.IsChild = workPack.IsChild; @@ -80,7 +80,7 @@ namespace BLL /// public static void DeleteWorkPackageProject(string workPackageCode, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackageProject delWorkPack = db.WBS_WorkPackageProject.First(e => e.WorkPackageCode == workPackageCode && e.ProjectId == projectId); db.WBS_WorkPackageProject.DeleteOnSubmit(delWorkPack); db.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 26d86ff..0691b4a 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddWorkPackage(Model.WBS_WorkPackage WorkPackage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackage newWorkPackage = new Model.WBS_WorkPackage(); newWorkPackage.WorkPackageId = WorkPackage.WorkPackageId; @@ -43,7 +43,7 @@ namespace BLL /// public static void UpdateWorkPackage(Model.WBS_WorkPackage WorkPackage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackage newWorkPackage = db.WBS_WorkPackage.First(e => e.WorkPackageId == WorkPackage.WorkPackageId); newWorkPackage.WorkPackageCode = WorkPackage.WorkPackageCode; newWorkPackage.UnitWorkId = WorkPackage.UnitWorkId; @@ -141,7 +141,7 @@ namespace BLL /// public static void DeleteWorkPackage(string WorkPackageId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WorkPackage WorkPackage = db.WBS_WorkPackage.First(e => e.WorkPackageId == WorkPackageId); db.WBS_WorkPackage.DeleteOnSubmit(WorkPackage); db.SubmitChanges(); @@ -153,7 +153,7 @@ namespace BLL /// public static void DeleteAllWorkPackageByUnitWorkId(string unitWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List q = (from x in db.WBS_WorkPackage where x.UnitWorkId == unitWorkId orderby x.WorkPackageCode select x).ToList(); db.WBS_WorkPackage.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs index 26a4905..f5bacce 100644 --- a/SGGL/BLL/Common/AttachFileService.cs +++ b/SGGL/BLL/Common/AttachFileService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class AttachFileService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 娣诲姞闄勪欢瀛樺偍淇℃伅 @@ -99,7 +99,7 @@ namespace BLL { try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string res = ""; var list = db.AttachFile.Where(p => p.ToKeyId == toKeyId).ToList(); @@ -124,7 +124,7 @@ namespace BLL { try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string res = ""; var list = db.AttachFile.Where(p => p.ToKeyId == toKeyId&& p.MenuId== menuId).ToList(); @@ -289,7 +289,7 @@ namespace BLL fileDir = "Solution"; break; } - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var query = from f in db.AttachFile where f.ToKeyId == toKeyId @@ -317,7 +317,7 @@ namespace BLL } else { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var query = from f in db.AttachFile where f.ToKeyId == toKeyId diff --git a/SGGL/BLL/Common/CodeRecordsService.cs b/SGGL/BLL/Common/CodeRecordsService.cs index 753b24b..cc2485c 100644 --- a/SGGL/BLL/Common/CodeRecordsService.cs +++ b/SGGL/BLL/Common/CodeRecordsService.cs @@ -54,7 +54,7 @@ namespace BLL /// public static string ReturnCodeByMenuIdProjectId(string menuId, string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string code = string.Empty; string ruleCodes = string.Empty; diff --git a/SGGL/BLL/Common/CommonService.cs b/SGGL/BLL/Common/CommonService.cs index a39e0d2..e86432e 100644 --- a/SGGL/BLL/Common/CommonService.cs +++ b/SGGL/BLL/Common/CommonService.cs @@ -17,7 +17,7 @@ namespace BLL /// 鏄惁鍏锋湁鏉冮檺 public static List GetSystemPowerList(string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getUser = db.Sys_User.FirstOrDefault(x => x.UserId == userId); if (getUser != null) @@ -100,7 +100,7 @@ namespace BLL /// 鏄惁鍏锋湁鏉冮檺 public static List GetAllMenuList(string projectId, string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { /// 鍚敤涓旀湯绾ц彍鍗 var getMenus = from x in db.Sys_Menu @@ -193,7 +193,7 @@ namespace BLL /// 鏄惁鍏锋湁鏉冮檺 public static List GetAllButtonList(string projectId, string userId, string menuId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List buttonList = new List(); try { @@ -264,7 +264,7 @@ namespace BLL /// 鏄惁鍏锋湁鏉冮檺 public static bool GetAllButtonPowerList(string projectId, string userId, string menuId, string buttonName) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; bool isPower = false; ////瀹氫箟鏄惁鍏峰鎸夐挳鏉冮檺 if (userId == Const.sedinId) { @@ -384,7 +384,7 @@ namespace BLL /// public static bool IsHaveSystemPower(string userId,string menuType, string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { bool isHave = false; var getUser = db.Sys_User.FirstOrDefault(x => x.UserId == userId); @@ -447,7 +447,7 @@ namespace BLL /// public static void DeleteAttachFileById(string menuId, string id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.AttachFile attachFile = db.AttachFile.FirstOrDefault(e => e.MenuId == menuId && e.ToKeyId == id); if (attachFile != null) { @@ -469,7 +469,7 @@ namespace BLL /// public static void DeleteFlowOperateByID(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var flowOperateList = from x in db.Sys_FlowOperate where x.DataId == id select x; if (flowOperateList.Count() > 0) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index f25882e..bc6b0b0 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -1352,6 +1352,10 @@ namespace BLL /*椤圭洰*/ /// + /// 鍛樺伐 + /// + public const string Menu_Staff = "Menu_Staff"; + /// /// 椤圭洰璁剧疆 /// public const string Menu_ProjectSet = "Menu_ProjectSet"; diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 4797d79..c540896 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -20,7 +20,7 @@ namespace BLL /// /// 维护一个DB集合 /// - private static Dictionary dataBaseLinkList = new System.Collections.Generic.Dictionary(); + private static Dictionary dataBaseLinkList = new System.Collections.Generic.Dictionary(); public static IScheduler ScheduledTasks { get; @@ -30,7 +30,7 @@ namespace BLL /// /// 维护一个DB集合 /// - public static System.Collections.Generic.Dictionary DBList + public static System.Collections.Generic.Dictionary DBList { get { @@ -130,7 +130,7 @@ namespace BLL /// /// 数据库上下文。 /// - public static SGGLDB DB + public static CNPCDB DB { get { @@ -139,7 +139,7 @@ namespace BLL { if (!DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId)) { - DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, new SGGLDB(connString)); + DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, new CNPCDB(connString)); } // DBList[System.Threading.Thread.CurrentThread.ManagedThreadId].CommandTimeout = 1200; @@ -147,7 +147,7 @@ namespace BLL } catch { - var db = new SGGLDB(connString); + var db = new CNPCDB(connString); if (DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId)) { DBList[System.Threading.Thread.CurrentThread.ManagedThreadId] = db; diff --git a/SGGL/BLL/Common/PrinterDocService.cs b/SGGL/BLL/Common/PrinterDocService.cs index 0492ddc..062d880 100644 --- a/SGGL/BLL/Common/PrinterDocService.cs +++ b/SGGL/BLL/Common/PrinterDocService.cs @@ -1401,7 +1401,7 @@ /// public static string GetTestRecordHtml(string testRecordId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; StringBuilder sb = new StringBuilder(); var getTestRecord = TestRecordService.GetTestRecordById(testRecordId); if (getTestRecord != null) @@ -1605,7 +1605,7 @@ /// public static string GetSendCardHtml(string personIds) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; StringBuilder sb = new StringBuilder(); sb.Append(""); sb.Append(""); diff --git a/SGGL/BLL/Common/ProjectDataFlowSetService.cs b/SGGL/BLL/Common/ProjectDataFlowSetService.cs index 564cb2d..41243d7 100644 --- a/SGGL/BLL/Common/ProjectDataFlowSetService.cs +++ b/SGGL/BLL/Common/ProjectDataFlowSetService.cs @@ -9,7 +9,7 @@ /// public static class ProjectDataFlowSetService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 /// @@ -85,7 +85,7 @@ /// public static void AddProjectData_FlowOperate(Model.ProjectData_FlowOperate flowSet) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_FlowOperate newFlowOperate =new Model.ProjectData_FlowOperate { FlowOperateId = SQLHelper.GetNewID(typeof(Model.ProjectData_FlowOperate)), @@ -109,7 +109,7 @@ /// public static void DeleteFlowSetByFlowSetId(string flowSetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_FlowOperate flowSet = db.ProjectData_FlowOperate.FirstOrDefault(e => e.FlowOperateId == flowSetId); if (flowSet != null) { @@ -124,7 +124,7 @@ /// public static void DeleteFlowSetByDataId(string dataId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var flowSets = from x in db.ProjectData_FlowOperate where x.DataId == dataId select x; if (flowSets.Count() > 0) { @@ -169,7 +169,7 @@ /// public static void UpdateFlowOperateOpinion(Model.ProjectData_FlowOperate flowOperate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var upFlowOperate = from x in db.ProjectData_FlowOperate where x.MenuId == flowOperate.MenuId && x.DataId == flowOperate.DataId && (x.IsClosed == false || !x.IsClosed.HasValue) select x; @@ -307,7 +307,7 @@ /// public static Model.ProjectData_FlowOperate GetFlowOperateOpinion(string menuId, string dataId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.ProjectData_FlowOperate where x.MenuId == menuId && x.DataId == dataId && (x.IsClosed == false || !x.IsClosed.HasValue) select x).FirstOrDefault(); diff --git a/SGGL/BLL/Common/UserShowColumnsService.cs b/SGGL/BLL/Common/UserShowColumnsService.cs index 1a31a19..64cf8d4 100644 --- a/SGGL/BLL/Common/UserShowColumnsService.cs +++ b/SGGL/BLL/Common/UserShowColumnsService.cs @@ -21,7 +21,7 @@ namespace BLL /// public static void AddUserShowColumns(Model.Sys_UserShowColumns showColumns) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_UserShowColumns newShowColumns = new Model.Sys_UserShowColumns(); newShowColumns.ShowColumnId = SQLHelper.GetNewID(typeof(Model.Sys_UserShowColumns)); @@ -40,7 +40,7 @@ namespace BLL /// public static void UpdateUserShowColumns(Model.Sys_UserShowColumns showColumns) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_UserShowColumns newShowColumns = db.Sys_UserShowColumns.First(e => e.ShowColumnId == showColumns.ShowColumnId); newShowColumns.Columns = showColumns.Columns; newShowColumns.ShowType = showColumns.ShowType; @@ -53,7 +53,7 @@ namespace BLL /// public static void DeleteUserShowColumns(string showColumnId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_UserShowColumns newShowColumns = db.Sys_UserShowColumns.First(e => e.ShowColumnId == showColumnId); db.Sys_UserShowColumns.DeleteOnSubmit(newShowColumns); db.SubmitChanges(); diff --git a/SGGL/BLL/Common/WeatherService.cs b/SGGL/BLL/Common/WeatherService.cs index 27c51b1..df9d933 100644 --- a/SGGL/BLL/Common/WeatherService.cs +++ b/SGGL/BLL/Common/WeatherService.cs @@ -9,10 +9,10 @@ namespace BLL /// public class WeatherService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// - /// 鏍规嵁涓婚敭鑾峰彇SGGLDB + /// 鏍规嵁涓婚敭鑾峰彇CNPCDB /// /// /// @@ -27,7 +27,7 @@ namespace BLL /// public static void AddWeather(Model.Weather weather) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Weather newWeather = new Model.Weather { @@ -49,7 +49,7 @@ namespace BLL /// public static void DeleteWeatherById(string weatherId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weather weather = db.Weather.FirstOrDefault(e => e.WeatherId == weatherId); if (weather != null) { @@ -65,7 +65,7 @@ namespace BLL { try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Weather getWeather = new Model.Weather(); string appkey = "7416f4dd68c9352e02be31b12f15d74f"; //閰嶇疆鎮ㄧ敵璇风殑appkey diff --git a/SGGL/BLL/DigData/HSEDataCollectService.cs b/SGGL/BLL/DigData/HSEDataCollectService.cs index 98277c4..e9fe74e 100644 --- a/SGGL/BLL/DigData/HSEDataCollectService.cs +++ b/SGGL/BLL/DigData/HSEDataCollectService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HSEDataCollectService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰HSE鏁版嵁姹囨 @@ -39,7 +39,7 @@ namespace BLL /// public static string CreateHSEDataCollectByYear(int year) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string returnHSEDataCollectId = SQLHelper.GetNewID(); Model.DigData_HSEDataCollect newHSEDataCollect = new Model.DigData_HSEDataCollect { @@ -187,7 +187,7 @@ namespace BLL /// public static void SaveHSEDataCollectItem(Model.SeDin_MonthReport monthReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string getHSEDataCollectId = string.Empty; var getHSEDataCollect = GetHSEDataCollectByYear(monthReport.ReporMonth.Value.Year); if (getHSEDataCollect != null) @@ -4546,7 +4546,7 @@ namespace BLL /// public static void DeleteHSEDataCollectItem(Model.SeDin_MonthReport monthReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string getHSEDataCollectId = string.Empty; var getHSEDataCollect = GetHSEDataCollectByYear(monthReport.ReporMonth.Value.Year); if (getHSEDataCollect != null) diff --git a/SGGL/BLL/DoorServer/DoorServerService.cs b/SGGL/BLL/DoorServer/DoorServerService.cs index b4656d3..063959b 100644 --- a/SGGL/BLL/DoorServer/DoorServerService.cs +++ b/SGGL/BLL/DoorServer/DoorServerService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class DoorServerService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浜嬫晠绫诲瀷 @@ -347,7 +347,7 @@ namespace BLL { if (drecord.DateTimeRecord.HasValue) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.T_d_EmployInOutRecord newInOutRecord = new Model.T_d_EmployInOutRecord { diff --git a/SGGL/BLL/ErrLogInfo.cs b/SGGL/BLL/ErrLogInfo.cs index faecb85..eb6daee 100644 --- a/SGGL/BLL/ErrLogInfo.cs +++ b/SGGL/BLL/ErrLogInfo.cs @@ -33,7 +33,7 @@ namespace BLL StringBuilder errLog = new StringBuilder(); if (ex != null) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Exception innerEx = ex.InnerException; errLog.Append("\r\n"); @@ -170,7 +170,7 @@ namespace BLL StringBuilder errLog = new StringBuilder(); if (ex != null) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Exception innerEx = ex.InnerException; errLog.Append("\r\n"); diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_ComponentsService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_ComponentsService.cs index 4346bc2..b8a7be7 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_ComponentsService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_ComponentsService.cs @@ -21,7 +21,7 @@ /// public static void AddComponents(Model.Base_Components components) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Components newComponents = new Base_Components { ComponentsId = components.ComponentsId, @@ -40,7 +40,7 @@ /// public static void UpdateComponents(Model.Base_Components components) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Components newComponents = db.Base_Components.FirstOrDefault(e => e.ComponentsId == components.ComponentsId); if (newComponents != null) { @@ -58,7 +58,7 @@ /// public static void DeleteComponentsByComponentsId(string componentsId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Components delComponents = db.Base_Components.FirstOrDefault(e => e.ComponentsId == componentsId); if (delComponents != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_ConsumablesService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_ConsumablesService.cs index 96cb874..d2ee380 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_ConsumablesService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_ConsumablesService.cs @@ -21,7 +21,7 @@ /// public static void AddConsumables(Model.Base_Consumables consumables) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Consumables newConsumables = new Base_Consumables { ConsumablesId = consumables.ConsumablesId, @@ -47,7 +47,7 @@ /// public static void UpdateConsumables(Model.Base_Consumables consumables) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Consumables newConsumables = db.Base_Consumables.FirstOrDefault(e => e.ConsumablesId == consumables.ConsumablesId); if (newConsumables != null) { @@ -71,7 +71,7 @@ /// public static void DeleteConsumablesByConsumablesId(string consumablesId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Consumables delConsumables = db.Base_Consumables.FirstOrDefault(e => e.ConsumablesId == consumablesId); if (delConsumables != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs index 2952371..87f39e2 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs @@ -21,7 +21,7 @@ namespace BLL /// public static void AddDNCompare(Model.Base_DNCompare dNCompare) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DNCompare newDNCompare = new Base_DNCompare { DNCompareId = dNCompare.DNCompareId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateDNCompare(Model.Base_DNCompare dNCompare) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DNCompare newDNCompare = db.Base_DNCompare.FirstOrDefault(e => e.DNCompareId == dNCompare.DNCompareId); if (newDNCompare != null) { @@ -91,7 +91,7 @@ namespace BLL /// public static void DeleteDNCompareByDNCompareId(string dNCompareId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DNCompare delDNCompare = db.Base_DNCompare.FirstOrDefault(e => e.DNCompareId == dNCompareId); if (delDNCompare != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_DefectService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_DefectService.cs index b73acd9..a3b46de 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_DefectService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_DefectService.cs @@ -117,7 +117,7 @@ namespace BLL /// public static void AddDefect(Model.Base_Defect defect) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Defect newDefect = new Base_Defect { DefectId = defect.DefectId, @@ -134,7 +134,7 @@ namespace BLL /// public static void UpdateDefect(Model.Base_Defect defect) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Defect newDefect = db.Base_Defect.FirstOrDefault(e => e.DefectId == defect.DefectId); if (newDefect != null) { @@ -150,7 +150,7 @@ namespace BLL /// public static void DeleteDefectByDefectId(string defectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Defect delDefect = db.Base_Defect.FirstOrDefault(e => e.DefectId.ToString() == defectId); if (delDefect != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_DetectionRateService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_DetectionRateService.cs index 3473eca..15a4901 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_DetectionRateService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_DetectionRateService.cs @@ -22,7 +22,7 @@ /// public static void AddDetectionRate(Model.Base_DetectionRate detectionRate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DetectionRate newDetectionRate = new Base_DetectionRate { DetectionRateId = detectionRate.DetectionRateId, @@ -42,7 +42,7 @@ /// public static void UpdateDetectionRate(Model.Base_DetectionRate detectionRate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DetectionRate newDetectionRate = db.Base_DetectionRate.FirstOrDefault(e => e.DetectionRateId == detectionRate.DetectionRateId); if (newDetectionRate != null) { @@ -60,7 +60,7 @@ /// public static void DeleteDetectionRateByDetectionRateId(string detectionRateId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DetectionRate delDetectionRate = db.Base_DetectionRate.FirstOrDefault(e => e.DetectionRateId == detectionRateId); if (delDetectionRate != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs index 84815eb..2d01620 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs @@ -30,7 +30,7 @@ /// public static void AddDetectionType(Model.Base_DetectionType detectionType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DetectionType newDetectionType = new Base_DetectionType { DetectionTypeId = detectionType.DetectionTypeId, @@ -53,7 +53,7 @@ /// public static void UpdateDetectionType(Model.Base_DetectionType detectionType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DetectionType newDetectionType = db.Base_DetectionType.FirstOrDefault(e => e.DetectionTypeId == detectionType.DetectionTypeId); if (newDetectionType != null) { @@ -74,7 +74,7 @@ /// public static void DeleteDetectionTypeByDetectionTypeId(string detectionTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_DetectionType delDetectionType = db.Base_DetectionType.FirstOrDefault(e => e.DetectionTypeId == detectionTypeId); if (delDetectionType != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_GrooveTypeService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_GrooveTypeService.cs index 0ee4aeb..1d8f5dd 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_GrooveTypeService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_GrooveTypeService.cs @@ -21,7 +21,7 @@ /// public static void AddGrooveType(Model.Base_GrooveType grooveType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_GrooveType newGrooveType = new Base_GrooveType { GrooveTypeId = grooveType.GrooveTypeId, @@ -40,7 +40,7 @@ /// public static void UpdateGrooveType(Model.Base_GrooveType grooveType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_GrooveType newGrooveType = db.Base_GrooveType.FirstOrDefault(e => e.GrooveTypeId == grooveType.GrooveTypeId); if (newGrooveType != null) { @@ -57,7 +57,7 @@ /// public static void DeleteGrooveTypeByGrooveTypeId(string grooveTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_GrooveType delGrooveType = db.Base_GrooveType.FirstOrDefault(e => e.GrooveTypeId == grooveTypeId); if (delGrooveType != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_MaterialService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_MaterialService.cs index e1c3c4a..685173a 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_MaterialService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_MaterialService.cs @@ -22,7 +22,7 @@ namespace BLL /// public static void AddMaterial(Model.Base_Material material) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Material newMaterial = new Base_Material { MaterialId = material.MaterialId, @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdateMaterial(Model.Base_Material material) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Material newMaterial = db.Base_Material.FirstOrDefault(e => e.MaterialId == material.MaterialId); if (newMaterial != null) { @@ -65,7 +65,7 @@ namespace BLL /// public static void DeleteMaterialByMaterialId(string materialId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Material delMaterial = db.Base_Material.FirstOrDefault(e => e.MaterialId == materialId); if (delMaterial != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_MaterialTypeService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_MaterialTypeService.cs index c453ba4..130e0d1 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_MaterialTypeService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_MaterialTypeService.cs @@ -22,7 +22,7 @@ namespace BLL /// public static void AddMaterial(Model.Base_MaterialType material) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_MaterialType newMaterial = new Base_MaterialType { MaterialTypeId = material.MaterialTypeId, @@ -40,7 +40,7 @@ namespace BLL /// public static void UpdateMaterial(Model.Base_MaterialType material) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_MaterialType newMaterial = db.Base_MaterialType.FirstOrDefault(e => e.MaterialTypeId == material.MaterialTypeId); if (newMaterial != null) { @@ -58,7 +58,7 @@ namespace BLL /// public static void DeleteMaterialByMaterialId(string MaterialTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_MaterialType delMaterial = db.Base_MaterialType.FirstOrDefault(e => e.MaterialTypeId == MaterialTypeId); if (delMaterial != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_MediumService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_MediumService.cs index 134bb7d..3019916 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_MediumService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_MediumService.cs @@ -22,7 +22,7 @@ namespace BLL /// public static void AddMedium(Model.Base_Medium medium) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Medium newMedium = new Base_Medium { MediumId = medium.MediumId, @@ -43,7 +43,7 @@ namespace BLL /// public static void UpdateMedium(Model.Base_Medium medium) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Medium newMedium = db.Base_Medium.FirstOrDefault(e => e.MediumId == medium.MediumId); if (newMedium != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteMediumByMediumId(string mediumId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Medium delMedium = db.Base_Medium.FirstOrDefault(e => e.MediumId == mediumId); if (delMedium != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_PipingClassService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_PipingClassService.cs index 133e6ad..f198121 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_PipingClassService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_PipingClassService.cs @@ -21,7 +21,7 @@ /// public static void AddPipingClass(Model.Base_PipingClass pipingClass) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PipingClass newPipingClass = new Base_PipingClass { PipingClassId = pipingClass.PipingClassId, @@ -42,7 +42,7 @@ /// public static void UpdatePipingClass(Model.Base_PipingClass pipingClass) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PipingClass newPipingClass = db.Base_PipingClass.FirstOrDefault(e => e.PipingClassId == pipingClass.PipingClassId); if (newPipingClass != null) { @@ -62,7 +62,7 @@ /// public static void DeletePipingClassByPipingClassId(string pipingClassId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PipingClass delPipingClass = db.Base_PipingClass.FirstOrDefault(e => e.PipingClassId == pipingClassId); if (delPipingClass != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_PressurePipingClassService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_PressurePipingClassService.cs index 122be23..de0e4f3 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_PressurePipingClassService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_PressurePipingClassService.cs @@ -21,7 +21,7 @@ /// public static void AddPressurePipingClass(Model.Base_PressurePipingClass pipingClass) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PressurePipingClass newPipingClass = new Base_PressurePipingClass { PressurePipingClassId = pipingClass.PressurePipingClassId, @@ -40,7 +40,7 @@ /// public static void UpdatePressurePipingClass(Model.Base_PressurePipingClass pipingClass) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PressurePipingClass newPipingClass = db.Base_PressurePipingClass.FirstOrDefault(e => e.PressurePipingClassId == pipingClass.PressurePipingClassId); if (newPipingClass != null) { @@ -57,7 +57,7 @@ /// public static void DeletePressurePipingClass(string pipingClassId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PressurePipingClass del = db.Base_PressurePipingClass.FirstOrDefault(e => e.PressurePipingClassId == pipingClassId); if (del != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_PressureService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_PressureService.cs index c611a10..9d25026 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_PressureService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_PressureService.cs @@ -21,7 +21,7 @@ namespace BLL /// public static void AddPressure(Model.Base_Pressure pressure) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Pressure newPressure = new Base_Pressure { PressureId = pressure.PressureId, @@ -39,7 +39,7 @@ namespace BLL /// public static void UpdatePressure(Model.Base_Pressure pressure) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Pressure newPressure = db.Base_Pressure.FirstOrDefault(e => e.PressureId == pressure.PressureId); if (newPressure != null) { @@ -56,7 +56,7 @@ namespace BLL /// public static void DeletePressureByPressureId(string pressureId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Pressure delPressure = db.Base_Pressure.FirstOrDefault(e => e.PressureId == pressureId); if (delPressure != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_PurgeMethodService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_PurgeMethodService.cs index c78869f..667c2aa 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_PurgeMethodService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_PurgeMethodService.cs @@ -22,7 +22,7 @@ /// public static void AddPurgeMethod(Model.Base_PurgeMethod purgeMethod) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PurgeMethod newPurgeMethod = new Base_PurgeMethod { PurgeMethodId = purgeMethod.PurgeMethodId, @@ -41,7 +41,7 @@ /// public static void UpdatePurgeMethod(Model.Base_PurgeMethod purgeMethod) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PurgeMethod newPurgeMethod = db.Base_PurgeMethod.FirstOrDefault(e => e.PurgeMethodId == purgeMethod.PurgeMethodId); if (newPurgeMethod != null) { @@ -58,7 +58,7 @@ /// public static void DeletePurgeMethod(string purgeMethodId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_PurgeMethod del = db.Base_PurgeMethod.FirstOrDefault(e => e.PurgeMethodId == purgeMethodId); if (del != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_TestMediumService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_TestMediumService.cs index 6d48a64..673cd2b 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_TestMediumService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_TestMediumService.cs @@ -22,7 +22,7 @@ namespace BLL /// public static void AddTestMedium(Model.Base_TestMedium medium) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TestMedium newMedium = new Base_TestMedium { TestMediumId = medium.TestMediumId, @@ -41,7 +41,7 @@ namespace BLL /// public static void UpdateTestMedium(Model.Base_TestMedium medium) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TestMedium newMedium = db.Base_TestMedium.FirstOrDefault(e => e.TestMediumId == medium.TestMediumId); if (newMedium != null) { @@ -59,7 +59,7 @@ namespace BLL /// public static void DeleteTestMediumByMediumId(string mediumId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_TestMedium delMedium = db.Base_TestMedium.FirstOrDefault(e => e.TestMediumId == mediumId); if (delMedium != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_WeldTypeService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_WeldTypeService.cs index bdb92e7..2e09fc9 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_WeldTypeService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_WeldTypeService.cs @@ -20,7 +20,7 @@ /// public static void AddWeldType(Model.Base_WeldType weldType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldType newWeldType = new Base_WeldType { WeldTypeId = weldType.WeldTypeId, @@ -40,7 +40,7 @@ /// public static void UpdateWeldType(Model.Base_WeldType weldType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldType newWeldType = db.Base_WeldType.FirstOrDefault(e => e.WeldTypeId == weldType.WeldTypeId); if (newWeldType != null) { @@ -59,7 +59,7 @@ /// public static void DeleteWeldTypeByWeldTypeId(string weldTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldType delWeldType = db.Base_WeldType.FirstOrDefault(e => e.WeldTypeId == weldTypeId); if (delWeldType != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_WeldingLocationServie.cs b/SGGL/BLL/HJGL/BaseInfo/Base_WeldingLocationServie.cs index 5fffb87..2c4bb11 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_WeldingLocationServie.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_WeldingLocationServie.cs @@ -24,7 +24,7 @@ namespace BLL /// public static void AddWeldingLocation(Model.Base_WeldingLocation weldingLocation) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldingLocation newWeldingLocation = new Model.Base_WeldingLocation(); newWeldingLocation.WeldingLocationId = weldingLocation.WeldingLocationId; newWeldingLocation.WeldingLocationCode = weldingLocation.WeldingLocationCode; @@ -40,7 +40,7 @@ namespace BLL /// public static void UpdateWeldingLocation(Model.Base_WeldingLocation weldingLocation) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldingLocation newWeldingLocation = db.Base_WeldingLocation.FirstOrDefault(e => e.WeldingLocationId == weldingLocation.WeldingLocationId); if (newWeldingLocation != null) { @@ -57,7 +57,7 @@ namespace BLL /// public static void DeleteWeldingLocationById(string weldingLocationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldingLocation weldingLocation = db.Base_WeldingLocation.FirstOrDefault(e => e.WeldingLocationId == weldingLocationId); if (weldingLocation != null) { diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_WeldingMethodService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_WeldingMethodService.cs index ebf5d0d..705ef04 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_WeldingMethodService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_WeldingMethodService.cs @@ -21,7 +21,7 @@ /// public static void AddWeldingMethod(Model.Base_WeldingMethod weldingMethod) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldingMethod newWeldingMethod = new Base_WeldingMethod { WeldingMethodId = weldingMethod.WeldingMethodId, @@ -40,7 +40,7 @@ /// public static void UpdateWeldingMethod(Model.Base_WeldingMethod weldingMethod) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldingMethod newWeldingMethod = db.Base_WeldingMethod.FirstOrDefault(e => e.WeldingMethodId == weldingMethod.WeldingMethodId); if (newWeldingMethod != null) { @@ -58,7 +58,7 @@ /// public static void DeleteWeldingMethodByWeldingMethodId(string weldingMethodId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_WeldingMethod delWeldingMethod = db.Base_WeldingMethod.FirstOrDefault(e => e.WeldingMethodId == weldingMethodId); if (delWeldingMethod != null) { diff --git a/SGGL/BLL/HJGL/CheckManage/CheckManageImportTempService.cs b/SGGL/BLL/HJGL/CheckManage/CheckManageImportTempService.cs index 9a529e6..09166d3 100644 --- a/SGGL/BLL/HJGL/CheckManage/CheckManageImportTempService.cs +++ b/SGGL/BLL/HJGL/CheckManage/CheckManageImportTempService.cs @@ -27,7 +27,7 @@ namespace BLL /// 濮旀墭瀹炰綋 public static void AddDataInTemp(Model.HJGL_CheckImportTemp dataInTemp) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_CheckImportTemp newDataInTemp = new Model.HJGL_CheckImportTemp(); newDataInTemp.TempId = dataInTemp.TempId; newDataInTemp.ProjectId = dataInTemp.ProjectId; @@ -90,7 +90,7 @@ namespace BLL public static void AddDataInTemp(List dataInTemps) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; foreach (var dataInTemp in dataInTemps) { Model.HJGL_CheckImportTemp newDataInTemp = new Model.HJGL_CheckImportTemp(); @@ -161,7 +161,7 @@ namespace BLL /// 鐒婃帴瀹炰綋 public static void UpdateDataInTemp(Model.HJGL_CheckImportTemp dataInTemp) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_CheckImportTemp newDataInTemp = db.HJGL_CheckImportTemp.FirstOrDefault(e => e.TempId == dataInTemp.TempId); if (newDataInTemp != null) { @@ -224,7 +224,7 @@ namespace BLL /// 濮旀墭涓婚敭 public static void DeleteDataInTempByDataInTempID(string tempId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_CheckImportTemp dataInTemp = db.HJGL_CheckImportTemp.FirstOrDefault(e => e.TempId == tempId); if (dataInTemp != null) { @@ -240,7 +240,7 @@ namespace BLL /// public static void DeleteDataInTempByProjectIdUserId(string projectId, string userId ) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var dataInTemp = from x in db.HJGL_CheckImportTemp where x.ProjectId == projectId && x.UserId == userId select x; if (dataInTemp.Count() > 0) { diff --git a/SGGL/BLL/HJGL/DataIn/DataInTempService.cs b/SGGL/BLL/HJGL/DataIn/DataInTempService.cs index 82a6fac..67aa526 100644 --- a/SGGL/BLL/HJGL/DataIn/DataInTempService.cs +++ b/SGGL/BLL/HJGL/DataIn/DataInTempService.cs @@ -27,7 +27,7 @@ namespace BLL /// 濮旀墭瀹炰綋 public static void AddDataInTemp(Model.Sys_DataInTemp dataInTemp) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp(); newDataInTemp.TempId = dataInTemp.TempId; newDataInTemp.ProjectId = dataInTemp.ProjectId; @@ -90,7 +90,7 @@ namespace BLL public static void AddDataInTemp(List dataInTemps) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; foreach (var dataInTemp in dataInTemps) { Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp(); @@ -161,7 +161,7 @@ namespace BLL /// 鐒婃帴瀹炰綋 public static void UpdateDataInTemp(Model.Sys_DataInTemp dataInTemp) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_DataInTemp newDataInTemp = db.Sys_DataInTemp.FirstOrDefault(e => e.TempId == dataInTemp.TempId); if (newDataInTemp != null) { @@ -224,7 +224,7 @@ namespace BLL /// 濮旀墭涓婚敭 public static void DeleteDataInTempByDataInTempID(string tempId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_DataInTemp dataInTemp = db.Sys_DataInTemp.FirstOrDefault(e => e.TempId == tempId); if (dataInTemp != null) { @@ -240,7 +240,7 @@ namespace BLL /// public static void DeleteDataInTempByProjectIdUserId(string projectId, string userId, string type) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var dataInTemp = from x in db.Sys_DataInTemp where x.ProjectId == projectId && x.UserId == userId && x.Type == type select x; if (dataInTemp.Count() > 0) { diff --git a/SGGL/BLL/HJGL/HotProcessHard/Hard_ReportService.cs b/SGGL/BLL/HJGL/HotProcessHard/Hard_ReportService.cs index 6eb2a4b..c050c7b 100644 --- a/SGGL/BLL/HJGL/HotProcessHard/Hard_ReportService.cs +++ b/SGGL/BLL/HJGL/HotProcessHard/Hard_ReportService.cs @@ -33,7 +33,7 @@ namespace BLL /// public static void AddHard_Report(Model.HJGL_Hard_Report setHardReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Hard_Report newHardReport = new HJGL_Hard_Report { HardReportId = setHardReport.HardReportId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateHard_Report(Model.HJGL_Hard_Report updateHardReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Hard_Report newHardReport = db.HJGL_Hard_Report.FirstOrDefault(e => e.HardReportId == updateHardReport.HardReportId); if (newHardReport != null) { @@ -79,7 +79,7 @@ namespace BLL /// 瑁呯疆ID public static void DeleteHard_ReportByHardReportId(string strHardReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Hard_Report delHardReport = db.HJGL_Hard_Report.FirstOrDefault(e => e.HardReportId == strHardReportId); if (delHardReport != null) { @@ -94,7 +94,7 @@ namespace BLL /// 瑁呯疆ID public static void DeleteHard_ReportsByHardTrustItemID(string strHardTrustItemID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var delHardReports = from x in db.HJGL_Hard_Report where x.HardTrustItemID == strHardTrustItemID select x; if (delHardReports.Count() >0) { diff --git a/SGGL/BLL/HJGL/HotProcessHard/Hard_TrustItemService.cs b/SGGL/BLL/HJGL/HotProcessHard/Hard_TrustItemService.cs index c3bde75..251d416 100644 --- a/SGGL/BLL/HJGL/HotProcessHard/Hard_TrustItemService.cs +++ b/SGGL/BLL/HJGL/HotProcessHard/Hard_TrustItemService.cs @@ -46,7 +46,7 @@ namespace BLL /// public static void AddHardTrustItem(Model.HJGL_Hard_TrustItem hardTrustItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Hard_TrustItem newHardTrustItem = new Model.HJGL_Hard_TrustItem(); newHardTrustItem.HardTrustItemID = SQLHelper.GetNewID(typeof(Model.HJGL_Hard_TrustItem)); newHardTrustItem.HardTrustID = hardTrustItem.HardTrustID; @@ -64,7 +64,7 @@ namespace BLL /// public static void UpdateHardTrustItem(Model.HJGL_Hard_TrustItem hardTrustItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Hard_TrustItem newHardTrustItem = db.HJGL_Hard_TrustItem.FirstOrDefault(e => e.HardTrustItemID == hardTrustItem.HardTrustItemID); if (newHardTrustItem != null) { @@ -80,7 +80,7 @@ namespace BLL /// public static void DeleteHardTrustItemByHardTrustItemID(string hardTrustItemID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var hardTrustItem = (from x in db.HJGL_Hard_TrustItem where x.HardTrustItemID == hardTrustItemID select x).FirstOrDefault(); if (hardTrustItem != null) { @@ -95,7 +95,7 @@ namespace BLL /// public static void DeleteHardTrustItemById(string hardTrustId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var hardTrustItem = (from x in db.HJGL_Hard_TrustItem where x.HardTrustID == hardTrustId select x).ToList(); if (hardTrustItem != null) { diff --git a/SGGL/BLL/HJGL/HotProcessHard/Hard_TrustService.cs b/SGGL/BLL/HJGL/HotProcessHard/Hard_TrustService.cs index 626280c..75eb0ae 100644 --- a/SGGL/BLL/HJGL/HotProcessHard/Hard_TrustService.cs +++ b/SGGL/BLL/HJGL/HotProcessHard/Hard_TrustService.cs @@ -26,7 +26,7 @@ namespace BLL /// public static void AddHardTrust(Model.HJGL_Hard_Trust hardTrust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Hard_Trust newHardTrust = new Model.HJGL_Hard_Trust(); newHardTrust.HardTrustID = hardTrust.HardTrustID; newHardTrust.HardTrustNo = hardTrust.HardTrustNo; @@ -60,7 +60,7 @@ namespace BLL /// public static void UpdateHardTrust(Model.HJGL_Hard_Trust hardTrust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Hard_Trust newHardTrust = db.HJGL_Hard_Trust.FirstOrDefault(e => e.HardTrustID == hardTrust.HardTrustID); if (newHardTrust != null) { @@ -93,7 +93,7 @@ namespace BLL /// public static void DeleteHardTrustById(string hardTrustID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Hard_Trust hardTrust = db.HJGL_Hard_Trust.FirstOrDefault(e => e.HardTrustID == hardTrustID); if (hardTrust != null) { diff --git a/SGGL/BLL/HJGL/HotProcessHard/HotProessReportService.cs b/SGGL/BLL/HJGL/HotProcessHard/HotProessReportService.cs index e18e53d..aab79e2 100644 --- a/SGGL/BLL/HJGL/HotProcessHard/HotProessReportService.cs +++ b/SGGL/BLL/HJGL/HotProcessHard/HotProessReportService.cs @@ -27,7 +27,7 @@ namespace BLL /// public static void AddHotProessReport(Model.HJGL_HotProess_Report hotProessReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_Report newHotProessReport = new Model.HJGL_HotProess_Report(); newHotProessReport.HotProessReportId = hotProessReport.HotProessReportId; newHotProessReport.HotProessTrustItemId = hotProessReport.HotProessTrustItemId; @@ -49,7 +49,7 @@ namespace BLL /// public static void UpdateHotProessReport(Model.HJGL_HotProess_Report hotProessReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_Report newHotProessReport = db.HJGL_HotProess_Report.FirstOrDefault(e => e.HotProessReportId == hotProessReport.HotProessReportId); if (newHotProessReport != null) { @@ -70,7 +70,7 @@ namespace BLL /// public static void DeleteHotProessReportById(string hotProessReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_Report hotProessReport = db.HJGL_HotProess_Report.FirstOrDefault(e => e.HotProessReportId == hotProessReportId); if (hotProessReport != null) { @@ -84,7 +84,7 @@ namespace BLL /// public static void DeleteAllHotProessReportById(string hotProessTrustItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var hotProessReport = from x in Funs.DB.HJGL_HotProess_Report where x.HotProessTrustItemId == hotProessTrustItemId select x; if (hotProessReport.ToList().Count>0) { diff --git a/SGGL/BLL/HJGL/HotProcessHard/HotProessTrustItemService.cs b/SGGL/BLL/HJGL/HotProcessHard/HotProessTrustItemService.cs index 058f46d..59807fa 100644 --- a/SGGL/BLL/HJGL/HotProcessHard/HotProessTrustItemService.cs +++ b/SGGL/BLL/HJGL/HotProcessHard/HotProessTrustItemService.cs @@ -36,7 +36,7 @@ namespace BLL /// public static void AddHotProessTrustItem(Model.HJGL_HotProess_TrustItem hotProessTrustItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_TrustItem newHotProessTrustItem = new Model.HJGL_HotProess_TrustItem(); newHotProessTrustItem.HotProessTrustItemId = SQLHelper.GetNewID(typeof(Model.HJGL_HotProess_TrustItem)); newHotProessTrustItem.HotProessTrustId = hotProessTrustItem.HotProessTrustId; @@ -55,7 +55,7 @@ namespace BLL /// public static void UpdateHotProessTrustItem(Model.HJGL_HotProess_TrustItem hotProessTrustItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_TrustItem newHotProessTrustItem = db.HJGL_HotProess_TrustItem.FirstOrDefault(e => e.HotProessTrustItemId == hotProessTrustItem.HotProessTrustItemId); if (newHotProessTrustItem != null) { @@ -75,7 +75,7 @@ namespace BLL /// public static void UpdateHotProessFeedback(Model.HJGL_HotProess_TrustItem hotProessTrustItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_TrustItem newHotProessTrustItem = db.HJGL_HotProess_TrustItem.FirstOrDefault(e => e.HotProessTrustItemId == hotProessTrustItem.HotProessTrustItemId); if (newHotProessTrustItem != null) { @@ -91,7 +91,7 @@ namespace BLL /// public static void DeleteHotProessTrustItemByItemId(string hotProessTrustItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var hotProessTrustItem = (from x in db.HJGL_HotProess_TrustItem where x.HotProessTrustItemId == hotProessTrustItemId select x).FirstOrDefault(); if (hotProessTrustItem != null) { @@ -106,7 +106,7 @@ namespace BLL /// public static void DeleteHotProessTrustItemById(string hotProessTrustId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var hotProessTrustItem = (from x in db.HJGL_HotProess_TrustItem where x.HotProessTrustId == hotProessTrustId select x).ToList(); if (hotProessTrustItem != null) { diff --git a/SGGL/BLL/HJGL/HotProcessHard/HotProess_TrustService.cs b/SGGL/BLL/HJGL/HotProcessHard/HotProess_TrustService.cs index 2431b97..f443a0c 100644 --- a/SGGL/BLL/HJGL/HotProcessHard/HotProess_TrustService.cs +++ b/SGGL/BLL/HJGL/HotProcessHard/HotProess_TrustService.cs @@ -26,7 +26,7 @@ namespace BLL /// public static void AddHotProessTrust(Model.HJGL_HotProess_Trust hotProessTrust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_Trust newHotProessTrust = new Model.HJGL_HotProess_Trust(); newHotProessTrust.HotProessTrustId = hotProessTrust.HotProessTrustId; newHotProessTrust.HotProessTrustNo = hotProessTrust.HotProessTrustNo; @@ -49,7 +49,7 @@ namespace BLL /// public static void UpdateHotProessTrust(Model.HJGL_HotProess_Trust hotProessTrust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_Trust newHotProessTrust = db.HJGL_HotProess_Trust.FirstOrDefault(e => e.HotProessTrustId == hotProessTrust.HotProessTrustId); if (newHotProessTrust != null) { @@ -72,7 +72,7 @@ namespace BLL /// public static void DeleteHotProessTrustById(string hotProessTrustId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_HotProess_Trust hotProessTrust = db.HJGL_HotProess_Trust.FirstOrDefault(e => e.HotProessTrustId == hotProessTrustId); if (hotProessTrust != null) { diff --git a/SGGL/BLL/HJGL/MaterialManage/HJGL_EMInventoryRecordsService.cs b/SGGL/BLL/HJGL/MaterialManage/HJGL_EMInventoryRecordsService.cs index fbaa205..344eda6 100644 --- a/SGGL/BLL/HJGL/MaterialManage/HJGL_EMInventoryRecordsService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/HJGL_EMInventoryRecordsService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class HJGL_EMInventoryRecordsService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -89,7 +89,7 @@ namespace BLL /// public static void UpdateEMInventoryRecords(string projectId, string unitId, string WMT_ID, string Model, string Specification, decimal MaterialCount) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_EMInventoryRecords emInventoryRecords = db.HJGL_EMInventoryRecords.FirstOrDefault(x => x.ProjectId == projectId && x.UnitId == unitId && x.WMT_ID == WMT_ID ); if (emInventoryRecords != null) { diff --git a/SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs b/SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs index 4a2039a..b3e6db9 100644 --- a/SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs @@ -12,7 +12,7 @@ namespace BLL /// public class HJGL_EMaterialRegistService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -101,7 +101,7 @@ namespace BLL /// public static Model.HJGL_EMaterialRegist GetEMaterialRegistByID(string eMaterialRegistId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var eMaterialRegist = db.HJGL_EMaterialRegist.FirstOrDefault(e => e.EMaterialRegistId == eMaterialRegistId); return eMaterialRegist; } @@ -131,7 +131,7 @@ namespace BLL /// public static void AddEMaterialRegist(Model.HJGL_EMaterialRegist eMaterialRegist) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_EMaterialRegist newEMaterialRegist = new Model.HJGL_EMaterialRegist(); newEMaterialRegist.EMaterialRegistId = eMaterialRegist.EMaterialRegistId; @@ -170,7 +170,7 @@ namespace BLL /// public static void UpdateEMaterialRegist(Model.HJGL_EMaterialRegist eMaterialRegist) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_EMaterialRegist newEMaterialRegist = db.HJGL_EMaterialRegist.First(e => e.EMaterialRegistId == eMaterialRegist.EMaterialRegistId); newEMaterialRegist.EMaterialRegistCode = eMaterialRegist.EMaterialRegistCode; @@ -208,7 +208,7 @@ namespace BLL /// public static void DeleteEMaterialRegist(string eMaterialRegistId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_EMaterialRegist eMaterialRegist = db.HJGL_EMaterialRegist.First(e => e.EMaterialRegistId == eMaterialRegistId); db.HJGL_EMaterialRegist.DeleteOnSubmit(eMaterialRegist); @@ -221,7 +221,7 @@ namespace BLL /// public static void AddEMaterialRegistItem(Model.HJGL_EMaterialRegistItem item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_EMaterialRegistItem newItem = new Model.HJGL_EMaterialRegistItem(); newItem.EMaterialRegistItemId = item.EMaterialRegistItemId; @@ -244,7 +244,7 @@ namespace BLL /// public static void DeleteEMaterialRegistItem(string projectId,string unitId, string eMaterialRegistId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = from x in db.HJGL_EMaterialRegistItem where x.EMaterialRegistId == eMaterialRegistId select x; /// 鍙栧埌璐ф槑缁 搴撳瓨鍑忓幓鏄庣粏鍊 diff --git a/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeBakeService.cs b/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeBakeService.cs index 90dc919..59afefa 100644 --- a/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeBakeService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeBakeService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class HJGL_ElectrodeBakeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -109,7 +109,7 @@ namespace BLL /// public static Model.HJGL_ElectrodeBake GetElecrodeBakeByElectrodeId(string electrodeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var elecrodeBake = db.HJGL_ElectrodeBake.FirstOrDefault(e => e.ElectrodeID == electrodeId); return elecrodeBake; } @@ -130,7 +130,7 @@ namespace BLL /// public static void AddElectrodeBake(Model.HJGL_ElectrodeBake electrodeBake) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeBake newElectrodeBake = new Model.HJGL_ElectrodeBake(); newElectrodeBake.WMT_ID = electrodeBake.WMT_ID; @@ -171,7 +171,7 @@ namespace BLL /// public static void UpdateElectrodeBake(Model.HJGL_ElectrodeBake electrodeBake) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeBake newElectrodeBake = db.HJGL_ElectrodeBake.First(e => e.ElectrodeID == electrodeBake.ElectrodeID); newElectrodeBake.ElectrodeCode = electrodeBake.ElectrodeCode; @@ -214,7 +214,7 @@ namespace BLL /// public static void DeleteElectrodeBake(string eletrodeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeBake electrodeBake = db.HJGL_ElectrodeBake.First(e => e.ElectrodeID == eletrodeId); db.HJGL_ElectrodeBake.DeleteOnSubmit(electrodeBake); db.SubmitChanges(); @@ -226,7 +226,7 @@ namespace BLL /// public static void AddElectrodeBakeItem(Model.HJGL_ElectrodeBakeItem electrodeBakeItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeBakeItem newElectrodeBakeItem = new Model.HJGL_ElectrodeBakeItem(); newElectrodeBakeItem.ElectrodeItemID = SQLHelper.GetNewID(typeof(Model.HJGL_ElectrodeBakeItem)); @@ -261,7 +261,7 @@ namespace BLL /// 鐒婁笣鐑樼儰璁板綍Id public static void DeleteElectrodeBakeItem(string electrodeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.HJGL_ElectrodeBakeItem where x.ElectrodeID == electrodeId select x).ToList(); db.HJGL_ElectrodeBakeItem.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeRecoveryService.cs b/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeRecoveryService.cs index 9ee8208..edd7976 100644 --- a/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeRecoveryService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeRecoveryService.cs @@ -5,7 +5,7 @@ namespace BLL { public static class HJGL_ElectrodeRecoveryService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鐒婃潯鍙戞斁鍥炴敹璁板綍ID鑾峰彇鐒婃潯鍙戞斁鍥炴敹璁板綍淇℃伅 @@ -14,13 +14,13 @@ namespace BLL /// public static Model.HJGL_ElectrodeRecovery GetElectrodeRecoveryByID(string electrodeRecoveryID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var electrodeRecovery = db.HJGL_ElectrodeRecovery.FirstOrDefault(e => e.ElectrodeRecoveryId == electrodeRecoveryID); return electrodeRecovery; } public static Model.HJGL_ElectrodeRecovery GetElectrodeRecoveryByItemID(string electrodeRecoveryItemID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var electrodeRecoveryItem = db.HJGL_ElectrodeRecoveryItem.FirstOrDefault(e => e.ElectrodeRecoveryItemID == electrodeRecoveryItemID); var electrodeRecovery = db.HJGL_ElectrodeRecovery.FirstOrDefault(e => e.ElectrodeRecoveryId == electrodeRecoveryItem.ElectrodeRecoveryId); return electrodeRecovery; @@ -42,7 +42,7 @@ namespace BLL /// public static void AddElectrodeRecovery(Model.HJGL_ElectrodeRecovery electrodeRecovery) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeRecovery newElectrodeRecovery = new Model.HJGL_ElectrodeRecovery(); newElectrodeRecovery.ElectrodeRecoveryId = electrodeRecovery.ElectrodeRecoveryId; newElectrodeRecovery.ElectrodeRecoveryCode = electrodeRecovery.ElectrodeRecoveryCode; @@ -66,7 +66,7 @@ namespace BLL /// public static void UpdateElectrodeRecovery(Model.HJGL_ElectrodeRecovery electrodeRecovery) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeRecovery newElectrodeRecovery = db.HJGL_ElectrodeRecovery.FirstOrDefault(e => e.ElectrodeRecoveryId == electrodeRecovery.ElectrodeRecoveryId); if (newElectrodeRecovery != null) { @@ -97,7 +97,7 @@ namespace BLL /// public static void DeleteElectrodeRecovery(string electrodeRecoveryId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeRecovery electrodeRecovery = db.HJGL_ElectrodeRecovery.First(e => e.ElectrodeRecoveryId == electrodeRecoveryId); db.HJGL_ElectrodeRecovery.DeleteOnSubmit(electrodeRecovery); db.SubmitChanges(); @@ -109,7 +109,7 @@ namespace BLL /// public static void AddElectrodeRecoveryItem(Model.HJGL_ElectrodeRecoveryItem item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeRecoveryItem newItem = new Model.HJGL_ElectrodeRecoveryItem(); newItem.ElectrodeRecoveryItemID = SQLHelper.GetNewID(typeof(Model.HJGL_ElectrodeRecoveryItem)); newItem.ElectrodeRecoveryId = item.ElectrodeRecoveryId; @@ -139,7 +139,7 @@ namespace BLL /// public static void DeleteElectrodeRecoveryItem(string projectId, string unitId,string electrodeRecoveryId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = (from x in db.HJGL_ElectrodeRecoveryItem where x.ElectrodeRecoveryId == electrodeRecoveryId select x).ToList(); if (deleteItem.Count() > 0) { diff --git a/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeSecondaryBakeService.cs b/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeSecondaryBakeService.cs index cbbcc23..77e63bf 100644 --- a/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeSecondaryBakeService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/HJGL_ElectrodeSecondaryBakeService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class HJGL_ElectrodeSecondaryBakeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -75,7 +75,7 @@ namespace BLL /// public static Model.HJGL_ElectrodeSecondaryBake GetElecrodeBakeByElectrodeId(string electrodeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var elecrodeBake = db.HJGL_ElectrodeSecondaryBake.FirstOrDefault(e => e.ElectrodeID == electrodeId); return elecrodeBake; } @@ -88,7 +88,7 @@ namespace BLL /// public static void AddElectrodeBake(Model.HJGL_ElectrodeSecondaryBake electrodeBake) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeSecondaryBake newElectrodeBake = new Model.HJGL_ElectrodeSecondaryBake(); newElectrodeBake.WMT_ID = electrodeBake.WMT_ID; @@ -129,7 +129,7 @@ namespace BLL /// public static void UpdateElectrodeBake(Model.HJGL_ElectrodeSecondaryBake electrodeBake) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeSecondaryBake newElectrodeBake = db.HJGL_ElectrodeSecondaryBake.First(e => e.ElectrodeID == electrodeBake.ElectrodeID); newElectrodeBake.ElectrodeCode = electrodeBake.ElectrodeCode; @@ -172,7 +172,7 @@ namespace BLL /// public static void DeleteElectrodeBake(string eletrodeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeSecondaryBake electrodeBake = db.HJGL_ElectrodeSecondaryBake.First(e => e.ElectrodeID == eletrodeId); db.HJGL_ElectrodeSecondaryBake.DeleteOnSubmit(electrodeBake); db.SubmitChanges(); diff --git a/SGGL/BLL/HJGL/MaterialManage/HJGL_MaterialApplyService.cs b/SGGL/BLL/HJGL/MaterialManage/HJGL_MaterialApplyService.cs index caeb416..a112835 100644 --- a/SGGL/BLL/HJGL/MaterialManage/HJGL_MaterialApplyService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/HJGL_MaterialApplyService.cs @@ -9,7 +9,7 @@ namespace BLL.HJGL.MaterialManage { public class HJGL_MaterialApplyService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鐒婃潯鍙戞斁鍥炴敹璁板綍ID鑾峰彇鐒婃潯鍙戞斁鍥炴敹璁板綍淇℃伅 @@ -18,14 +18,14 @@ namespace BLL.HJGL.MaterialManage /// public static Model.HJGL_Material_Apply getMaterialApply(string id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var electrodeRecovery = db.HJGL_Material_Apply.FirstOrDefault(e => e.ID == id); return electrodeRecovery; } public static List getMaterialApplyItem(string ApplyID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = db.HJGL_Material_Apply_Item.Where(e => e.ApplyID == ApplyID).ToList(); return res; @@ -37,7 +37,7 @@ namespace BLL.HJGL.MaterialManage /// public static void AddMaterialApply(Model.HJGL_Material_Apply apply) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.HJGL_Material_Apply.InsertOnSubmit(apply); db.SubmitChanges(); } @@ -48,7 +48,7 @@ namespace BLL.HJGL.MaterialManage /// public static void UpdateMaterialApply(Model.HJGL_Material_Apply apply) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Material_Apply newApply = db.HJGL_Material_Apply.FirstOrDefault(e => e.ID == apply.ID); if (newApply != null) { @@ -91,7 +91,7 @@ namespace BLL.HJGL.MaterialManage public static void UpdateMaterialApplyItem(List items) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var oldList = db.HJGL_Material_Apply_Item.Where(x => x.ApplyID == items[0].ApplyID).ToList(); //鍒犻櫎 鏁版嵁搴撳唴璇ュ垹闄ょ殑 骞朵笖淇敼涓嶈鍒犻櫎鐨 foreach (var olditem in oldList) @@ -152,7 +152,7 @@ namespace BLL.HJGL.MaterialManage /// public static void DeleteElectrodeRecovery(string id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Material_Apply apply = db.HJGL_Material_Apply.FirstOrDefault(e => e.ID == id); if (apply != null) { @@ -169,28 +169,28 @@ namespace BLL.HJGL.MaterialManage public static void AddMaterialApplyApprove(Model.HJGL_Material_Apply_Approve approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.HJGL_Material_Apply_Approve.InsertOnSubmit(approve); db.SubmitChanges(); } public static List< Model.HJGL_Material_Apply_Approve> getMaterialApplyApproveList(string ApplyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = db.HJGL_Material_Apply_Approve.Where(a => a.MaterialApplyId == ApplyId && a.ApproveDate != null).OrderBy(x=>x.ApproveDate).ToList(); return res; } public static Model.HJGL_Material_Apply_Approve getCurrMaterialApplyApprove(string ApplyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = db.HJGL_Material_Apply_Approve.Where(a => a.MaterialApplyId == ApplyId && a.ApproveDate ==null).FirstOrDefault(); return res; } public static void UpdateMaterialApplyApprove(Model.HJGL_Material_Apply_Approve approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = db.HJGL_Material_Apply_Approve.Where(a => a.MaterialApplyApproveId == approve.MaterialApplyApproveId).FirstOrDefault(); if (res != null) { diff --git a/SGGL/BLL/HJGL/MaterialManage/RecycleMatService.cs b/SGGL/BLL/HJGL/MaterialManage/RecycleMatService.cs index da6e719..fdce491 100644 --- a/SGGL/BLL/HJGL/MaterialManage/RecycleMatService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/RecycleMatService.cs @@ -36,7 +36,7 @@ namespace BLL /// public static void AddRecycleMat(Model.Weld_RecycleMat recycleMat) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_RecycleMat newRecycleMat = new Model.Weld_RecycleMat(); newRecycleMat.RecycleMatId = recycleMat.RecycleMatId; newRecycleMat.ProjectId = recycleMat.ProjectId; @@ -63,7 +63,7 @@ namespace BLL /// public static void UpdateRecycleMat(Model.Weld_RecycleMat recycleMat) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_RecycleMat newRecycleMat = db.Weld_RecycleMat.FirstOrDefault(e => e.RecycleMatId == recycleMat.RecycleMatId); if (newRecycleMat != null) { @@ -91,7 +91,7 @@ namespace BLL /// public static void DeleteRecycleMatById(string recycleMatId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_RecycleMat recycleMat = db.Weld_RecycleMat.FirstOrDefault(e => e.RecycleMatId == recycleMatId); if (recycleMat != null) { @@ -108,7 +108,7 @@ namespace BLL /// public static void DeleteRecycleMat(string projectId, string welderId, string usingPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_RecycleMat recycleMat = db.Weld_RecycleMat.FirstOrDefault(e => e.ProjectId == projectId && e.RecycleMan == welderId && e.UsingPlanId == usingPlanId); if (recycleMat != null) { @@ -135,7 +135,7 @@ namespace BLL /// public static void WelderConfirm(string recycleMatId, bool isConfirm) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_RecycleMat newRecycleMat = db.Weld_RecycleMat.FirstOrDefault(e => e.RecycleMatId == recycleMatId); if (newRecycleMat != null) { @@ -151,7 +151,7 @@ namespace BLL /// public static void StoreManConfirm(string recycleMatId, bool isConfirm) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_RecycleMat newRecycleMat = db.Weld_RecycleMat.FirstOrDefault(e => e.RecycleMatId == recycleMatId); if (newRecycleMat != null) { diff --git a/SGGL/BLL/HJGL/MaterialManage/StockInService.cs b/SGGL/BLL/HJGL/MaterialManage/StockInService.cs index 7497f9b..44546d1 100644 --- a/SGGL/BLL/HJGL/MaterialManage/StockInService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/StockInService.cs @@ -26,7 +26,7 @@ namespace BLL /// public static void AddStockIn(Model.Weld_StockIn stockIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn newStockIn = new Model.Weld_StockIn(); newStockIn.StockInId = stockIn.StockInId; newStockIn.ProjectId = stockIn.ProjectId; @@ -60,7 +60,7 @@ namespace BLL /// public static void UpdateStockIn(Model.Weld_StockIn stockIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockIn.StockInId); if (newStockIn != null) { @@ -87,7 +87,7 @@ namespace BLL public static void UpdateStockIn1(Model.Weld_StockIn stockIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockIn.StockInId); if (newStockIn != null) { @@ -110,7 +110,7 @@ namespace BLL /// public static void UpdateAttachFile( string stockInId,string attUrl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockInId); if (newStockIn != null) { @@ -125,7 +125,7 @@ namespace BLL /// public static void UpdateStockInCheck(Model.Weld_StockIn stockIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockIn.StockInId); if (newStockIn != null) { @@ -144,7 +144,7 @@ namespace BLL /// public static void UpdateStockInUsingAmount(string stockInId,decimal? oneUsedAmount,decimal? twoAmount) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockInId); if (newStockIn != null) { @@ -163,7 +163,7 @@ namespace BLL /// 閫鍥炴暟閲 public static void UpdateStockInAmount(string stockInId, decimal recycleAmount) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockInId); if (newStockIn != null) { @@ -187,7 +187,7 @@ namespace BLL public static void UpdateStockInAmount(string stockInId, decimal oldRecyclAmount, decimal newRecycleAmount) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockInId); if (newStockIn != null) { @@ -203,7 +203,7 @@ namespace BLL /// public static void DeleteStockInById(string stockInId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_StockIn stockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockInId); if (stockIn != null) { diff --git a/SGGL/BLL/HJGL/MaterialManage/UnitStoreService.cs b/SGGL/BLL/HJGL/MaterialManage/UnitStoreService.cs index 77584a3..8e5ea2b 100644 --- a/SGGL/BLL/HJGL/MaterialManage/UnitStoreService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/UnitStoreService.cs @@ -28,7 +28,7 @@ namespace BLL /// public static void AddUnitStore(Model.Weld_UnitStore unitStore) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UnitStore newUnitStore = new Model.Weld_UnitStore(); newUnitStore.UnitStoreId = unitStore.UnitStoreId; newUnitStore.ProjectId = unitStore.ProjectId; @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateUnitStore(Model.Weld_UnitStore unitStore) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UnitStore newUnitStore = db.Weld_UnitStore.FirstOrDefault(e => e.UnitStoreId == unitStore.UnitStoreId); if (newUnitStore != null) { @@ -65,7 +65,7 @@ namespace BLL /// public static void DeleteUnitStoreById(string unitStoreId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UnitStore delUnitStore = db.Weld_UnitStore.FirstOrDefault(e => e.UnitStoreId == unitStoreId); if (delUnitStore != null) { diff --git a/SGGL/BLL/HJGL/MaterialManage/UsingMatService.cs b/SGGL/BLL/HJGL/MaterialManage/UsingMatService.cs index d4c8009..85e34e2 100644 --- a/SGGL/BLL/HJGL/MaterialManage/UsingMatService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/UsingMatService.cs @@ -26,7 +26,7 @@ namespace BLL /// public static void AddUsingMat(Model.Weld_UsingMat usingMat) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingMat newUsingMat = new Model.Weld_UsingMat(); newUsingMat.UsingMatId = usingMat.UsingMatId; newUsingMat.ProjectId = usingMat.ProjectId; @@ -52,7 +52,7 @@ namespace BLL /// public static void UpdateUsingMat(Model.Weld_UsingMat usingMat) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingMat newUsingMat = db.Weld_UsingMat.FirstOrDefault(e => e.UsingMatId == usingMat.UsingMatId); if (newUsingMat != null) { @@ -80,7 +80,7 @@ namespace BLL /// public static void UsingMatIsColse(string usingMatId, bool isClose) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingMat newUsingMat =db.Weld_UsingMat.FirstOrDefault(e => e.UsingMatId == usingMatId); if (newUsingMat != null) { @@ -111,7 +111,7 @@ namespace BLL /// public static void WelderConfirm(string usingMatId,bool isConfirm) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingMat newUsingMat = db.Weld_UsingMat.FirstOrDefault(e => e.UsingMatId == usingMatId); if (newUsingMat != null) { @@ -128,7 +128,7 @@ namespace BLL /// public static void StoreManConfirm(string usingMatId, bool isConfirm) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingMat newUsingMat = db.Weld_UsingMat.FirstOrDefault(e => e.UsingMatId == usingMatId); if (newUsingMat != null) { @@ -143,7 +143,7 @@ namespace BLL /// public static void DeleteUsingMatById(string usingMatId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingMat usingMat = db.Weld_UsingMat.FirstOrDefault(e => e.UsingMatId == usingMatId); if (usingMat != null) { @@ -154,7 +154,7 @@ namespace BLL public static decimal GetUsingAmountSum(string usingPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal usingAmountSum = 0; var usingList = from x in db.Weld_UsingMat where x.UsingPlanId == usingPlanId select x; if (usingList.Count() > 0) @@ -171,7 +171,7 @@ namespace BLL /// public static void DeleteUsingMatByWelderIdProjectId(string welderId, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Weld_UsingMat where x.UsingMan == welderId && x.ProjectId == projectId select x).ToList(); if (q!=null) { diff --git a/SGGL/BLL/HJGL/MaterialManage/UsingPlanService.cs b/SGGL/BLL/HJGL/MaterialManage/UsingPlanService.cs index d01c740..c5579b6 100644 --- a/SGGL/BLL/HJGL/MaterialManage/UsingPlanService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/UsingPlanService.cs @@ -26,7 +26,7 @@ namespace BLL /// public static void AddUsingPlan(Model.Weld_UsingPlan usingPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingPlan newUsingPlan = new Model.Weld_UsingPlan(); newUsingPlan.UsingPlanId = usingPlan.UsingPlanId; newUsingPlan.WeldId = usingPlan.WeldId; @@ -60,7 +60,7 @@ namespace BLL /// public static void UpdateUsingPlan(Model.Weld_UsingPlan usingPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingPlan newUsingPlan = db.Weld_UsingPlan.FirstOrDefault(e => e.UsingPlanId == usingPlan.UsingPlanId); if (newUsingPlan != null) { @@ -94,7 +94,7 @@ namespace BLL /// public static void UpdateIsSubmit(string usingPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingPlan newUsingPlan = db.Weld_UsingPlan.FirstOrDefault(e => e.UsingPlanId == usingPlanId); if (newUsingPlan != null) { @@ -109,7 +109,7 @@ namespace BLL /// public static void UpdateIsFinish(string usingPlanId, string finishMan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingPlan newUsingPlan = db.Weld_UsingPlan.FirstOrDefault(e => e.UsingPlanId == usingPlanId); if (newUsingPlan != null) { @@ -126,7 +126,7 @@ namespace BLL /// public static void UpdateIsCancel(string usingPlanId, string cancelResult) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingPlan newUsingPlan = db.Weld_UsingPlan.FirstOrDefault(e => e.UsingPlanId == usingPlanId); if (newUsingPlan != null) { @@ -145,7 +145,7 @@ namespace BLL /// public static void UpdateUsingPlanIsFinish(string usingPlanId,bool? isFinish) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingPlan newUsingPlan = db.Weld_UsingPlan.FirstOrDefault(e => e.UsingPlanId == usingPlanId); if (newUsingPlan != null) { @@ -161,7 +161,7 @@ namespace BLL /// public static void DeleteUsingPlanById(string usingPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingPlan usingPlan = db.Weld_UsingPlan.FirstOrDefault(e => e.UsingPlanId == usingPlanId); if (usingPlan != null) { @@ -228,7 +228,7 @@ namespace BLL /// public static void UpdateIsNeedConfirm(string usingPlanId,bool? isNeed) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Weld_UsingPlan newUsingPlan = db.Weld_UsingPlan.FirstOrDefault(e => e.UsingPlanId == usingPlanId); if (newUsingPlan != null) { diff --git a/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustItemService.cs b/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustItemService.cs index 41a8c99..1b8d4fe 100644 --- a/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustItemService.cs +++ b/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustItemService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.HJGL_Batch_BatchTrustItem GetBatchTrustItemById(string trustBatchItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.HJGL_Batch_BatchTrustItem.FirstOrDefault(e => e.TrustBatchItemId == trustBatchItemId); } @@ -28,7 +28,7 @@ namespace BLL /// public static List GetBatchTrustItemByTrustBatchId(string trustBatchId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.HJGL_Batch_BatchTrustItem where x.TrustBatchId == trustBatchId select x).ToList(); } @@ -38,7 +38,7 @@ namespace BLL /// public static void AddBatchTrustItem(Model.HJGL_Batch_BatchTrustItem batchTrustItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_BatchTrustItem newTrustBatchItem = new Model.HJGL_Batch_BatchTrustItem { TrustBatchItemId = batchTrustItem.TrustBatchItemId, @@ -62,7 +62,7 @@ namespace BLL /// public static void UpdateBatchTrustItem(Model.HJGL_Batch_BatchTrustItem batchTrustItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_BatchTrustItem newBatchTrustItem = db.HJGL_Batch_BatchTrustItem.FirstOrDefault(e => e.TrustBatchItemId == batchTrustItem.TrustBatchItemId); if (newBatchTrustItem != null) { @@ -83,7 +83,7 @@ namespace BLL /// public static List GetViewBatchTrustItem(string trustBatchId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.View_Batch_BatchTrustItem where x.TrustBatchId == trustBatchId select x).ToList(); } @@ -94,7 +94,7 @@ namespace BLL /// public static void DeleteTrustItemByTrustBatchItemId(string trustBatchItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_BatchTrustItem trustItem = db.HJGL_Batch_BatchTrustItem.FirstOrDefault(e => e.TrustBatchItemId == trustBatchItemId); if (trustItem != null) { @@ -112,7 +112,7 @@ namespace BLL /// public static void UpdateTrustNum(string trustBatchItemId, int num) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var trustBatchItem = db.HJGL_Batch_BatchTrustItem.FirstOrDefault(x => x.TrustBatchItemId == trustBatchItemId); if (trustBatchItem != null) { diff --git a/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs b/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs index 75d7630..76c67dc 100644 --- a/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs +++ b/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static Model.HJGL_Batch_BatchTrust GetBatchTrustById(string trustBatchId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.HJGL_Batch_BatchTrust.FirstOrDefault(e => e.TrustBatchId == trustBatchId); } @@ -28,7 +28,7 @@ namespace BLL /// public static Model.View_Batch_BatchTrust GetBatchTrustViewById(string trustBatchId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.View_Batch_BatchTrust.FirstOrDefault(e => e.TrustBatchId == trustBatchId); } @@ -40,7 +40,7 @@ namespace BLL /// public static void UpdatTrustBatchtState(string trustBatchId, bool? isCheck) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_BatchTrust update = db.HJGL_Batch_BatchTrust.FirstOrDefault(e => e.TrustBatchId == trustBatchId); if (update != null) { @@ -56,7 +56,7 @@ namespace BLL /// public static void AddBatchTrust(Model.HJGL_Batch_BatchTrust batchTrust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_BatchTrust newBatchTrust = new Model.HJGL_Batch_BatchTrust { TrustBatchId = batchTrust.TrustBatchId, @@ -84,7 +84,7 @@ namespace BLL /// public static void UpdateBatchTrust(Model.HJGL_Batch_BatchTrust batchTrust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_BatchTrust newBatchTrust = db.HJGL_Batch_BatchTrust.FirstOrDefault(e => e.TrustBatchId == batchTrust.TrustBatchId); if (newBatchTrust != null) { @@ -105,7 +105,7 @@ namespace BLL public static void UpdateBatchTrustAudit(string batchTrustId, bool isAudit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_BatchTrust newBatchTrust = db.HJGL_Batch_BatchTrust.FirstOrDefault(e => e.TrustBatchId == batchTrustId); if (newBatchTrust != null) { @@ -120,7 +120,7 @@ namespace BLL /// public static void DeleteBatchTrustById(string trustBatchId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_BatchTrust batchTrust = db.HJGL_Batch_BatchTrust.FirstOrDefault(e => e.TrustBatchId == trustBatchId); if (batchTrust != null) { diff --git a/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs b/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs index c78f04c..0965c25 100644 --- a/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs +++ b/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs @@ -35,7 +35,7 @@ namespace BLL public static List GetGBatchDetailByBatchId(string batchId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.HJGL_Batch_PointBatchItem join y in db.HJGL_WeldJoint @@ -91,7 +91,7 @@ namespace BLL /// public static void PointAudit(string pointBatchItemId, bool isAudit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_PointBatchItem newPointBatchItem = db.HJGL_Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == pointBatchItemId); if (newPointBatchItem != null) { @@ -110,7 +110,7 @@ namespace BLL /// public static void UpdateWelderFirst(string pointBatchItemId, bool? welderFirst) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_PointBatchItem newPointBatchItem = db.HJGL_Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == pointBatchItemId); newPointBatchItem.IsWelderFirst = welderFirst; @@ -124,7 +124,7 @@ namespace BLL /// public static void UpdatePipelineFirst(string pointBatchItemId, bool? pipelineFirst) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_PointBatchItem newPointBatchItem = db.HJGL_Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == pointBatchItemId); newPointBatchItem.IsPipelineFirst = pipelineFirst; @@ -138,7 +138,7 @@ namespace BLL /// public static void DeleteBatchDetail(string jotId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_PointBatchItem batch = db.HJGL_Batch_PointBatchItem.FirstOrDefault(e => e.WeldJointId == jotId); if (batch != null) { @@ -177,7 +177,7 @@ namespace BLL /// public static void DeleteBatchDetailById(string batchDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_PointBatchItem batch = db.HJGL_Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == batchDetailId); if (batch != null) { @@ -191,7 +191,7 @@ namespace BLL /// public static void AutoPoint(string pointBatchId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int pointNum = 0; int pointNumG = 0; diff --git a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs index 043d8ac..3aa9f03 100644 --- a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs +++ b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs @@ -39,7 +39,7 @@ namespace BLL /// public static void AddPointBatch(Model.HJGL_Batch_PointBatch batch) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_PointBatch newBatch = new Model.HJGL_Batch_PointBatch(); newBatch.PointBatchId = batch.PointBatchId; newBatch.PointBatchCode = batch.PointBatchCode; @@ -66,7 +66,7 @@ namespace BLL /// public static void DeleteBatch(string batchId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Batch_PointBatch batch = db.HJGL_Batch_PointBatch.FirstOrDefault(e => e.PointBatchId == batchId); db.HJGL_Batch_PointBatch.DeleteOnSubmit(batch); diff --git a/SGGL/BLL/HJGL/RepairAndExpand/RepairRecordService.cs b/SGGL/BLL/HJGL/RepairAndExpand/RepairRecordService.cs index 2f8d24f..f603358 100644 --- a/SGGL/BLL/HJGL/RepairAndExpand/RepairRecordService.cs +++ b/SGGL/BLL/HJGL/RepairAndExpand/RepairRecordService.cs @@ -50,7 +50,7 @@ namespace BLL /// public static void AddRepairRecord(Model.HJGL_RepairRecord repair) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_RepairRecord newRepair = new Model.HJGL_RepairRecord(); newRepair.RepairRecordId = repair.RepairRecordId; newRepair.RepairRecordCode = repair.RepairRecordCode; @@ -76,7 +76,7 @@ namespace BLL public static void UpdateRepairRecord(Model.HJGL_RepairRecord repair) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_RepairRecord newRepair = db.HJGL_RepairRecord.FirstOrDefault(e => e.RepairRecordId == repair.RepairRecordId); if (newRepair != null) { diff --git a/SGGL/BLL/HJGL/RepairManage/ShowRepairSearchService.cs b/SGGL/BLL/HJGL/RepairManage/ShowRepairSearchService.cs index ad4538a..224ecb1 100644 --- a/SGGL/BLL/HJGL/RepairManage/ShowRepairSearchService.cs +++ b/SGGL/BLL/HJGL/RepairManage/ShowRepairSearchService.cs @@ -11,7 +11,7 @@ namespace BLL public static List GetSpRepairSearchItems(string projectId, List jotList, bool ckISO, bool ckWeld, string[] workAreaId, string unitId, string CH_TrustID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List SpRepairSearchItems = new List(); if (jotList != null) { diff --git a/SGGL/BLL/HJGL/TrustManage/ShowTrustSearchService.cs b/SGGL/BLL/HJGL/TrustManage/ShowTrustSearchService.cs index 9f0ee22..8f5c316 100644 --- a/SGGL/BLL/HJGL/TrustManage/ShowTrustSearchService.cs +++ b/SGGL/BLL/HJGL/TrustManage/ShowTrustSearchService.cs @@ -9,7 +9,7 @@ namespace BLL { public class ShowTrustSearchService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 瀹氫箟鍙橀噺 diff --git a/SGGL/BLL/HJGL/TrustManage/TrustManageEditService.cs b/SGGL/BLL/HJGL/TrustManage/TrustManageEditService.cs index 169ef50..f5d8660 100644 --- a/SGGL/BLL/HJGL/TrustManage/TrustManageEditService.cs +++ b/SGGL/BLL/HJGL/TrustManage/TrustManageEditService.cs @@ -10,7 +10,7 @@ namespace BLL { public class TrustManageEditService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -94,7 +94,7 @@ namespace BLL /// public static Model.CH_Trust GetCH_TrustByID(string CH_TrustID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var view = db.CH_Trust.FirstOrDefault(e => e.CH_TrustID == CH_TrustID); return view; } @@ -107,7 +107,7 @@ namespace BLL /// public static bool IsExistTrustCode(string projectId, string trustCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.CH_Trust where x.ProjectId == projectId && x.CH_TrustCode == trustCode select x; if (q.Count() > 0) { @@ -126,7 +126,7 @@ namespace BLL /// public static List GetView_CH_TrustItemByCH_TrustID(string CH_TrustID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var view = (from x in db.View_CH_TrustItem where x.CH_TrustID == CH_TrustID && x.JOT_JointStatus != "104" select x).ToList(); return view; } @@ -138,13 +138,13 @@ namespace BLL /// public static List GetCH_TrustItemByJOT_ID(string jot_id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var view = (from x in db.CH_TrustItem where x.JOT_ID == jot_id select x).ToList(); return view; } public static List GetCH_TrustItemByISO_ID(string ISO_ID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var view = (from x in db.CH_TrustItem join j in db.PW_JointInfo on x.JOT_ID equals j.JOT_ID where j.ISO_ID == ISO_ID select x).ToList(); return view; } @@ -156,7 +156,7 @@ namespace BLL /// public static Model.CH_TrustItem GetCH_TrustItemByJOT_IDAndJotId(string CH_TrustID, string jot_id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var view = db.CH_TrustItem.FirstOrDefault(x => x.CH_TrustID == CH_TrustID && x.JOT_ID == jot_id); return view; } @@ -168,7 +168,7 @@ namespace BLL /// public static List GetCH_TrustItemByCH_TrustID(string CH_TrustID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var view = (from x in db.CH_TrustItem where x.CH_TrustID == CH_TrustID select x).ToList(); return view; } @@ -190,7 +190,7 @@ namespace BLL /// 濮旀墭瀹炰綋 public static void AddCH_Trust(Model.CH_Trust cH_Trust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CH_Trust newCH_Trust = new Model.CH_Trust(); newCH_Trust.CH_TrustID = cH_Trust.CH_TrustID; newCH_Trust.CH_TrustCode = cH_Trust.CH_TrustCode; @@ -228,7 +228,7 @@ namespace BLL /// 鐒婃帴瀹炰綋 public static void UpdateCH_Trust(Model.CH_Trust cH_Trust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CH_Trust newCH_Trust = db.CH_Trust.First(e => e.CH_TrustID == cH_Trust.CH_TrustID); newCH_Trust.CH_TrustID = cH_Trust.CH_TrustID; newCH_Trust.CH_TrustCode = cH_Trust.CH_TrustCode; @@ -265,7 +265,7 @@ namespace BLL /// 濮旀墭涓婚敭 public static void DeleteCH_TrustByCH_TrustID(string cH_TrustID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CH_Trust cH_Trust = db.CH_Trust.First(e => e.CH_TrustID == cH_TrustID); db.CH_Trust.DeleteOnSubmit(cH_Trust); db.SubmitChanges(); @@ -277,7 +277,7 @@ namespace BLL /// 濮旀墭涓婚敭 public static void DeleteCH_TrustItemByCH_TrustID(string cH_TrustID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var cH_Trust = from x in db.CH_TrustItem where x.CH_TrustID == cH_TrustID select x; if (cH_Trust != null) { @@ -306,7 +306,7 @@ namespace BLL /// 濮旀墭鏄庣粏瀹炰綋 public static void AddCH_TrustItem(Model.CH_TrustItem trustItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CH_TrustItem newTrustItem = new Model.CH_TrustItem(); newTrustItem.CH_TrustItemID = SQLHelper.GetNewID(typeof(Model.CH_TrustItem)); @@ -321,7 +321,7 @@ namespace BLL public static void upDataCH_TrustItem(string cH_TrustID, List trusts) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var cH_Trust = from x in db.CH_TrustItem where x.CH_TrustID == cH_TrustID select x; List needRemove = new List(); if (cH_Trust != null)// @@ -403,7 +403,7 @@ namespace BLL /// 鐒婃帴瀹炰綋 public static void AuditCH_Trust(Model.CH_Trust cH_Trust) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CH_Trust newCH_Trust = db.CH_Trust.First(e => e.CH_TrustID == cH_Trust.CH_TrustID); newCH_Trust.CH_TrustID = cH_Trust.CH_TrustID; newCH_Trust.CH_AuditMan = cH_Trust.CH_AuditMan; diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs index bf5bbb0..6336908 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs @@ -36,7 +36,7 @@ namespace BLL /// public static bool IsExistPipelineCode(string pipelineCode, string workAreaId, string PipelineId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Pipeline q = null; if (!string.IsNullOrEmpty(PipelineId)) { @@ -63,7 +63,7 @@ namespace BLL /// public static void AddPipeline(Model.HJGL_Pipeline pipeline) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Pipeline newPipeline = new Model.HJGL_Pipeline(); newPipeline.PipelineId = pipeline.PipelineId; newPipeline.ProjectId = pipeline.ProjectId; @@ -98,7 +98,7 @@ namespace BLL /// public static void UpdatePipeline(Model.HJGL_Pipeline pipeline) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Pipeline newPipeline = db.HJGL_Pipeline.FirstOrDefault(e => e.PipelineId == pipeline.PipelineId); if (newPipeline != null) { @@ -146,7 +146,7 @@ namespace BLL /// public static void DeletePipeline(string pipelineId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_Pipeline pipeline = db.HJGL_Pipeline.FirstOrDefault(e => e.PipelineId == pipelineId); var jot = db.HJGL_Pipeline.Where(e => e.PipelineId == pipelineId); if (pipeline != null) diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs index 149cd43..b340f15 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs @@ -26,7 +26,7 @@ namespace BLL /// public static bool IsExistWeldJointCode(string weldJointCode, string pipelineId, string weldJointId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_WeldJoint jot = null; if (!string.IsNullOrEmpty(weldJointId)) { @@ -64,7 +64,7 @@ namespace BLL /// public static void AddWeldJoint(Model.HJGL_WeldJoint weldJoint) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_WeldJoint newWeldJoint = new Model.HJGL_WeldJoint { WeldJointId = SQLHelper.GetNewID(typeof(Model.HJGL_WeldJoint)), @@ -108,7 +108,7 @@ namespace BLL /// public static void UpdateWeldJoint(Model.HJGL_WeldJoint weldJoint) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_WeldJoint newWeldJoint = db.HJGL_WeldJoint.FirstOrDefault(e => e.WeldJointId == weldJoint.WeldJointId); if (newWeldJoint != null) { @@ -153,7 +153,7 @@ namespace BLL /// public static void WriteBackWeldJoint(Model.HJGL_WeldJoint weldJoint) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_WeldJoint newWeldJoint = db.HJGL_WeldJoint.FirstOrDefault(e => e.WeldJointId == weldJoint.WeldJointId); if (newWeldJoint != null) { @@ -172,7 +172,7 @@ namespace BLL /// public static void DeleteWeldJointById(string weldJointId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_WeldJoint weldline = db.HJGL_WeldJoint.FirstOrDefault(e => e.WeldJointId == weldJointId); if (weldline != null) { @@ -189,7 +189,7 @@ namespace BLL /// 鏃ユ姤鎿嶄綔锛堝鍔犮佸垹闄わ級 public static void UpdateWeldJointAddG(string weldJointId, string jointAttribute, string operateState) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; if (operateState == Const.BtnDelete || jointAttribute != "鍥哄畾鍙") { Model.HJGL_WeldJoint deleteWeldJoint = db.HJGL_WeldJoint.FirstOrDefault(e => e.WeldJointId == weldJointId); @@ -218,7 +218,7 @@ namespace BLL /// public static Model.View_HJGL_WeldJoint GetViewWeldJointById(string weldJointId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.View_HJGL_WeldJoint.FirstOrDefault(e => e.WeldJointId == weldJointId); } @@ -254,7 +254,7 @@ namespace BLL /// public static bool GetWelderLimitDN(string projectId, string welderId, DateTime weldingDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var jots = from x in db.HJGL_WeldJoint join y in db.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldReportService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldReportService.cs index a8c0f9f..b1cb413 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldReportService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldReportService.cs @@ -9,7 +9,7 @@ namespace BLL { public class WeldReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁妫鏌ョ紪鍙锋煡璇㈢剨鎺ユ棩鎶ヤ俊鎭 @@ -63,7 +63,7 @@ namespace BLL /// 鐒婃帴鏃ユ姤瀹炰綋 public static void AddWeldReport(Model.BO_WeldReportMain weldReport) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.BO_WeldReportMain newWeldReport = new Model.BO_WeldReportMain(); newWeldReport.DReportID = weldReport.DReportID; @@ -87,7 +87,7 @@ namespace BLL /// 鐒婃帴鏃ユ姤瀹炰綋 public static void UpdateWeldReport(Model.BO_WeldReportMain weldReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BO_WeldReportMain newWeldReport = db.BO_WeldReportMain.First(e => e.DReportID == weldReport.DReportID); newWeldReport.UnitId = weldReport.UnitId; newWeldReport.InstallationId = weldReport.InstallationId; @@ -106,7 +106,7 @@ namespace BLL /// 鐒婃帴鏃ユ姤涓婚敭 public static void DeleteWeldReportByDReportID(string dReportID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BO_WeldReportMain weldReport = db.BO_WeldReportMain.First(e => e.DReportID == dReportID); db.BO_WeldReportMain.DeleteOnSubmit(weldReport); db.SubmitChanges(); diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs index b5e1218..c1c6683 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs @@ -215,7 +215,7 @@ namespace BLL /// public static void AddWeldingDaily(Model.HJGL_WeldingDaily WeldingDaily) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_WeldingDaily newWeldingDaily = new HJGL_WeldingDaily { WeldingDailyId = WeldingDaily.WeldingDailyId, @@ -239,7 +239,7 @@ namespace BLL /// public static void UpdateWeldingDaily(Model.HJGL_WeldingDaily WeldingDaily) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_WeldingDaily newWeldingDaily = db.HJGL_WeldingDaily.FirstOrDefault(e => e.WeldingDailyId == WeldingDaily.WeldingDailyId); if (newWeldingDaily != null) { @@ -260,7 +260,7 @@ namespace BLL /// public static void DeleteWeldingDaily(string WeldingDailyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_WeldingDaily delWeldingDaily = db.HJGL_WeldingDaily.FirstOrDefault(e => e.WeldingDailyId == WeldingDailyId); if (delWeldingDaily != null) { diff --git a/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs b/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs index 6ba1d44..037267a 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentHandleService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇HSSE浜嬫晠锛堝惈鏈亗锛夊鐞 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddAccidentHandle(Model.Accident_AccidentHandle accidentHandle) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentHandle newAccidentHandle = new Model.Accident_AccidentHandle { AccidentHandleId = accidentHandle.AccidentHandleId, @@ -61,7 +61,7 @@ namespace BLL /// public static void UpdateAccidentHandle(Model.Accident_AccidentHandle accidentHandle) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentHandle newAccidentHandle = db.Accident_AccidentHandle.FirstOrDefault(e => e.AccidentHandleId == accidentHandle.AccidentHandleId); if (newAccidentHandle != null) { @@ -92,7 +92,7 @@ namespace BLL /// public static void DeleteAccidentHandleById(string accidentHandleId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentHandle accidentHandle = db.Accident_AccidentHandle.FirstOrDefault(e => e.AccidentHandleId == accidentHandleId); if (accidentHandle != null) { diff --git a/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs b/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs index df9c738..1aa90cc 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentPersonRecordService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇HSSE浜嬫晠锛堝浜哄憳锛夎褰 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddAccidentPersonRecord(Model.Accident_AccidentPersonRecord accidentPersonRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentPersonRecord newAccidentPersonRecord = new Model.Accident_AccidentPersonRecord { AccidentPersonRecordId = accidentPersonRecord.AccidentPersonRecordId, @@ -59,7 +59,7 @@ namespace BLL /// public static void UpdateAccidentPersonRecord(Model.Accident_AccidentPersonRecord accidentPersonRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentPersonRecord newAccidentPersonRecord = db.Accident_AccidentPersonRecord.FirstOrDefault(e => e.AccidentPersonRecordId == accidentPersonRecord.AccidentPersonRecordId); if (newAccidentPersonRecord != null) { @@ -89,7 +89,7 @@ namespace BLL /// public static void DeleteAccidentPersonRecordById(string accidentPersonRecordId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentPersonRecord accidentPersonRecord = db.Accident_AccidentPersonRecord.FirstOrDefault(e => e.AccidentPersonRecordId == accidentPersonRecordId); if (accidentPersonRecord != null) { diff --git a/SGGL/BLL/HSSE/Accident/AccidentReportOtherItemService.cs b/SGGL/BLL/HSSE/Accident/AccidentReportOtherItemService.cs index 4e43918..027f4d8 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentReportOtherItemService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentReportOtherItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class AccidentReportOtherItemService { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁浜嬫晠璋冩煡澶勭悊鎶ュ憡涓婚敭鑾峰彇鎵鏈夌浉鍏宠皟鏌ョ粍鎴愬憳淇℃伅鍒楄〃 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddAccidentReportOtherItem(Model.Accident_AccidentReportOtherItem accidentReportOtherItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReportOtherItem newAccidentReportOtherItem = new Model.Accident_AccidentReportOtherItem { AccidentReportOtherItemId = accidentReportOtherItem.AccidentReportOtherItemId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateAccidentReportOtherItem(Model.Accident_AccidentReportOtherItem accidentReportOtherItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReportOtherItem newAccidentReportOtherItem = db.Accident_AccidentReportOtherItem.FirstOrDefault(e => e.AccidentReportOtherItemId == accidentReportOtherItem.AccidentReportOtherItemId); if (newAccidentReportOtherItem != null) { @@ -75,7 +75,7 @@ namespace BLL /// public static void DeleteAccidentReportOtherItemByAccidentReportOtherId(string accidentReportOtherId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Accident_AccidentReportOtherItem where x.AccidentReportOtherId == accidentReportOtherId select x).ToList(); if (q != null) { @@ -90,7 +90,7 @@ namespace BLL /// public static void DeleteAccidentReportOtherItemById(string accidentReportOtherItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReportOtherItem item = db.Accident_AccidentReportOtherItem.FirstOrDefault(e => e.AccidentReportOtherItemId == accidentReportOtherItemId); if (item != null) { diff --git a/SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs b/SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs index 06925d7..0c9d2b8 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentReportOtherService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浜嬫晠璋冩煡澶勭悊鎶ュ憡 @@ -191,7 +191,7 @@ namespace BLL /// public static void AddAccidentReportOther(Model.Accident_AccidentReportOther accidentReportOther) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReportOther newAccidentReportOther = new Model.Accident_AccidentReportOther { AccidentReportOtherId = accidentReportOther.AccidentReportOtherId, @@ -232,7 +232,7 @@ namespace BLL /// public static void UpdateAccidentReportOther(Model.Accident_AccidentReportOther accidentReportOther) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReportOther newAccidentReportOther = db.Accident_AccidentReportOther.FirstOrDefault(e => e.AccidentReportOtherId == accidentReportOther.AccidentReportOtherId); if (newAccidentReportOther != null) { @@ -270,7 +270,7 @@ namespace BLL /// public static void DeleteAccidentReportOtherById(string accidentReportOtherId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReportOther accidentReportOther = db.Accident_AccidentReportOther.FirstOrDefault(e => e.AccidentReportOtherId == accidentReportOtherId); if (accidentReportOther != null) { diff --git a/SGGL/BLL/HSSE/Accident/AccidentReportService.cs b/SGGL/BLL/HSSE/Accident/AccidentReportService.cs index bdabca2..f7cd023 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentReportService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浜嬫晠璋冩煡鎶ュ憡 @@ -334,7 +334,7 @@ namespace BLL /// public static List GetAccidentReportsByTimeAndAccidentTypeId(DateTime startTime, DateTime endTime, string projectId, string accidentTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; if (accidentTypeId == "1" || accidentTypeId == "2" || accidentTypeId == "3") //杞婚噸姝讳簨鏁呮寜瀹℃壒瀹屾垚鏃堕棿 { return (from x in db.Accident_AccidentReport @@ -356,7 +356,7 @@ namespace BLL /// public static void AddAccidentReport(Model.Accident_AccidentReport accidentReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReport newAccidentReport = new Model.Accident_AccidentReport { AccidentReportId = accidentReport.AccidentReportId, @@ -401,7 +401,7 @@ namespace BLL /// public static void UpdateAccidentReport(Model.Accident_AccidentReport accidentReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReport newAccidentReport = db.Accident_AccidentReport.FirstOrDefault(e => e.AccidentReportId == accidentReport.AccidentReportId); if (newAccidentReport != null) { @@ -443,7 +443,7 @@ namespace BLL /// public static void DeleteAccidentReportById(string accidentReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReport accidentReport = db.Accident_AccidentReport.FirstOrDefault(e => e.AccidentReportId == accidentReportId); if (accidentReport != null) { diff --git a/SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs b/SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs index bdf22dd..e24d550 100644 --- a/SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs +++ b/SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class NoFourLetoffService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍥涗笉鏀捐繃 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddNoFourLetoff(Model.Accident_NoFourLetoff noFourLetoff) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_NoFourLetoff newNoFourLetoff = new Model.Accident_NoFourLetoff { NoFourLetoffId = noFourLetoff.NoFourLetoffId, @@ -62,7 +62,7 @@ namespace BLL /// public static void UpdateNoFourLetoff(Model.Accident_NoFourLetoff noFourLetoff) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_NoFourLetoff newNoFourLetoff = db.Accident_NoFourLetoff.FirstOrDefault(e => e.NoFourLetoffId == noFourLetoff.NoFourLetoffId); if (newNoFourLetoff != null) { @@ -85,7 +85,7 @@ namespace BLL /// public static void DeleteNoFourLetoffByNoFourLetoffId(string noFourLetoffId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_NoFourLetoff noFourLetoff = db.Accident_NoFourLetoff.FirstOrDefault(e => e.NoFourLetoffId == noFourLetoffId); if (noFourLetoff != null) { @@ -103,7 +103,7 @@ namespace BLL /// public static void DeleteNoFourLetoffByAccidentHandleId(string accidentHandleId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Accident_NoFourLetoff where x.AccidentHandleId == accidentHandleId select x).ToList(); if (q!=null) { diff --git a/SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs b/SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs index e0f64aa..2412587 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class Check_CheckColligationDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁缁煎悎妫鏌d鑾峰彇鎵鏈夌浉鍏虫槑缁嗕俊鎭 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddCheckColligationDetail(Model.Check_CheckColligationDetail CheckColligationDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckColligationDetail newCheckColligationDetail = new Model.Check_CheckColligationDetail { CheckColligationDetailId = CheckColligationDetail.CheckColligationDetailId, @@ -71,7 +71,7 @@ namespace BLL /// public static void UpdateCheckColligationDetail(Model.Check_CheckColligationDetail CheckColligationDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var newCheckColligationDetail = db.Check_CheckColligationDetail.FirstOrDefault(x => x.CheckColligationDetailId == CheckColligationDetail.CheckColligationDetailId); if (newCheckColligationDetail != null) { @@ -99,7 +99,7 @@ namespace BLL /// public static void DeleteCheckColligationDetails(string checkColligationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_CheckColligationDetail where x.CheckColligationId == checkColligationId select x).ToList(); if (q != null) { @@ -119,7 +119,7 @@ namespace BLL /// public static void DeleteCheckColligationDetailById(string checkColligationDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = db.Check_CheckColligationDetail.FirstOrDefault(x => x.CheckColligationDetailId == checkColligationDetailId); if (q != null) { diff --git a/SGGL/BLL/HSSE/Check/Check_CheckColligationService.cs b/SGGL/BLL/HSSE/Check/Check_CheckColligationService.cs index 0997d13..1b665bf 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckColligationService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckColligationService.cs @@ -55,7 +55,7 @@ namespace BLL /// 宸插畬鎴愮殑缁煎悎澶ф鏌ユ暣鏀规暟閲 public static int GetIsOKViolationCountByCheckTime(DateTime startTime, DateTime endTime, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.Check_CheckColligation join y in db.Check_CheckColligationDetail on x.CheckColligationId equals y.CheckColligationId where x.CheckTime >= startTime && x.CheckTime <= endTime && x.ProjectId == projectId && y.CompleteStatus != null && y.CompleteStatus == true @@ -68,7 +68,7 @@ namespace BLL /// public static void AddCheckColligation(Model.Check_CheckColligation checkColligation) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckColligation newCheckColligation = new Model.Check_CheckColligation { CheckColligationId = checkColligation.CheckColligationId, @@ -99,7 +99,7 @@ namespace BLL /// public static void UpdateCheckColligation(Model.Check_CheckColligation checkColligation) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckColligation newCheckColligation = db.Check_CheckColligation.FirstOrDefault(e => e.CheckColligationId == checkColligation.CheckColligationId); if (newCheckColligation != null) { @@ -126,7 +126,7 @@ namespace BLL /// public static void DeleteCheckColligation(string checkColligationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var checkColligation = (from x in db.Check_CheckColligation where x.CheckColligationId == checkColligationId select x).FirstOrDefault(); if (checkColligation != null) { diff --git a/SGGL/BLL/HSSE/Check/Check_CheckDayDetailService.cs b/SGGL/BLL/HSSE/Check/Check_CheckDayDetailService.cs index 22cc51e..7ddd810 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckDayDetailService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckDayDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class Check_CheckDayDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏃ュ父宸℃id鑾峰彇鎵鏈夌浉鍏虫槑缁嗕俊鎭 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddCheckDayDetail(Model.Check_CheckDayDetail CheckDayDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckDayDetail newCheckDayDetail = new Model.Check_CheckDayDetail { CheckDayDetailId = CheckDayDetail.CheckDayDetailId, @@ -72,7 +72,7 @@ namespace BLL /// public static void UpdateCheckDayDetail(Model.Check_CheckDayDetail CheckDayDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var newCheckDayDetail = db.Check_CheckDayDetail.FirstOrDefault(x => x.CheckDayDetailId == CheckDayDetail.CheckDayDetailId); if (newCheckDayDetail != null) { @@ -101,7 +101,7 @@ namespace BLL /// public static void DeleteCheckDayDetails(string checkDayId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_CheckDayDetail where x.CheckDayId == checkDayId select x).ToList(); if (q != null) { @@ -121,7 +121,7 @@ namespace BLL /// public static void DeleteCheckDayDetailById(string checkDayDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_CheckDayDetail where x.CheckDayDetailId == checkDayDetailId select x).FirstOrDefault(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Check/Check_CheckDayService.cs b/SGGL/BLL/HSSE/Check/Check_CheckDayService.cs index 6c77e77..5a364bc 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckDayService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckDayService.cs @@ -54,7 +54,7 @@ namespace BLL /// public static void AddCheckDay(Model.Check_CheckDay checkDay) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckDay newCheckDay = new Model.Check_CheckDay { CheckDayId = checkDay.CheckDayId, @@ -80,7 +80,7 @@ namespace BLL /// public static void UpdateCheckDay(Model.Check_CheckDay checkDay) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckDay newCheckDay = db.Check_CheckDay.FirstOrDefault(e => e.CheckDayId == checkDay.CheckDayId); if (newCheckDay != null) { @@ -101,7 +101,7 @@ namespace BLL /// public static void DeleteCheckDay(string checkDayId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var checkDay = (from x in db.Check_CheckDay where x.CheckDayId == checkDayId select x).FirstOrDefault(); if (checkDay != null) { diff --git a/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs b/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs index 3493aba..1d2fe4b 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class Check_CheckSpecialDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓撻」妫鏌d鑾峰彇鎵鏈夌浉鍏虫槑缁嗕俊鎭 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddCheckSpecialDetail(Model.Check_CheckSpecialDetail checkSpecialDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckSpecialDetail newCheckSpecialDetail = new Model.Check_CheckSpecialDetail { CheckSpecialDetailId = checkSpecialDetail.CheckSpecialDetailId, @@ -77,7 +77,7 @@ namespace BLL /// public static void UpdateCheckSpecialDetail(Model.Check_CheckSpecialDetail CheckSpecialDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var newCheckSpecialDetail = db.Check_CheckSpecialDetail.FirstOrDefault(x => x.CheckSpecialDetailId == CheckSpecialDetail.CheckSpecialDetailId); if (newCheckSpecialDetail != null) { @@ -112,7 +112,7 @@ namespace BLL /// public static void DeleteCheckSpecialDetails(string checkSpecialId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_CheckSpecialDetail where x.CheckSpecialId == checkSpecialId select x).ToList(); if (q != null) { @@ -132,7 +132,7 @@ namespace BLL /// public static void DeleteCheckSpecialDetailById(string checkSpecialDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_CheckSpecialDetail where x.CheckSpecialDetailId == checkSpecialDetailId select x).FirstOrDefault(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs b/SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs index e3980d0..838e8ae 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs @@ -54,7 +54,7 @@ namespace BLL /// 宸插畬鎴愮殑涓撻」妫鏌ユ暣鏀规暟閲 public static int GetIsOKViolationCountByCheckTime(DateTime startTime, DateTime endTime, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.Check_CheckSpecial join y in db.Check_CheckSpecialDetail on x.CheckSpecialId equals y.CheckSpecialId where x.CheckTime >= startTime && x.CheckTime <= endTime && x.ProjectId == projectId && y.CompleteStatus != null && y.CompleteStatus == true @@ -67,7 +67,7 @@ namespace BLL /// public static void AddCheckSpecial(Model.Check_CheckSpecial checkSpecial) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckSpecial newCheckSpecial = new Model.Check_CheckSpecial { CheckSpecialId = checkSpecial.CheckSpecialId, @@ -99,7 +99,7 @@ namespace BLL /// public static void UpdateCheckSpecial(Model.Check_CheckSpecial checkSpecial) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_CheckSpecial newCheckSpecial = db.Check_CheckSpecial.FirstOrDefault(e => e.CheckSpecialId == checkSpecial.CheckSpecialId); if (newCheckSpecial != null) { @@ -145,7 +145,7 @@ namespace BLL /// public static void DeleteCheckSpecial(string checkSpecialId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_CheckSpecial where x.CheckSpecialId == checkSpecialId select x).FirstOrDefault(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Check/Check_PauseNoticeService.cs b/SGGL/BLL/HSSE/Check/Check_PauseNoticeService.cs index 6cee70c..571fdd5 100644 --- a/SGGL/BLL/HSSE/Check/Check_PauseNoticeService.cs +++ b/SGGL/BLL/HSSE/Check/Check_PauseNoticeService.cs @@ -27,7 +27,7 @@ namespace BLL /// public static void AddPauseNotice(Model.Check_PauseNotice pauseNotice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_PauseNotice newPauseNotice = new Model.Check_PauseNotice { PauseNoticeId = pauseNotice.PauseNoticeId, @@ -79,7 +79,7 @@ namespace BLL /// public static void UpdatePauseNotice(Model.Check_PauseNotice pauseNotice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_PauseNotice newPauseNotice = db.Check_PauseNotice.FirstOrDefault(e => e.PauseNoticeId == pauseNotice.PauseNoticeId); if (newPauseNotice != null) { @@ -124,7 +124,7 @@ namespace BLL /// public static void DeletePauseNotice(string pauseNoticeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Check_PauseNotice where x.PauseNoticeId == pauseNoticeId select x).FirstOrDefault(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs b/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs index 41d5620..3a81110 100644 --- a/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs +++ b/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class Check_ProjectLeaderCheckService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇棰嗗甯︾彮妫鏌 @@ -127,7 +127,7 @@ namespace BLL /// public static void AddProjectLeaderCheck(Model.Check_ProjectLeaderCheck ProjectLeaderCheck) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_ProjectLeaderCheck newProjectLeaderCheck = new Model.Check_ProjectLeaderCheck { ProjectLeaderCheckId = ProjectLeaderCheck.ProjectLeaderCheckId, @@ -156,7 +156,7 @@ namespace BLL /// public static void UpdateProjectLeaderCheck(Model.Check_ProjectLeaderCheck ProjectLeaderCheck) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_ProjectLeaderCheck newProjectLeaderCheck = db.Check_ProjectLeaderCheck.FirstOrDefault(e => e.ProjectLeaderCheckId == ProjectLeaderCheck.ProjectLeaderCheckId); if (newProjectLeaderCheck != null) { @@ -182,7 +182,7 @@ namespace BLL /// public static void DeleteProjectLeaderCheckById(string ProjectLeaderCheckId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_ProjectLeaderCheck ProjectLeaderCheck = db.Check_ProjectLeaderCheck.FirstOrDefault(e => e.ProjectLeaderCheckId == ProjectLeaderCheckId); if (ProjectLeaderCheck != null) { diff --git a/SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs b/SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs index f1ccfad..e82c3fc 100644 --- a/SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs +++ b/SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class IncentiveNoticeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇濂栧姳閫氱煡鍗 @@ -72,7 +72,7 @@ namespace BLL /// public static decimal? GetSumMoney(string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal? sumRewardMoney = (from x in db.Check_IncentiveNotice where x.ProjectId == projectId && x.States == BLL.Const.State_2 @@ -94,7 +94,7 @@ namespace BLL /// public static decimal? GetSumMoneyByTime(DateTime startTime, DateTime endTime, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal? sumRewardMoney = (from x in db.Check_IncentiveNotice where x.IncentiveDate >= startTime && x.IncentiveDate < endTime && x.ProjectId == projectId && x.States == BLL.Const.State_2 @@ -116,7 +116,7 @@ namespace BLL /// public static decimal? GetSumMoneyByTimeAndType(DateTime startTime, DateTime endTime, string rewardType, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal? sumRewardMoney = (from x in db.Check_IncentiveNotice where x.RewardType == rewardType && @@ -135,7 +135,7 @@ namespace BLL /// public static void AddIncentiveNotice(Model.Check_IncentiveNotice incentiveNotice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_IncentiveNotice newIncentiveNotice = new Model.Check_IncentiveNotice { IncentiveNoticeId = incentiveNotice.IncentiveNoticeId, @@ -170,7 +170,7 @@ namespace BLL /// public static void UpdateIncentiveNotice(Model.Check_IncentiveNotice incentiveNotice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_IncentiveNotice newIncentiveNotice = db.Check_IncentiveNotice.FirstOrDefault(e => e.IncentiveNoticeId == incentiveNotice.IncentiveNoticeId); if (newIncentiveNotice != null) { @@ -203,7 +203,7 @@ namespace BLL /// public static void DeleteIncentiveNoticeById(string incentiveNoticeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_IncentiveNotice incentiveNotice = db.Check_IncentiveNotice.FirstOrDefault(e => e.IncentiveNoticeId == incentiveNoticeId); if (incentiveNotice != null) { diff --git a/SGGL/BLL/HSSE/Check/PunishNoticeService.cs b/SGGL/BLL/HSSE/Check/PunishNoticeService.cs index 569e09c..a12b31e 100644 --- a/SGGL/BLL/HSSE/Check/PunishNoticeService.cs +++ b/SGGL/BLL/HSSE/Check/PunishNoticeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PunishNoticeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇澶勭綒閫氱煡鍗 @@ -72,7 +72,7 @@ namespace BLL /// public static decimal? GetSumMoney(string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal? sumRewardMoney = (from x in db.Check_PunishNotice where x.ProjectId == projectId && x.States == BLL.Const.State_2 select x.PunishMoney).Sum(); @@ -92,7 +92,7 @@ namespace BLL /// public static decimal? GetSumMoneyByTime(DateTime startTime, DateTime endTime, string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal? sumRewardMoney = (from x in db.Check_PunishNotice where x.PunishNoticeDate >= startTime && x.PunishNoticeDate < endTime && x.ProjectId == projectId && x.States == BLL.Const.State_2 select x.PunishMoney).Sum(); @@ -109,7 +109,7 @@ namespace BLL /// public static void AddPunishNotice(Model.Check_PunishNotice punishNotice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_PunishNotice newPunishNotice = new Model.Check_PunishNotice { PunishNoticeId = punishNotice.PunishNoticeId, @@ -144,7 +144,7 @@ namespace BLL /// public static void UpdatePunishNotice(Model.Check_PunishNotice punishNotice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_PunishNotice newPunishNotice = db.Check_PunishNotice.FirstOrDefault(e => e.PunishNoticeId == punishNotice.PunishNoticeId); if (newPunishNotice != null) { @@ -176,7 +176,7 @@ namespace BLL /// public static void DeletePunishNoticeById(string punishNoticeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_PunishNotice punishNotice = db.Check_PunishNotice.FirstOrDefault(e => e.PunishNoticeId == punishNoticeId); if (punishNotice != null) { diff --git a/SGGL/BLL/HSSE/Check/RectifyNoticesService.cs b/SGGL/BLL/HSSE/Check/RectifyNoticesService.cs index 081b479..1932129 100644 --- a/SGGL/BLL/HSSE/Check/RectifyNoticesService.cs +++ b/SGGL/BLL/HSSE/Check/RectifyNoticesService.cs @@ -26,7 +26,7 @@ namespace BLL /// public static void AddRectifyNotices(Model.Check_RectifyNotices rectifyNotice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_RectifyNotices newRectifyNotices = new Model.Check_RectifyNotices { RectifyNoticesId = rectifyNotice.RectifyNoticesId, @@ -74,7 +74,7 @@ namespace BLL /// public static void UpdateRectifyNotices(Model.Check_RectifyNotices rectifyNotices) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_RectifyNotices newRectifyNotices = db.Check_RectifyNotices.FirstOrDefault(e => e.RectifyNoticesId == rectifyNotices.RectifyNoticesId); if (newRectifyNotices != null) { @@ -118,7 +118,7 @@ namespace BLL /// public static void DeleteRectifyNoticesById(string rectifyNoticesId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_RectifyNotices rectifyNotices = db.Check_RectifyNotices.FirstOrDefault(e => e.RectifyNoticesId == rectifyNoticesId); if (rectifyNotices != null) { diff --git a/SGGL/BLL/HSSE/Check/ViolationPersonService.cs b/SGGL/BLL/HSSE/Check/ViolationPersonService.cs index 815f17e..7a5dfa3 100644 --- a/SGGL/BLL/HSSE/Check/ViolationPersonService.cs +++ b/SGGL/BLL/HSSE/Check/ViolationPersonService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ViolationPersonService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇杩濊浜哄憳璁板綍 @@ -40,7 +40,7 @@ namespace BLL /// public static void AddViolationPerson(Model.Check_ViolationPerson violationPerson) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_ViolationPerson newViolationPerson = new Model.Check_ViolationPerson { ViolationPersonId = violationPerson.ViolationPersonId, @@ -69,7 +69,7 @@ namespace BLL /// public static void UpdateViolationPerson(Model.Check_ViolationPerson violationPerson) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_ViolationPerson newViolationPerson = db.Check_ViolationPerson.FirstOrDefault(e => e.ViolationPersonId == violationPerson.ViolationPersonId); if (newViolationPerson != null) { @@ -96,7 +96,7 @@ namespace BLL /// public static void DeleteViolationPersonById(string violationPersonId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Check_ViolationPerson violationPerson = db.Check_ViolationPerson.FirstOrDefault(e => e.ViolationPersonId == violationPersonId); if (violationPerson != null) { diff --git a/SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs b/SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs index c8c1fe1..343e98e 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class CostManageItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鍒犻櫎璐圭敤绠＄悊鏄庣粏 @@ -54,7 +54,7 @@ namespace BLL /// public static void AddCostManageItem(Model.CostGoods_CostManageItem costManageItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostManageItem newCostManageItem = new Model.CostGoods_CostManageItem { CostManageItemId = costManageItem.CostManageItemId, @@ -77,7 +77,7 @@ namespace BLL /// public static void UpdateCostManageItem(Model.CostGoods_CostManageItem costManageItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostManageItem newCostManageItem = db.CostGoods_CostManageItem.FirstOrDefault(e => e.CostManageItemId == costManageItem.CostManageItemId); if (newCostManageItem != null) { @@ -99,7 +99,7 @@ namespace BLL /// public static void DeleteCostManageItemByCostManageId(string costManageId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.CostGoods_CostManageItem where x.CostManageId == costManageId select x).ToList(); if (q != null) { @@ -114,7 +114,7 @@ namespace BLL /// public static void DeleteCostManageItemById(string costManageItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostManageItem costManageItem = db.CostGoods_CostManageItem.FirstOrDefault(e => e.CostManageItemId == costManageItemId); if (costManageItem != null) { @@ -164,7 +164,7 @@ namespace BLL public static decimal? GetCostsByUnitId(string unitId, DateTime startTime, DateTime endTime) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.CostGoods_CostManageItem join y in db.CostGoods_CostManage on x.CostManageId equals y.CostManageId diff --git a/SGGL/BLL/HSSE/CostGoods/CostManageService.cs b/SGGL/BLL/HSSE/CostGoods/CostManageService.cs index 8a88bb5..5da3e11 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostManageService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostManageService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CostManageService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏璐圭敤绠＄悊 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddCostManage(Model.CostGoods_CostManage costManage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostManage newCostManage = new Model.CostGoods_CostManage { CostManageId = costManage.CostManageId, @@ -67,7 +67,7 @@ namespace BLL /// public static void UpdateCostManage(Model.CostGoods_CostManage costManage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostManage newCostManage = db.CostGoods_CostManage.FirstOrDefault(e => e.CostManageId == costManage.CostManageId); if (newCostManage != null) { @@ -94,7 +94,7 @@ namespace BLL /// public static void DeleteCostManageById(string costManageId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostManage costManage = db.CostGoods_CostManage.FirstOrDefault(e => e.CostManageId == costManageId); if (costManage != null) { diff --git a/SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs b/SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs index 580c619..8d4bb11 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CostSmallDetailItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏璐圭敤鎶曞叆鐧昏鏄庣粏 @@ -24,7 +24,7 @@ namespace BLL public static List GetCostDetailsByUnitId(string projectId,string unitId, DateTime? startTime, DateTime? endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.CostGoods_CostSmallDetailItem join y in db.CostGoods_CostSmallDetail on x.CostSmallDetailId equals y.CostSmallDetailId @@ -45,7 +45,7 @@ namespace BLL /// public static decimal GetCostDetailsByUnitIdAndCostType(string projectId, string unitId, DateTime startTime, DateTime endTime, string costType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { decimal cost = 0; var q = from x in db.CostGoods_CostSmallDetailItem @@ -79,7 +79,7 @@ namespace BLL /// public static decimal GetCostDetailsByCostType(string projectId, DateTime startTime, DateTime endTime, string costType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { decimal cost = 0; var q = from x in db.CostGoods_CostSmallDetailItem @@ -113,7 +113,7 @@ namespace BLL /// public static decimal GetTotalCostDetailsByCostType(string projectId, string costType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { decimal cost = 0; var q = from x in db.CostGoods_CostSmallDetailItem @@ -153,7 +153,7 @@ namespace BLL /// 璐圭敤鏄庣粏瀹炰綋 public static void AddCostDetail(string costSmallDetailId, string costType, decimal costMoney, string costDef) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostSmallDetailItem newCostSmallDetailItem = new Model.CostGoods_CostSmallDetailItem { CostSmallDetailItemId = SQLHelper.GetNewID(typeof(Model.CostGoods_CostSmallDetailItem)), @@ -172,7 +172,7 @@ namespace BLL /// public static void DeleteCostSmallDetailItemById(string costSmallDetailItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostSmallDetailItem costSmallDetailItem = db.CostGoods_CostSmallDetailItem.FirstOrDefault(e => e.CostSmallDetailItemId == costSmallDetailItemId); if (costSmallDetailItem != null) { @@ -187,7 +187,7 @@ namespace BLL /// public static void DeleteCostSmallDetailItemByCostSmallDetailId(string costSmallDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.CostGoods_CostSmallDetailItem where x.CostSmallDetailId == costSmallDetailId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs b/SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs index e42d4de..d32bc7f 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CostSmallDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏璐圭敤鎶曞叆鐧昏 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddCostSmallDetail(Model.CostGoods_CostSmallDetail costSmallDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostSmallDetail newCostSmallDetail = new Model.CostGoods_CostSmallDetail { CostSmallDetailId = costSmallDetail.CostSmallDetailId, @@ -56,7 +56,7 @@ namespace BLL /// public static void UpdateCostSmallDetail(Model.CostGoods_CostSmallDetail costSmallDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostSmallDetail newCostSmallDetail = db.CostGoods_CostSmallDetail.FirstOrDefault(e => e.CostSmallDetailId == costSmallDetail.CostSmallDetailId); if (newCostSmallDetail != null) { @@ -82,7 +82,7 @@ namespace BLL /// public static void DeleteCostSmallDetailById(string costSmallDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_CostSmallDetail costSmallDetail = db.CostGoods_CostSmallDetail.FirstOrDefault(e => e.CostSmallDetailId == costSmallDetailId); if (costSmallDetail != null) { diff --git a/SGGL/BLL/HSSE/CostGoods/ExpenseDetailService.cs b/SGGL/BLL/HSSE/CostGoods/ExpenseDetailService.cs index d7168e5..1808410 100644 --- a/SGGL/BLL/HSSE/CostGoods/ExpenseDetailService.cs +++ b/SGGL/BLL/HSSE/CostGoods/ExpenseDetailService.cs @@ -39,7 +39,7 @@ namespace BLL /// public static List GetCostDetailsByUnitId(string unitId, DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.CostGoods_ExpenseDetail join y in db.CostGoods_Expense on x.ExpenseId equals y.ExpenseId @@ -58,7 +58,7 @@ namespace BLL /// public static decimal GetCostDetailsByUnitIdAndCostType(string unitId, DateTime startTime, DateTime endTime, string costType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { decimal cost = 0; var q = from x in db.CostGoods_ExpenseDetail @@ -88,7 +88,7 @@ namespace BLL /// 璐圭敤鏄庣粏瀹炰綋 public static void AddCostDetail(string expenseId, string costType, decimal costMoney, string costDef) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_ExpenseDetail newExpenseDetail = new Model.CostGoods_ExpenseDetail { ExpenseDetailId = SQLHelper.GetNewID(typeof(Model.CostGoods_ExpenseDetail)), @@ -118,7 +118,7 @@ namespace BLL /// 缂栧彿 public static void DeleteCostDetailByExpenseId(string expenseId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x).ToList(); db.CostGoods_ExpenseDetail.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/HSSE/CostGoods/ExpenseService.cs b/SGGL/BLL/HSSE/CostGoods/ExpenseService.cs index bddd00a..90a19c9 100644 --- a/SGGL/BLL/HSSE/CostGoods/ExpenseService.cs +++ b/SGGL/BLL/HSSE/CostGoods/ExpenseService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ExpenseService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鎺柦璐圭敤浣跨敤璁″垝 @@ -43,7 +43,7 @@ namespace BLL /// public static void AddExpense(Model.CostGoods_Expense expense) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_Expense newExpense = new Model.CostGoods_Expense { ExpenseId = expense.ExpenseId, @@ -74,7 +74,7 @@ namespace BLL /// public static void UpdateExpense(Model.CostGoods_Expense expense) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_Expense newExpense = db.CostGoods_Expense.FirstOrDefault(e => e.ExpenseId == expense.ExpenseId); if (newExpense != null) { @@ -103,7 +103,7 @@ namespace BLL /// public static void DeleteExpenseById(string expenseId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.CostGoods_Expense expense = db.CostGoods_Expense.FirstOrDefault(e => e.ExpenseId == expenseId); if (expense != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs b/SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs index 19cc91b..7f03f77 100644 --- a/SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public class AccidentCaseItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁甯歌浜嬫晠妗堜緥鏄庣粏Id鑾峰彇浜嬫晠妗堜緥鏄庣粏 @@ -36,7 +36,7 @@ namespace BLL /// public static void AddAccidentCaseItem(Model.EduTrain_AccidentCaseItem item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_AccidentCaseItem newItem = new Model.EduTrain_AccidentCaseItem { AccidentCaseItemId = item.AccidentCaseItemId, @@ -61,7 +61,7 @@ namespace BLL /// public static void UpdateAccidentCaseItem(Model.EduTrain_AccidentCaseItem item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_AccidentCaseItem newItem = db.EduTrain_AccidentCaseItem.FirstOrDefault(e => e.AccidentCaseItemId == item.AccidentCaseItemId); if (newItem != null) { @@ -80,7 +80,7 @@ namespace BLL /// public static void UpdateAccidentCaseItemIsPass(Model.EduTrain_AccidentCaseItem item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_AccidentCaseItem newItem = db.EduTrain_AccidentCaseItem.FirstOrDefault(e => e.AccidentCaseItemId == item.AccidentCaseItemId); if (newItem != null) { @@ -98,7 +98,7 @@ namespace BLL /// 鏁欒偛鍩硅椤笽D public static void DeleteAccidentCaseItemsByAccidentCaseId(string accidentCaseId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var accidentCaseItems = (from x in db.EduTrain_AccidentCaseItem where x.AccidentCaseId == accidentCaseId select x).ToList(); if (accidentCaseItems != null) { @@ -112,7 +112,7 @@ namespace BLL /// 甯歌浜嬫晠妗堜緥鏄庣粏涓婚敭 public static void DeleteAccidentCaseItemId(string accidentCaseItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_AccidentCaseItem item = db.EduTrain_AccidentCaseItem.FirstOrDefault(e => e.AccidentCaseItemId == accidentCaseItemId); if (item != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs b/SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs index d125034..2eea405 100644 --- a/SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs +++ b/SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs @@ -7,7 +7,7 @@ namespace BLL { public class AccidentCaseService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浜嬫晠浼ゅ鍙婇闃 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddAccidentCase(Model.EduTrain_AccidentCase accidentCase) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_AccidentCase newAccidentCase = new Model.EduTrain_AccidentCase { AccidentCaseId = accidentCase.AccidentCaseId, @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdateAccidentCase(Model.EduTrain_AccidentCase accidentCase) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_AccidentCase newAccidentCase = db.EduTrain_AccidentCase.FirstOrDefault(e => e.AccidentCaseId == accidentCase.AccidentCaseId); if (newAccidentCase != null) { @@ -62,7 +62,7 @@ namespace BLL /// public static void DeleteAccidentCaseByAccidentCaseId(string accidentCaseId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_AccidentCase accidentCase = db.EduTrain_AccidentCase.FirstOrDefault(e => e.AccidentCaseId == accidentCaseId); if (accidentCase != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs b/SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs index 7f42d3f..1245d95 100644 --- a/SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs @@ -8,7 +8,7 @@ namespace BLL /// public class CompanyTrainingItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍏徃鍩硅鏄庣粏淇℃伅 diff --git a/SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs b/SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs index d548380..83bc0c7 100644 --- a/SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs +++ b/SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs @@ -8,7 +8,7 @@ namespace BLL /// public class CompanyTrainingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍏徃鍩硅 diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs index caa16c9..354536c 100644 --- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs +++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class EduTrain_TrainRecordDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏁欒偛鍩硅涓婚敭鑾峰彇鎵鏈夌殑鏁欒偛鍩硅鏄庣粏淇℃伅 @@ -31,7 +31,7 @@ namespace BLL /// 鏁欒偛鍩硅鏄庣粏淇℃伅瀹炰綋 public static void AddTrainDetail(Model.EduTrain_TrainRecordDetail trainDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.EduTrain_TrainRecordDetail)); Model.EduTrain_TrainRecordDetail newTrainDetail = new Model.EduTrain_TrainRecordDetail { @@ -68,7 +68,7 @@ namespace BLL /// 鏁欒偛鍩硅鏄庣粏淇℃伅 public static void UpdateTrainDetail(Model.EduTrain_TrainRecordDetail trainDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_TrainRecordDetail newTrainRecordDetail = db.EduTrain_TrainRecordDetail.FirstOrDefault(e => e.TrainDetailId == trainDetail.TrainDetailId); if (newTrainRecordDetail != null) { @@ -84,7 +84,7 @@ namespace BLL /// 鏁欒偛鍩硅涓婚敭 public static void DeleteTrainDetailByTrainingId(string trainingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.EduTrain_TrainRecordDetail where x.TrainingId == trainingId select x).ToList(); if (q.Count() > 0) { @@ -99,7 +99,7 @@ namespace BLL /// public static void DeleteTrainDetailByTrainDetail(string trainDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_TrainRecordDetail trainDetails = Funs.DB.EduTrain_TrainRecordDetail.FirstOrDefault(e => e.TrainDetailId == trainDetailId); if (trainDetails != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs index c1fa375..3996db1 100644 --- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs +++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class EduTrain_TrainRecordService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏁欒偛鍩硅涓婚敭鑾峰彇鏁欒偛鍩硅淇℃伅 @@ -29,7 +29,7 @@ namespace BLL /// 鏁欒偛鍩硅瀹炰綋 public static void AddTraining(Model.EduTrain_TrainRecord training) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_TrainRecord newTraining = new Model.EduTrain_TrainRecord { TrainingId = training.TrainingId, @@ -75,7 +75,7 @@ namespace BLL /// 鏁欒偛鍩硅瀹炰綋 public static void UpdateTraining(Model.EduTrain_TrainRecord training) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_TrainRecord newTraining = db.EduTrain_TrainRecord.FirstOrDefault(e => e.TrainingId == training.TrainingId); if (newTraining != null) { @@ -113,7 +113,7 @@ namespace BLL /// 鏁欒偛鍩硅涓婚敭 public static void DeleteTrainingByTrainingId(string trainingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_TrainRecord training = db.EduTrain_TrainRecord.FirstOrDefault(e => e.TrainingId == trainingId); if (training != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs index bd05704..4efdf20 100644 --- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs +++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class EduTrain_TrainTestService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏁欒偛鍩硅涓婚敭鑾峰彇鎵鏈夌殑鏁欒偛鍩硅鏄庣粏淇℃伅 @@ -26,7 +26,7 @@ namespace BLL /// 鏁欒偛鍩硅鏄庣粏淇℃伅瀹炰綋 public static void AddTrainTest(Model.EduTrain_TrainTest trainTest) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.EduTrain_TrainTest newTrainTest = new Model.EduTrain_TrainTest { TrainTestId = trainTest.TrainTestId, @@ -58,7 +58,7 @@ namespace BLL /// 鏁欒偛鍩硅涓婚敭 public static void DeleteTrainTestByTrainingId(string trainingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.EduTrain_TrainTest where x.TrainingId == trainingId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/HSSE/EduTrain/TestPlanService.cs b/SGGL/BLL/HSSE/EduTrain/TestPlanService.cs index 90429d7..2e2b70c 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestPlanService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestPlanService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class TestPlanService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍩硅璁″垝 diff --git a/SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs b/SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs index 6e0f0e7..a759fca 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TestRecordItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鑰冭瘯璁板綍Id鑾峰彇鏄庣粏淇℃伅 diff --git a/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs b/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs index 17704d8..f66e048 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class TestRecordService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鑰冭瘯璁板綍 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddTestRecord(Model.Training_TestRecord testRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord { TestRecordId = testRecord.TestRecordId, @@ -60,7 +60,7 @@ namespace BLL /// public static void UpdateTestRecord(Model.Training_TestRecord testRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TestRecord newTestRecord = db.Training_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecord.TestRecordId); if (newTestRecord != null) { @@ -93,7 +93,7 @@ namespace BLL /// public static void DeleteTestRecordByTestRecordId(string testRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var testRecord = db.Training_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecordId); if (testRecord != null) @@ -117,7 +117,7 @@ namespace BLL public static int UpdateTestEndTimeNull(string testRecordId) { int icount = 0; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Training_TestRecord where x.TestRecordId == testRecordId diff --git a/SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs b/SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs index 53b2c24..f5c2119 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class TestTrainingItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddTestTrainingItem(Model.Training_TestTrainingItem TestTrainingItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TestTrainingItem newTestTrainingItem = new Model.Training_TestTrainingItem { TrainingItemId = TestTrainingItem.TrainingItemId, @@ -56,7 +56,7 @@ namespace BLL /// public static void UpdateTestTrainingItem(Model.Training_TestTrainingItem TestTrainingItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TestTrainingItem newTestTrainingItem = db.Training_TestTrainingItem.FirstOrDefault(e => e.TrainingItemId == TestTrainingItem.TrainingItemId); if (newTestTrainingItem != null) { @@ -84,7 +84,7 @@ namespace BLL /// public static void DeleteTestTrainingItemById(string TrainingItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TestTrainingItem TestTrainingItem = db.Training_TestTrainingItem.FirstOrDefault(e => e.TrainingItemId == TrainingItemId); if (TestTrainingItem != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs b/SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs index 56f73ca..57858ee 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class TestTrainingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddTestTraining(Model.Training_TestTraining TestTraining) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TestTraining newTestTraining = new Model.Training_TestTraining { TrainingId = TestTraining.TrainingId, @@ -44,7 +44,7 @@ namespace BLL /// public static void UpdateTestTraining(Model.Training_TestTraining TestTraining) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TestTraining newTestTraining = db.Training_TestTraining.FirstOrDefault(e => e.TrainingId == TestTraining.TrainingId); if (newTestTraining != null) { @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteTestTrainingById(string TrainingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TestTraining TestTraining = db.Training_TestTraining.FirstOrDefault(e => e.TrainingId == TrainingId); if (TestTraining != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs b/SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs index a86ab6b..b9d02d5 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainTestDBItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鍒犻櫎瀹夊叏璇曢搴撴槑缁嗕俊鎭 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddTrainTestDBItem(Model.Training_TrainTestDBItem trainTestDBItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestDBItem newTrainTestDBItem = new Model.Training_TrainTestDBItem { TrainTestItemId = trainTestDBItem.TrainTestItemId, @@ -62,7 +62,7 @@ namespace BLL /// public static void UpdateTrainTestDBItem(Model.Training_TrainTestDBItem trainTestDBItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestDBItem newTrainTestDBItem = db.Training_TrainTestDBItem.FirstOrDefault(e => e.TrainTestItemId == trainTestDBItem.TrainTestItemId); if (newTrainTestDBItem != null) { @@ -81,7 +81,7 @@ namespace BLL /// public static void UpdateTrainTestDBItemIsPass(Model.Training_TrainTestDBItem trainTestDBItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestDBItem newTrainTestDBItem = db.Training_TrainTestDBItem.FirstOrDefault(e => e.TrainTestItemId == trainTestDBItem.TrainTestItemId); if (newTrainTestDBItem != null) { @@ -99,7 +99,7 @@ namespace BLL /// public static void DeleteTrainTestDBItemById(string trainTestItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestDBItem trainTestDBItem = db.Training_TrainTestDBItem.FirstOrDefault(e => e.TrainTestItemId == trainTestItemId); if (trainTestDBItem != null) { @@ -116,7 +116,7 @@ namespace BLL /// public static void DeleteTrainTestDBItemList(string trainTestId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Training_TrainTestDBItem where x.TrainTestId == trainTestId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs b/SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs index 5878523..9e87f2a 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainTestDBService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏璇曢搴撲俊鎭 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddTrainTestDB(Model.Training_TrainTestDB trainTestDB) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestDB newTrainTestDB = new Model.Training_TrainTestDB { TrainTestId = trainTestDB.TrainTestId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateTrainTestDB(Model.Training_TrainTestDB trainTestDB) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestDB newTrainTestDB = db.Training_TrainTestDB.FirstOrDefault(e => e.TrainTestId == trainTestDB.TrainTestId); if (newTrainTestDB != null) { @@ -75,7 +75,7 @@ namespace BLL /// public static void DeleteTrainTestDB(string trainTestId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestDB trainTestDB = db.Training_TrainTestDB.FirstOrDefault(e => e.TrainTestId == trainTestId); if (trainTestDB != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/TrainTestRecordService.cs b/SGGL/BLL/HSSE/EduTrain/TrainTestRecordService.cs index 2363adb..bd7d63f 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainTestRecordService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainTestRecordService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class TrainTestRecordService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鑰冭瘯璁板綍 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddTestRecord(Model.Training_TrainTestRecord testRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestRecord newTestRecord = new Model.Training_TrainTestRecord { TrainingTestRecordId = testRecord.TrainingTestRecordId, @@ -48,7 +48,7 @@ namespace BLL /// public static void UpdateTrainTestRecord(Model.Training_TrainTestRecord testRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainTestRecord newTestRecord = db.Training_TrainTestRecord.FirstOrDefault(e => e.TrainingTestRecordId == testRecord.TrainingTestRecordId); if (newTestRecord != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs index fe33b8b..14cbe80 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public class TrainingItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// @@ -36,7 +36,7 @@ namespace BLL /// 鏁欒偛鍩硅鍐呭瀹炰綋 public static void AddTrainingItem(Model.Training_TrainingItem trainingItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainingItem newTrainingItem = new Model.Training_TrainingItem { TrainingItemId = trainingItem.TrainingItemId, @@ -65,7 +65,7 @@ namespace BLL /// 鏁欒偛鍩硅鍐呭瀹炰綋 public static void UpdateTrainingItem(Model.Training_TrainingItem trainingItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainingItem newTrainingItem = db.Training_TrainingItem.FirstOrDefault(e => e.TrainingItemId == trainingItem.TrainingItemId); if (newTrainingItem != null) { @@ -91,7 +91,7 @@ namespace BLL /// public static void UpdateTrainingItemIsPass(Model.Training_TrainingItem trainingItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_TrainingItem newTrainingItem = db.Training_TrainingItem.FirstOrDefault(e => e.TrainingItemId == trainingItem.TrainingItemId); if (newTrainingItem != null) { @@ -109,7 +109,7 @@ namespace BLL /// 鏁欒偛鍩硅椤笽D public static void DeleteTrainingItemsByTrainingId(string trainingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var trainingItems = (from x in db.Training_TrainingItem where x.TrainingId == trainingId select x).ToList(); if (trainingItems.Count() > 0) { @@ -126,7 +126,7 @@ namespace BLL /// 鏁欒偛鍩硅鍐呭ID public static void DeleteTrainingItemsByTrainingItemId(string trainingItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var trainingItem = db.Training_TrainingItem.FirstOrDefault(x => x.TrainingItemId == trainingItemId); if (trainingItem != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs index 973806d..6470931 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainingPlanItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鍩硅璁″垝鏄庣粏琛↖d鑾峰彇鎵鏈夌浉鍏虫槑缁嗕俊鎭 @@ -79,7 +79,7 @@ namespace BLL /// public static void DeletePlanItemByPlanId(string planId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var planItem = (from x in db.Training_PlanItem where x.PlanId == planId select x).ToList(); if (planItem.Count() > 0) { diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs index 5917b91..ecba009 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class TrainingPlanService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍩硅璁″垝 diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingService.cs index d0697a5..3331173 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingService.cs @@ -5,7 +5,7 @@ namespace BLL { public class TrainingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婄骇Id鏌ヨ鎵鏈夋暀鑲插煿璁富閿垪鐨勫 @@ -44,7 +44,7 @@ namespace BLL /// 鏁欒偛鍩硅瀹炰綋 public static void AddTraining(Model.Training_Training Training) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_Training newTraining = new Model.Training_Training { TrainingId = Training.TrainingId, @@ -64,7 +64,7 @@ namespace BLL /// 鏁欒偛鍩硅瀹炰綋 public static void UpdateTraining(Model.Training_Training Training) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_Training newTraining = db.Training_Training.First(e => e.TrainingId == Training.TrainingId); newTraining.TrainingCode = Training.TrainingCode; newTraining.TrainingName = Training.TrainingName; @@ -80,7 +80,7 @@ namespace BLL /// 鏁欒偛鍩硅ID public static void DeleteTrainingByTrainingId(string TrainingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Training_Training Training = db.Training_Training.FirstOrDefault(e => e.TrainingId == TrainingId); if (Training != null) { @@ -96,7 +96,7 @@ namespace BLL /// 涓婄骇Id public static void DeleteTrainingBySupItem(string supItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Training_Training where x.SupTrainingId == supItem select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs index 077fc56..643739d 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class TrainingTaskService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍩硅浠诲姟 @@ -89,7 +89,7 @@ namespace BLL /// public static void DeleteTaskByPlanId(string planId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var tasks = from x in db.Training_Task where x.PlanId == planId select x; if (tasks.Count() > 0) { diff --git a/SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs b/SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs index e480d9d..98dc379 100644 --- a/SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs +++ b/SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class DrillRecordListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ユ紨缁 @@ -75,7 +75,7 @@ namespace BLL /// public static void AddDrillRecordList(Model.Emergency_DrillRecordList DrillRecordList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_DrillRecordList newDrillRecordList = new Model.Emergency_DrillRecordList { DrillRecordListId = DrillRecordList.DrillRecordListId, @@ -108,7 +108,7 @@ namespace BLL /// public static void UpdateDrillRecordList(Model.Emergency_DrillRecordList DrillRecordList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_DrillRecordList newDrillRecordList = db.Emergency_DrillRecordList.FirstOrDefault(e => e.DrillRecordListId == DrillRecordList.DrillRecordListId); if (newDrillRecordList != null) { @@ -137,7 +137,7 @@ namespace BLL /// public static void DeleteDrillRecordListById(string DrillRecordListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_DrillRecordList DrillRecordList = db.Emergency_DrillRecordList.FirstOrDefault(e => e.DrillRecordListId == DrillRecordListId); if (DrillRecordList != null) { diff --git a/SGGL/BLL/HSSE/Emergency/EmergencyListService.cs b/SGGL/BLL/HSSE/Emergency/EmergencyListService.cs index 99ced9e..7039b99 100644 --- a/SGGL/BLL/HSSE/Emergency/EmergencyListService.cs +++ b/SGGL/BLL/HSSE/Emergency/EmergencyListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EmergencyListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ラ妗堢鐞 @@ -42,7 +42,7 @@ namespace BLL /// 搴旀ラ妗堝疄浣撻泦鍚 public static List GetEmergencyListsByEmergencyType(string emergencyType, string projectId, DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Emergency_EmergencyList join y in db.Base_EmergencyType @@ -60,7 +60,7 @@ namespace BLL /// 鍏朵粬搴旀ラ妗堝疄浣撻泦鍚 public static List GetOtherEmergencyListsByEmergencyType(string emergencyType, string projectId, DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Emergency_EmergencyList join y in db.Base_EmergencyType @@ -76,7 +76,7 @@ namespace BLL /// public static void AddEmergencyList(Model.Emergency_EmergencyList EmergencyList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyList newEmergencyList = new Model.Emergency_EmergencyList { EmergencyListId = EmergencyList.EmergencyListId, @@ -106,7 +106,7 @@ namespace BLL /// public static void UpdateEmergencyList(Model.Emergency_EmergencyList EmergencyList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyList newEmergencyList = db.Emergency_EmergencyList.FirstOrDefault(e => e.EmergencyListId == EmergencyList.EmergencyListId); if (newEmergencyList != null) { @@ -132,7 +132,7 @@ namespace BLL /// public static void DeleteEmergencyListById(string EmergencyListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyList EmergencyList = db.Emergency_EmergencyList.FirstOrDefault(e => e.EmergencyListId == EmergencyListId); if (EmergencyList != null) { diff --git a/SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs b/SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs index df400b5..4008a07 100644 --- a/SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs +++ b/SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EmergencySupplyService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ョ墿璧勭鐞 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEmergencySupply(Model.Emergency_EmergencySupply EmergencySupply) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencySupply newEmergencySupply = new Model.Emergency_EmergencySupply { FileId = EmergencySupply.FileId, @@ -54,7 +54,7 @@ namespace BLL /// public static void UpdateEmergencySupply(Model.Emergency_EmergencySupply EmergencySupply) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencySupply newEmergencySupply = db.Emergency_EmergencySupply.FirstOrDefault(e => e.FileId == EmergencySupply.FileId); if (newEmergencySupply != null) { @@ -76,7 +76,7 @@ namespace BLL /// public static void DeleteEmergencySupplyById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencySupply EmergencySupply = db.Emergency_EmergencySupply.FirstOrDefault(e => e.FileId == FileId); if (EmergencySupply != null) { diff --git a/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs b/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs index 2442349..ba7799b 100644 --- a/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs +++ b/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EmergencyTeamAndTrainService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ラ槦浼/鍩硅 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEmergencyTeamAndTrain(Model.Emergency_EmergencyTeamAndTrain EmergencyTeamAndTrain) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyTeamAndTrain newEmergencyTeamAndTrain = new Model.Emergency_EmergencyTeamAndTrain { FileId = EmergencyTeamAndTrain.FileId, @@ -54,7 +54,7 @@ namespace BLL /// public static void UpdateEmergencyTeamAndTrain(Model.Emergency_EmergencyTeamAndTrain EmergencyTeamAndTrain) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyTeamAndTrain newEmergencyTeamAndTrain = db.Emergency_EmergencyTeamAndTrain.FirstOrDefault(e => e.FileId == EmergencyTeamAndTrain.FileId); if (newEmergencyTeamAndTrain != null) { @@ -76,7 +76,7 @@ namespace BLL /// public static void DeleteEmergencyTeamAndTrainById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyTeamAndTrain EmergencyTeamAndTrain = db.Emergency_EmergencyTeamAndTrain.FirstOrDefault(e => e.FileId == FileId); if (EmergencyTeamAndTrain != null) { @@ -97,7 +97,7 @@ namespace BLL /// public static void AddEmergencyTeamItem(Model.Emergency_EmergencyTeamItem item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyTeamItem newItem = new Model.Emergency_EmergencyTeamItem { EmergencyTeamItemId = item.EmergencyTeamItemId, @@ -115,7 +115,7 @@ namespace BLL /// public static void DeleteEmergency_EmergencyTeamItem(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var delItem = from x in db.Emergency_EmergencyTeamItem where x.FileId == FileId select x; if (delItem.Count() > 0) { diff --git a/SGGL/BLL/HSSE/Environmental/EIAReportService.cs b/SGGL/BLL/HSSE/Environmental/EIAReportService.cs index e6d418f..5ec37a9 100644 --- a/SGGL/BLL/HSSE/Environmental/EIAReportService.cs +++ b/SGGL/BLL/HSSE/Environmental/EIAReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EIAReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐜瘎鎶ュ憡 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEIAReport(Model.Environmental_EIAReport EIAReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EIAReport newEIAReport = new Model.Environmental_EIAReport { FileId = EIAReport.FileId, @@ -53,7 +53,7 @@ namespace BLL /// public static void UpdateEIAReport(Model.Environmental_EIAReport EIAReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EIAReport newEIAReport = db.Environmental_EIAReport.FirstOrDefault(e => e.FileId == EIAReport.FileId); if (newEIAReport != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeleteEIAReportById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EIAReport EIAReport = db.Environmental_EIAReport.FirstOrDefault(e => e.FileId == FileId); if (EIAReport != null) { diff --git a/SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs b/SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs index bccd0b6..62f6c9a 100644 --- a/SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs +++ b/SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EnvironmentalEmergencyPlanService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐜浜嬩欢搴旀ラ妗 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEnvironmentalEmergencyPlan(Model.Environmental_EnvironmentalEmergencyPlan EnvironmentalEmergencyPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EnvironmentalEmergencyPlan newEnvironmentalEmergencyPlan = new Model.Environmental_EnvironmentalEmergencyPlan { FileId = EnvironmentalEmergencyPlan.FileId, @@ -53,7 +53,7 @@ namespace BLL /// public static void UpdateEnvironmentalEmergencyPlan(Model.Environmental_EnvironmentalEmergencyPlan EnvironmentalEmergencyPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EnvironmentalEmergencyPlan newEnvironmentalEmergencyPlan = db.Environmental_EnvironmentalEmergencyPlan.FirstOrDefault(e => e.FileId == EnvironmentalEmergencyPlan.FileId); if (newEnvironmentalEmergencyPlan != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeleteEnvironmentalEmergencyPlanById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EnvironmentalEmergencyPlan EnvironmentalEmergencyPlan = db.Environmental_EnvironmentalEmergencyPlan.FirstOrDefault(e => e.FileId == FileId); if (EnvironmentalEmergencyPlan != null) { diff --git a/SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs b/SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs index e41fc3c..cdb3e4b 100644 --- a/SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs +++ b/SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EnvironmentalMonitoringService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐜鐩戞祴鏁版嵁 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEnvironmentalMonitoring(Model.Environmental_EnvironmentalMonitoring EnvironmentalMonitoring) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EnvironmentalMonitoring newEnvironmentalMonitoring = new Model.Environmental_EnvironmentalMonitoring { FileId = EnvironmentalMonitoring.FileId, @@ -53,7 +53,7 @@ namespace BLL /// public static void UpdateEnvironmentalMonitoring(Model.Environmental_EnvironmentalMonitoring EnvironmentalMonitoring) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EnvironmentalMonitoring newEnvironmentalMonitoring = db.Environmental_EnvironmentalMonitoring.FirstOrDefault(e => e.FileId == EnvironmentalMonitoring.FileId); if (newEnvironmentalMonitoring != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeleteEnvironmentalMonitoringById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EnvironmentalMonitoring EnvironmentalMonitoring = db.Environmental_EnvironmentalMonitoring.FirstOrDefault(e => e.FileId == FileId); if (EnvironmentalMonitoring != null) { diff --git a/SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs b/SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs index d623e8d..5e219ff 100644 --- a/SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs +++ b/SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class UnexpectedEnvironmentalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇绐佸彂鐜浜嬩欢 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddUnexpectedEnvironmental(Model.Environmental_UnexpectedEnvironmental UnexpectedEnvironmental) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_UnexpectedEnvironmental newUnexpectedEnvironmental = new Model.Environmental_UnexpectedEnvironmental { FileId = UnexpectedEnvironmental.FileId, @@ -53,7 +53,7 @@ namespace BLL /// public static void UpdateUnexpectedEnvironmental(Model.Environmental_UnexpectedEnvironmental UnexpectedEnvironmental) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_UnexpectedEnvironmental newUnexpectedEnvironmental = db.Environmental_UnexpectedEnvironmental.FirstOrDefault(e => e.FileId == UnexpectedEnvironmental.FileId); if (newUnexpectedEnvironmental != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeleteUnexpectedEnvironmentalById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_UnexpectedEnvironmental UnexpectedEnvironmental = db.Environmental_UnexpectedEnvironmental.FirstOrDefault(e => e.FileId == FileId); if (UnexpectedEnvironmental != null) { diff --git a/SGGL/BLL/HSSE/Epidemic/Epidemic_MaterialService.cs b/SGGL/BLL/HSSE/Epidemic/Epidemic_MaterialService.cs index 5804da2..085042a 100644 --- a/SGGL/BLL/HSSE/Epidemic/Epidemic_MaterialService.cs +++ b/SGGL/BLL/HSSE/Epidemic/Epidemic_MaterialService.cs @@ -22,7 +22,7 @@ namespace BLL /// public static void AddMaterial(Model.Epidemic_Material material) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Epidemic_Material newMaterial = new Epidemic_Material { MaterialId = material.MaterialId, @@ -45,7 +45,7 @@ namespace BLL /// public static void UpdateMaterial(Model.Epidemic_Material material) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Epidemic_Material newMaterial = db.Epidemic_Material.FirstOrDefault(e => e.MaterialId == material.MaterialId); if (newMaterial != null) { @@ -68,7 +68,7 @@ namespace BLL /// public static void DeleteMaterialByMaterialId(string materialId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Epidemic_Material delMaterial = db.Epidemic_Material.FirstOrDefault(e => e.MaterialId == materialId); if (delMaterial != null) { diff --git a/SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs b/SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs index 9b83c2c..8d8dbd8 100644 --- a/SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs +++ b/SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class HSSEMainDutyService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏涓讳綋璐ｄ换 @@ -36,7 +36,7 @@ namespace BLL /// public static void AddHSSEMainDuty(Model.HSSESystem_HSSEMainDuty hsseMainDuty) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSESystem_HSSEMainDuty newHSSEMainDuty = new Model.HSSESystem_HSSEMainDuty { HSSEMainDutyId = hsseMainDuty.HSSEMainDutyId, @@ -55,7 +55,7 @@ namespace BLL /// public static void UpdateHSSEMainDuty(Model.HSSESystem_HSSEMainDuty hsseMainDuty) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSESystem_HSSEMainDuty newHSSEMainDuty = db.HSSESystem_HSSEMainDuty.FirstOrDefault(e => e.HSSEMainDutyId == hsseMainDuty.HSSEMainDutyId); if (newHSSEMainDuty != null) { @@ -72,7 +72,7 @@ namespace BLL /// public static void DeleteHSSEMainDuty(string hsseMainDutyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSESystem_HSSEMainDuty hsseMainDuty = db.HSSESystem_HSSEMainDuty.FirstOrDefault(e => e.HSSEMainDutyId == hsseMainDutyId); if (hsseMainDuty != null) { diff --git a/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs b/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs index 3ffc541..2c5c3df 100644 --- a/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs +++ b/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs @@ -7,7 +7,7 @@ namespace BLL /// public static class ServerSafetyInstitutionService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏鍒跺害 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddSafetyInstitution(Model.HSSESystem_SafetyInstitution safetyInstitution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSESystem_SafetyInstitution newSafetyInstitution = new Model.HSSESystem_SafetyInstitution { SafetyInstitutionId = safetyInstitution.SafetyInstitutionId, @@ -45,7 +45,7 @@ namespace BLL /// public static void UpdateSafetyInstitution(Model.HSSESystem_SafetyInstitution safetyInstitution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSESystem_SafetyInstitution newSafetyInstitution = db.HSSESystem_SafetyInstitution.FirstOrDefault(e => e.SafetyInstitutionId == safetyInstitution.SafetyInstitutionId); if (newSafetyInstitution != null) { @@ -64,7 +64,7 @@ namespace BLL /// public static void DeleteSafetyInstitutionById(string safetyInstitutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSESystem_SafetyInstitution safetyInstitution = db.HSSESystem_SafetyInstitution.FirstOrDefault(e => e.SafetyInstitutionId == safetyInstitutionId); if (safetyInstitution != null) { diff --git a/SGGL/BLL/HSSE/Hazard/ConstructionRiskApproveService.cs b/SGGL/BLL/HSSE/Hazard/ConstructionRiskApproveService.cs index b9c3202..48d75f1 100644 --- a/SGGL/BLL/HSSE/Hazard/ConstructionRiskApproveService.cs +++ b/SGGL/BLL/HSSE/Hazard/ConstructionRiskApproveService.cs @@ -7,7 +7,7 @@ namespace BLL { public class ConstructionRiskApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇椋庨櫓绠℃帶妯℃澘鍒楄〃 /// @@ -37,7 +37,7 @@ namespace BLL /// 椋庨櫓绠℃帶缂栧彿 public static void DeleteConstructionRiskApprovesByConstructionRiskId(string ConstructionRiskId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.HSSE_ConstructionRiskApprove where x.ConstructionRiskId == ConstructionRiskId select x).ToList(); db.HSSE_ConstructionRiskApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -50,7 +50,7 @@ namespace BLL /// public static IQueryable getList(string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var res = from x in db.HSSE_ConstructionRiskApprove join ca in db.HSSE_ConstructionRisk on x.ConstructionRiskId equals ca.ConstructionRiskId @@ -80,7 +80,7 @@ namespace BLL } public static void See(string ConstructionRiskId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.HSSE_ConstructionRiskApprove.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -105,7 +105,7 @@ namespace BLL /// 椋庨櫓绠℃帶瀹℃壒瀹炰綋 public static void UpdateConstructionRiskApprove(Model.HSSE_ConstructionRiskApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRiskApprove newApprove = db.HSSE_ConstructionRiskApprove.First(e => e.ConstructionRiskApproveId == approve.ConstructionRiskApproveId && e.ApproveDate == null); newApprove.ConstructionRiskId = approve.ConstructionRiskId; newApprove.ApproveMan = approve.ApproveMan; @@ -122,7 +122,7 @@ namespace BLL /// 椋庨櫓绠℃帶瀹℃壒瀹炰綋 public static void AddConstructionRiskApprove(Model.HSSE_ConstructionRiskApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.HSSE_ConstructionRiskApprove)); Model.HSSE_ConstructionRiskApprove newApprove = new Model.HSSE_ConstructionRiskApprove(); newApprove.ConstructionRiskApproveId = newKeyID; @@ -138,7 +138,7 @@ namespace BLL } public static string AddConstructionRiskApproveForApi(Model.HSSE_ConstructionRiskApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.HSSE_ConstructionRiskApprove)); Model.HSSE_ConstructionRiskApprove newApprove = new Model.HSSE_ConstructionRiskApprove(); @@ -191,7 +191,7 @@ namespace BLL } public static List GetListDataByCodeForApi(string code) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.HSSE_ConstructionRiskApprove where x.ConstructionRiskId == code && x.ApproveDate != null && x.ApproveType != "S" @@ -225,7 +225,7 @@ namespace BLL } public static Model.HSSE_ConstructionRiskApprove getCurrApproveForApi(string ConstructionRiskId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.HSSE_ConstructionRiskApprove newApprove = db.HSSE_ConstructionRiskApprove.FirstOrDefault(e => e.ConstructionRiskId == ConstructionRiskId && e.ApproveType != "S" && e.ApproveDate == null); if (newApprove != null) @@ -237,7 +237,7 @@ namespace BLL } public static void UpdateConstructionRiskApproveForApi(Model.HSSE_ConstructionRiskApprove approve) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.HSSE_ConstructionRiskApprove newApprove = db.HSSE_ConstructionRiskApprove.FirstOrDefault(e => e.ConstructionRiskApproveId == approve.ConstructionRiskApproveId && e.ApproveDate == null); if (newApprove != null) diff --git a/SGGL/BLL/HSSE/Hazard/ConstructionRiskCheckService.cs b/SGGL/BLL/HSSE/Hazard/ConstructionRiskCheckService.cs index f01e479..be64662 100644 --- a/SGGL/BLL/HSSE/Hazard/ConstructionRiskCheckService.cs +++ b/SGGL/BLL/HSSE/Hazard/ConstructionRiskCheckService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class ConstructionRiskCheckService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 瑕佹眰涓婚敭鑾峰彇鍗遍櫓娓呭崟淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddConstructionRiskCheck(Model.HSSE_ConstructionRiskCheck ConstructionRiskCheck) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRiskCheck newConstructionRiskCheck = new Model.HSSE_ConstructionRiskCheck { ConstructionRiskCheckId = ConstructionRiskCheck.ConstructionRiskCheckId, @@ -46,7 +46,7 @@ namespace BLL /// public static void UpdateConstructionRiskCheck(Model.HSSE_ConstructionRiskCheck hazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRiskCheck newHazardList = db.HSSE_ConstructionRiskCheck.FirstOrDefault(e => e.ConstructionRiskCheckId == hazardList.ConstructionRiskCheckId); if (newHazardList != null) { @@ -64,7 +64,7 @@ namespace BLL /// public static void DeleteConstructionRiskCheck(string ConstructionRiskCheckId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRiskCheck hazardList = db.HSSE_ConstructionRiskCheck.FirstOrDefault(e => e.ConstructionRiskCheckId == ConstructionRiskCheckId); if (hazardList != null) { diff --git a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs index e9da6cf..05a3bf3 100644 --- a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs +++ b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class ConstructionRiskListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 瑕佹眰涓婚敭鑾峰彇鍗遍櫓娓呭崟淇℃伅 @@ -30,7 +30,7 @@ namespace BLL /// public static void AddConstructionRisk(Model.HSSE_ConstructionRisk constructionRisk) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRisk newconstructionRisk = new Model.HSSE_ConstructionRisk { ProjectId = constructionRisk.ProjectId, @@ -56,7 +56,7 @@ namespace BLL public static void AddConstructionRiskControl(Model.HSSE_ConstructionRiskControl constructionRiskControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRiskControl newconstructionRisk = new Model.HSSE_ConstructionRiskControl { @@ -73,7 +73,7 @@ namespace BLL } public static void UpdateConstructionRiskControl(Model.HSSE_ConstructionRiskControl constructionRiskControl) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRiskControl newconstructionRisk = Funs.DB.HSSE_ConstructionRiskControl.FirstOrDefault(x => x.ControlId == constructionRiskControl.ControlId); if (newconstructionRisk != null) @@ -91,7 +91,7 @@ namespace BLL } public static void AddConstructionRiskControl(List constructionRisk, string constructionRiskId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; int i = 1; var cons = Funs.DB.HSSE_ConstructionRiskControl.Where(x => x.ConstructionRiskId == constructionRiskId); @@ -122,7 +122,7 @@ namespace BLL /// public static void UpdateConstructionRisk(Model.HSSE_ConstructionRisk hazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRisk newHazardList = db.HSSE_ConstructionRisk.FirstOrDefault(e => e.ConstructionRiskId == hazardList.ConstructionRiskId); if (newHazardList != null) { @@ -153,7 +153,7 @@ namespace BLL /// public static void DeleteConstructionRisk(string constructionRiskId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_ConstructionRisk hazardList = db.HSSE_ConstructionRisk.FirstOrDefault(e => e.ConstructionRiskId == constructionRiskId); if (hazardList != null) { diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs index 54cba9b..c55d01e 100644 --- a/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs +++ b/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs @@ -5,7 +5,7 @@ namespace BLL { public static class Hazard_EnvironmentalRiskItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鍗遍櫓婧愭槑缁嗚〃id寰楀埌鏄庣粏淇℃伅 @@ -43,7 +43,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟瀹炰綋 public static void AddEnvironmentalRiskItem(Model.Hazard_EnvironmentalRiskItem environmentalRiskItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_EnvironmentalRiskItem newEnvironmentalRiskItem = new Model.Hazard_EnvironmentalRiskItem { EnvironmentalRiskItemId = environmentalRiskItem.EnvironmentalRiskItemId, @@ -105,7 +105,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟Id public static void DeleteEnvironmentalRiskItemById(string environmentalRiskItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_EnvironmentalRiskItem newEnvironmentalRiskItem = db.Hazard_EnvironmentalRiskItem.FirstOrDefault(e => e.EnvironmentalRiskItemId == environmentalRiskItemId); if (newEnvironmentalRiskItem != null) { @@ -120,7 +120,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟Id public static void DeleteEnvironmentalRiskItemByRiskListId(string environmentalRiskListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var newEnvironmentalRiskItem = from x in db.Hazard_EnvironmentalRiskItem where x.EnvironmentalRiskListId == environmentalRiskListId select x; if (newEnvironmentalRiskItem.Count() > 0) { diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs index 958970e..9f1d155 100644 --- a/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs +++ b/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class Hazard_EnvironmentalRiskListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 瑕佹眰涓婚敭鑾峰彇鍗遍櫓娓呭崟淇℃伅 @@ -40,7 +40,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟瀹炰綋 public static void AddEnvironmentalRiskList(Model.Hazard_EnvironmentalRiskList environmentalRiskList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_EnvironmentalRiskList newEnvironmentalRiskList = new Model.Hazard_EnvironmentalRiskList { EnvironmentalRiskListId = environmentalRiskList.EnvironmentalRiskListId, @@ -68,7 +68,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟瀹炰綋 public static void UpdateEnvironmentalRiskList(Model.Hazard_EnvironmentalRiskList environmentalRiskList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_EnvironmentalRiskList newEnvironmentalRiskList = db.Hazard_EnvironmentalRiskList.FirstOrDefault(e => e.EnvironmentalRiskListId == environmentalRiskList.EnvironmentalRiskListId); if (newEnvironmentalRiskList != null) { @@ -91,7 +91,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟Id public static void DeleteEnvironmentalRiskListById(string environmentalRiskListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_EnvironmentalRiskList newEnvironmentalRiskList = db.Hazard_EnvironmentalRiskList.FirstOrDefault(e => e.EnvironmentalRiskListId == environmentalRiskListId); if (newEnvironmentalRiskList != null) { diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs index ae2f100..3b7dd19 100644 --- a/SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs +++ b/SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class Hazard_HazardListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 瑕佹眰涓婚敭鑾峰彇鍗遍櫓娓呭崟淇℃伅 @@ -49,7 +49,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟瀹炰綋 public static void AddHazardList(Model.Hazard_HazardList hazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_HazardList newHazardList = new Model.Hazard_HazardList { HazardListId = hazardList.HazardListId, @@ -77,7 +77,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟瀹炰綋 public static void UpdateHazardList(Model.Hazard_HazardList hazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_HazardList newHazardList = db.Hazard_HazardList.FirstOrDefault(e => e.HazardListId == hazardList.HazardListId); if (newHazardList != null) { @@ -102,7 +102,7 @@ namespace BLL /// 鍗遍櫓婧愯鲸璇嗕笌璇勪环娓呭崟Id public static void DeleteHazardListByHazardListId(string hazardListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_HazardList hazardList = db.Hazard_HazardList.FirstOrDefault(e => e.HazardListId == hazardListId); if (hazardList != null) { diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs index fb5208d..1321f03 100644 --- a/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs +++ b/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Hazard_HazardSelectedItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鍗遍櫓婧愮被鍒紪鍙锋煡璇㈠嵄闄╂簮绫诲埆 @@ -165,7 +165,7 @@ namespace BLL /// 鍗遍櫓婧愬疄浣 public static void AddHazardSelectedItem(Model.Hazard_HazardSelectedItem hazardSelectedItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_HazardSelectedItem newHazardSelectedItem = new Model.Hazard_HazardSelectedItem { HazardSelectedItemId = hazardSelectedItem.HazardSelectedItemId, @@ -203,7 +203,7 @@ namespace BLL /// 鍗遍櫓婧愬疄浣 public static void UpdateHazardSelectedItem(Model.Hazard_HazardSelectedItem hazardSelectedItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_HazardSelectedItem newHazardSelectedItem = db.Hazard_HazardSelectedItem.FirstOrDefault(e => e.HazardSelectedItemId == hazardSelectedItem.HazardSelectedItemId); if (newHazardSelectedItem != null) { @@ -242,7 +242,7 @@ namespace BLL /// 鍗遍櫓婧愮被鍒富閿 public static void DeleteHazardSelectedItemByHazardListId(string hazardListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Hazard_HazardSelectedItem where x.HazardListId == hazardListId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs index 7da1844..0a47767 100644 --- a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs +++ b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class HSSE_Hazard_HazardRegisterService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鍗遍櫓瑙傚療鐧昏涓婚敭鑾峰彇鍗遍櫓瑙傚療鐧昏淇℃伅 @@ -40,7 +40,7 @@ namespace BLL /// 鍗遍櫓瑙傚療鐧昏瀹炰綋 public static void AddHazardRegister(Model.HSSE_Hazard_HazardRegister model) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Hazard_HazardRegister newModel = new Model.HSSE_Hazard_HazardRegister(); newModel.HazardRegisterId = model.HazardRegisterId; newModel.HazardCode = model.HazardCode; @@ -87,7 +87,7 @@ namespace BLL /// 鍗遍櫓瑙傚療鐧昏瀹炰綋 public static void UpdateHazardRegister(Model.HSSE_Hazard_HazardRegister model) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Hazard_HazardRegister newModel = db.HSSE_Hazard_HazardRegister.FirstOrDefault(e => e.HazardRegisterId == model.HazardRegisterId); if (newModel != null) { @@ -143,7 +143,7 @@ namespace BLL /// 鍗遍櫓瑙傚療鐧昏涓婚敭 public static void DeleteHazardRegisterByHazardRegisterId(string hazardRegisterId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Hazard_HazardRegister model = db.HSSE_Hazard_HazardRegister.FirstOrDefault(e => e.HazardRegisterId == hazardRegisterId); if (model != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs index b1e164b..c927ceb 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentInItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗圭璁惧鏈哄叿鍏ュ満鎶ユ壒鏄庣粏淇℃伅 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddEquipmentInItem(Model.InApproveManager_EquipmentInItem equipmentInItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentInItem newEquipmentItem = new Model.InApproveManager_EquipmentInItem { EquipmentInItemId = equipmentInItem.EquipmentInItemId, @@ -65,7 +65,7 @@ namespace BLL /// public static void UpdateEquipmentInItem(Model.InApproveManager_EquipmentInItem equipmentInItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentInItem newEquipmentItem = db.InApproveManager_EquipmentInItem.FirstOrDefault(e => e.EquipmentInItemId == equipmentInItem.EquipmentInItemId); if (newEquipmentItem != null) { @@ -91,7 +91,7 @@ namespace BLL /// public static void DeleteEquipmentInItemById(string equipmentInItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentInItem equipmenetInItem = db.InApproveManager_EquipmentInItem.FirstOrDefault(e => e.EquipmentInItemId == equipmentInItemId); if (equipmenetInItem != null) { @@ -106,7 +106,7 @@ namespace BLL /// public static void DeleteEquipmentInItemByEquipmentInId(string equipmentInId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.InApproveManager_EquipmentInItem where x.EquipmentInId == equipmentInId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs index 92b2391..ac09b36 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentInService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗圭璁惧鏈哄叿鍏ュ満鎶ユ壒 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEquipmentIn(Model.InApproveManager_EquipmentIn equipmentIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentIn newEquipmenteIn = new Model.InApproveManager_EquipmentIn { EquipmentInId = equipmentIn.EquipmentInId, @@ -55,7 +55,7 @@ namespace BLL /// public static void UpdateEquipmentIn(Model.InApproveManager_EquipmentIn equipmentIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentIn newEquipmenteIn = db.InApproveManager_EquipmentIn.FirstOrDefault(e => e.EquipmentInId == equipmentIn.EquipmentInId); if (newEquipmenteIn != null) { @@ -79,7 +79,7 @@ namespace BLL /// public static void DeleteEquipmentInById(string equipmentInId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentIn equipmentIn = db.InApproveManager_EquipmentIn.FirstOrDefault(e => e.EquipmentInId == equipmentInId); if (equipmentIn != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs index 3f33dc1..20cc473 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentOutItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗圭璁惧鏈哄叿鍑哄満鎶ユ壒鏄庣粏 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddEquipmentOutItem(Model.InApproveManager_EquipmentOutItem equipmentOutItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentOutItem newEquipmentOutItem = new Model.InApproveManager_EquipmentOutItem { EquipmentOutItemId = equipmentOutItem.EquipmentOutItemId, @@ -60,7 +60,7 @@ namespace BLL /// public static void UpdateEquipmentItemOut(Model.InApproveManager_EquipmentOutItem equipmentOutItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentOutItem newEquipmentOutItem = db.InApproveManager_EquipmentOutItem.FirstOrDefault(e => e.EquipmentOutItemId == equipmentOutItem.EquipmentOutItemId); if (newEquipmentOutItem != null) { @@ -81,7 +81,7 @@ namespace BLL /// public static void DeleteEquipmentOutItemById(string equipmentOutItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentOutItem equipmentOutItem = db.InApproveManager_EquipmentOutItem.FirstOrDefault(e => e.EquipmentOutItemId == equipmentOutItemId); if (equipmentOutItem != null) { @@ -96,7 +96,7 @@ namespace BLL /// public static void DeleteEquipmentOutItemByEqupmentOutId(string equipmentOutId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.InApproveManager_EquipmentOutItem where x.EquipmentOutId == equipmentOutId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs index 97e2170..7878b50 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentOutService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗圭璁惧鏈哄叿鍑哄満鎶ユ壒 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEquipmentOut(Model.InApproveManager_EquipmentOut equipmentOut) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentOut newEquipmentOut = new Model.InApproveManager_EquipmentOut { EquipmentOutId = equipmentOut.EquipmentOutId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateEquipmentOut(Model.InApproveManager_EquipmentOut equipmentOut) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentOut newEquipmentOut = db.InApproveManager_EquipmentOut.FirstOrDefault(e => e.EquipmentOutId == equipmentOut.EquipmentOutId); if (newEquipmentOut != null) { @@ -83,7 +83,7 @@ namespace BLL /// public static void DeleteEquipmentOutById(string equipmentOutId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentOut equipmentOut = db.InApproveManager_EquipmentOut.FirstOrDefault(e => e.EquipmentOutId == equipmentOutId); if (equipmentOut != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs index f47b585..5b70845 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentQualityInItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓昏〃ID鑾峰彇鏄庣粏淇℃伅 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEquipmentQualityInItem(Model.InApproveManager_EquipmentQualityInItem EquipmentQualityInItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentQualityInItem newEquipmentQualityInItem = new Model.InApproveManager_EquipmentQualityInItem { EquipmentQualityInItemId = EquipmentQualityInItem.EquipmentQualityInItemId, @@ -64,7 +64,7 @@ namespace BLL /// public static void DeleteEquipmentQualityInItemByEquipmentQualityInId(string EquipmentQualityInId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.InApproveManager_EquipmentQualityInItem where x.EquipmentQualityInId == EquipmentQualityInId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs index fc69166..5716dcf 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentQualityInService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗圭璁惧瀹℃壒 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddEquipmentQualityIn(Model.InApproveManager_EquipmentQualityIn EquipmentQualityIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentQualityIn newEquipmentQualityIn = new Model.InApproveManager_EquipmentQualityIn { EquipmentQualityInId = EquipmentQualityIn.EquipmentQualityInId, @@ -52,7 +52,7 @@ namespace BLL /// public static void UpdateEquipmentQualityIn(Model.InApproveManager_EquipmentQualityIn EquipmentQualityIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentQualityIn newEquipmentQualityIn = db.InApproveManager_EquipmentQualityIn.FirstOrDefault(e => e.EquipmentQualityInId == EquipmentQualityIn.EquipmentQualityInId); if (newEquipmentQualityIn != null) { @@ -75,7 +75,7 @@ namespace BLL /// public static void DeleteEquipmentQualityInById(string EquipmentQualityInId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_EquipmentQualityIn EquipmentQualityIn = db.InApproveManager_EquipmentQualityIn.FirstOrDefault(e => e.EquipmentQualityInId == EquipmentQualityInId); if (EquipmentQualityIn != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs index 6a8f7ac..538ee62 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class GeneralEquipmentInItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓鑸澶囨満鍏峰叆鍦烘姤鎵规槑缁嗕俊鎭 @@ -36,7 +36,7 @@ namespace BLL /// public static void AddGeneralEquipmentInItem(Model.InApproveManager_GeneralEquipmentInItem generalEquipmentInItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentInItem newEquipmentItem = new Model.InApproveManager_GeneralEquipmentInItem { GeneralEquipmentInItemId = generalEquipmentInItem.GeneralEquipmentInItemId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateGeneralEquipmentInItem(Model.InApproveManager_GeneralEquipmentInItem generalEquipmentInItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentInItem newGeneralEquipmentInItem = db.InApproveManager_GeneralEquipmentInItem.FirstOrDefault(e => e.GeneralEquipmentInItemId == generalEquipmentInItem.GeneralEquipmentInItemId); if (newGeneralEquipmentInItem != null) { @@ -77,7 +77,7 @@ namespace BLL /// public static void DeleteGeneralEquipmentInItemById(string generalEquipmentInItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentInItem generalEquipmentInItem = db.InApproveManager_GeneralEquipmentInItem.FirstOrDefault(e => e.GeneralEquipmentInItemId == generalEquipmentInItemId); if (generalEquipmentInItem != null) { @@ -92,7 +92,7 @@ namespace BLL /// public static void DeleteGeneralEquipmentInItemByEquipmentInId(string generalEquipmentInId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.InApproveManager_GeneralEquipmentInItem where x.GeneralEquipmentInId == generalEquipmentInId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs index fcae79a..182377e 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GeneralEquipmentInService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓鑸澶囨満鍏峰叆鍦烘姤鎵 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddGeneralEquipmentIn(Model.InApproveManager_GeneralEquipmentIn generalEquipmentIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentIn newGeneralEquipmentIn = new Model.InApproveManager_GeneralEquipmentIn { GeneralEquipmentInId = generalEquipmentIn.GeneralEquipmentInId, @@ -55,7 +55,7 @@ namespace BLL /// public static void UpdateGeneralEquipmentIn(Model.InApproveManager_GeneralEquipmentIn generalEquipmentIn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentIn newGeneralEquipmentIn = db.InApproveManager_GeneralEquipmentIn.FirstOrDefault(e => e.GeneralEquipmentInId == generalEquipmentIn.GeneralEquipmentInId); if (newGeneralEquipmentIn != null) { @@ -79,7 +79,7 @@ namespace BLL /// public static void DeleteGeneralEquipmentInById(string generalEquipmentInId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentIn generalEquipmentIn = db.InApproveManager_GeneralEquipmentIn.FirstOrDefault(e => e.GeneralEquipmentInId == generalEquipmentInId); if (generalEquipmentIn != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs index 739eb42..ec81734 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GeneralEquipmentOutItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓鑸澶囨満鍏峰嚭鍦烘姤鎵 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddGeneralEquipmentOutItem(Model.InApproveManager_GeneralEquipmentOutItem generalEquipmentOutItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentOutItem newGeneralEquipmentOutItem = new Model.InApproveManager_GeneralEquipmentOutItem { GeneralEquipmentOutItemId = generalEquipmentOutItem.GeneralEquipmentOutItemId, @@ -60,7 +60,7 @@ namespace BLL /// public static void UpdateGeneralEquipmentOutItem(Model.InApproveManager_GeneralEquipmentOutItem generalEquipmentOutItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentOutItem newGeneralEquipmentOutItem = db.InApproveManager_GeneralEquipmentOutItem.FirstOrDefault(e => e.GeneralEquipmentOutItemId == generalEquipmentOutItem.GeneralEquipmentOutItemId); if (newGeneralEquipmentOutItem != null) { @@ -81,7 +81,7 @@ namespace BLL /// public static void DeleteGeneralEquipmentOutItemById(string generalEquipmentOutItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentOutItem generalEquipmentOutItem = db.InApproveManager_GeneralEquipmentOutItem.FirstOrDefault(e => e.GeneralEquipmentOutItemId == generalEquipmentOutItemId); if (generalEquipmentOutItem != null) { @@ -96,7 +96,7 @@ namespace BLL /// public static void DeleteGeneralEquipmentOutItemByGeneralEquipmentOutId(string generalEquipmentOutId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.InApproveManager_GeneralEquipmentOutItem where x.GeneralEquipmentOutId == generalEquipmentOutId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs index c2e49f1..9781d4b 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GeneralEquipmentOutService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓鑸澶囨満鍏峰嚭鍦烘姤鎵 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddGeneralEquipmentOut(Model.InApproveManager_GeneralEquipmentOut generalEquipmentOut) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentOut newGeneralEquipmentOut = new Model.InApproveManager_GeneralEquipmentOut { GeneralEquipmentOutId = generalEquipmentOut.GeneralEquipmentOutId, @@ -58,7 +58,7 @@ namespace BLL /// public static void UpdateGeneralEquipmentOut(Model.InApproveManager_GeneralEquipmentOut generalEquipmentOut) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentOut newGeneralEquipmentOut = db.InApproveManager_GeneralEquipmentOut.FirstOrDefault(e => e.GeneralEquipmentOutId == generalEquipmentOut.GeneralEquipmentOutId); if (newGeneralEquipmentOut != null) { @@ -85,7 +85,7 @@ namespace BLL /// public static void DeleteGeneralEquipmentOutById(string generalEquipmentOutId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InApproveManager_GeneralEquipmentOut generalEquipmentOut = db.InApproveManager_GeneralEquipmentOut.FirstOrDefault(e => e.GeneralEquipmentOutId == generalEquipmentOutId); if (generalEquipmentOut != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs b/SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs index 81b69e0..dfdf98b 100644 --- a/SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class ConstructionStandardIdentifyService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏍囧噯瑙勮寖杈ㄨ瘑涓婚敭鑾峰彇涓涓爣鍑嗚鑼冭鲸璇嗕俊鎭 @@ -34,7 +34,7 @@ namespace BLL /// 鏍囧噯瑙勮寖杈ㄨ瘑瀹炰綋 public static void AddConstructionStandardIdentify(Model.InformationProject_ConstructionStandardIdentify constructionStandardIdentify) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ConstructionStandardIdentify newConstructionStandardIdentify = new Model.InformationProject_ConstructionStandardIdentify { ConstructionStandardIdentifyId = constructionStandardIdentify.ConstructionStandardIdentifyId, @@ -58,7 +58,7 @@ namespace BLL /// 鏍囧噯瑙勮寖杈ㄨ瘑瀹炰綋 public static void UpdateConstructionStandardIdentify(Model.InformationProject_ConstructionStandardIdentify constructionStandardIdentify) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ConstructionStandardIdentify newConstructionStandardIdentify = db.InformationProject_ConstructionStandardIdentify.FirstOrDefault(e => e.ConstructionStandardIdentifyId == constructionStandardIdentify.ConstructionStandardIdentifyId); if (newConstructionStandardIdentify != null) { @@ -80,7 +80,7 @@ namespace BLL /// 鏍囧噯瑙勮寖杈ㄨ瘑涓婚敭 public static void DeleteConstructionStandardIdentifyById(string constructionStandardIdentifyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ConstructionStandardIdentify constructionStandardIdentify = db.InformationProject_ConstructionStandardIdentify.FirstOrDefault(e => e.ConstructionStandardIdentifyId == constructionStandardIdentifyId); if (constructionStandardIdentify != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs b/SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs index 48ea8a4..10dafc0 100644 --- a/SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class ConstructionStandardSelectedItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏍囧噯瑙勮寖杈ㄨ瘑Id鑾峰彇瀵瑰簲鎵鏈夋爣鍑嗚鑼冮」淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// 鏍囧噯瑙勮寖椤瑰疄浣 public static void AddConstructionStandardSelectedItem(Model.InformationProject_ConstructionStandardSelectedItem constructionStandardSelectedItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.InformationProject_ConstructionStandardSelectedItem)); Model.InformationProject_ConstructionStandardSelectedItem newLawRegulationSelectedItem = new Model.InformationProject_ConstructionStandardSelectedItem { @@ -43,7 +43,7 @@ namespace BLL /// 鏍囧噯瑙勮寖杈ㄨ瘑涓婚敭 public static void DeleteConstructionStandardSelectedItemByConstructionStandardIdentifyId(string constructionStandardIdentifyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.InformationProject_ConstructionStandardSelectedItem where x.ConstructionStandardIdentifyId == constructionStandardIdentifyId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/LawRegulationIdentifyService.cs b/SGGL/BLL/HSSE/InformationProject/LawRegulationIdentifyService.cs index dce2aef..2884908 100644 --- a/SGGL/BLL/HSSE/InformationProject/LawRegulationIdentifyService.cs +++ b/SGGL/BLL/HSSE/InformationProject/LawRegulationIdentifyService.cs @@ -25,7 +25,7 @@ namespace BLL /// 娉曞緥娉曡杈ㄨ瘑瀹炰綋 public static void AddLawRegulationIdentify(Model.Law_LawRegulationIdentify lawRegulationIdentify) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_LawRegulationIdentify newLawRegulationIdentify = new Model.Law_LawRegulationIdentify { LawRegulationIdentifyId = lawRegulationIdentify.LawRegulationIdentifyId, @@ -54,7 +54,7 @@ namespace BLL /// 娉曞緥娉曡杈ㄨ瘑瀹炰綋 public static void UpdateLawRegulationIdentify(Model.Law_LawRegulationIdentify lawRegulationIdentify) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_LawRegulationIdentify newLawRegulationIdentify = db.Law_LawRegulationIdentify.FirstOrDefault(e => e.LawRegulationIdentifyId == lawRegulationIdentify.LawRegulationIdentifyId); if (newLawRegulationIdentify != null) { @@ -78,7 +78,7 @@ namespace BLL /// 娉曞緥娉曡杈ㄨ瘑缂栧彿 public static void DeleteLawRegulationIdentify(string lawRegulationIdentifyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_LawRegulationIdentify lawRegulationIdentify = db.Law_LawRegulationIdentify.FirstOrDefault(e => e.LawRegulationIdentifyId == lawRegulationIdentifyId); if (lawRegulationIdentify != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/LawRegulationSelectedItemService.cs b/SGGL/BLL/HSSE/InformationProject/LawRegulationSelectedItemService.cs index f8a14cf..9d76f94 100644 --- a/SGGL/BLL/HSSE/InformationProject/LawRegulationSelectedItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/LawRegulationSelectedItemService.cs @@ -25,7 +25,7 @@ namespace BLL /// 娉曞緥娉曡椤瑰疄浣 public static void AddLawRegulationSelectedItem(Model.Law_LawRegulationSelectedItem lawRegulationSelectedItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Law_LawRegulationSelectedItem)); Model.Law_LawRegulationSelectedItem newLawRegulationSelectedItem = new Model.Law_LawRegulationSelectedItem { @@ -46,7 +46,7 @@ namespace BLL /// 娉曞緥娉曡杈ㄨ瘑涓婚敭 public static void DeleteLawRegulationSelectedItemByLawRegulationIdentifyId(string lawRegulationIdentifyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Law_LawRegulationSelectedItem where x.LawRegulationIdentifyId == lawRegulationIdentifyId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs index 47d8fa1..74f70af 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectAccidentCauseReportItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑱屽伐浼や骸浜嬫晠鍘熷洜鍒嗘瀽鎶ヨ〃鏄庣粏琛 @@ -28,7 +28,7 @@ namespace BLL /// 鑱屽伐浼や骸浜嬫晠鍘熷洜鍒嗘瀽鎶ヨ〃鏄庣粏琛ㄥ疄浣 public static void AddAccidentCauseReportItem(Model.InformationProject_AccidentCauseReportItem AccidentCauseReportItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_AccidentCauseReportItem newAccidentCauseReportItem = new Model.InformationProject_AccidentCauseReportItem { AccidentCauseReportItemId = AccidentCauseReportItem.AccidentCauseReportItemId, @@ -82,7 +82,7 @@ namespace BLL /// 鑱屽伐浼や骸浜嬫晠鍘熷洜鍒嗘瀽鎶ヨ〃鏄庣粏琛ㄥ疄浣 public static void UpdateAccidentCauseReportItem(Model.InformationProject_AccidentCauseReportItem AccidentCauseReportItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_AccidentCauseReportItem newAccidentCauseReportItem = db.InformationProject_AccidentCauseReportItem.FirstOrDefault(e => e.AccidentCauseReportItemId == AccidentCauseReportItem.AccidentCauseReportItemId); newAccidentCauseReportItem.AccidentType = AccidentCauseReportItem.AccidentType; newAccidentCauseReportItem.TotalDeath = AccidentCauseReportItem.TotalDeath; @@ -131,7 +131,7 @@ namespace BLL /// public static void DeleteAccidentCauseReportItemByAccidentCauseReportId(string AccidentCauseReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.InformationProject_AccidentCauseReportItem where x.AccidentCauseReportId == AccidentCauseReportId select x; if (q != null) { @@ -147,7 +147,7 @@ namespace BLL /// 鏄庣粏璁板綍闆嗗悎 public static List GetItemsNoSum(string AccidentCauseReportId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.InformationProject_AccidentCauseReportItem join y in db.Sys_Const on x.AccidentType equals y.ConstText diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs index f4d0fdf..8d5c707 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectAccidentCauseReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑱屽伐浼や骸浜嬫晠鍘熷洜鍒嗘瀽鎶ヨ〃 @@ -28,7 +28,7 @@ namespace BLL /// 鑱屽伐浼や骸浜嬫晠鍘熷洜鍒嗘瀽鎶ヨ〃瀹炰綋 public static void AddAccidentCauseReport(Model.InformationProject_AccidentCauseReport AccidentCauseReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_AccidentCauseReport newAccidentCauseReport = new Model.InformationProject_AccidentCauseReport { AccidentCauseReportId = AccidentCauseReport.AccidentCauseReportId, @@ -68,7 +68,7 @@ namespace BLL /// 鑱屽伐浼や骸浜嬫晠鍘熷洜鍒嗘瀽鎶ヨ〃瀹炰綋 public static void UpdateAccidentCauseReport(Model.InformationProject_AccidentCauseReport AccidentCauseReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_AccidentCauseReport newAccidentCauseReport = db.InformationProject_AccidentCauseReport.FirstOrDefault(e => e.AccidentCauseReportId == AccidentCauseReport.AccidentCauseReportId); if (newAccidentCauseReport != null) { @@ -106,7 +106,7 @@ namespace BLL /// public static void DeleteAccidentCauseReportById(string AccidentCauseReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_AccidentCauseReport newAccidentCauseReport = db.InformationProject_AccidentCauseReport.FirstOrDefault(e => e.AccidentCauseReportId == AccidentCauseReportId); if (newAccidentCauseReport != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs index fb4865e..79dbb2d 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectDrillConductedQuarterlyReportItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ユ紨缁冨紑灞曟儏鍐靛鎶ヨ〃鏄庣粏淇℃伅 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddDrillConductedQuarterlyReportItem(Model.InformationProject_DrillConductedQuarterlyReportItem drillConductedQuarterlyReportItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillConductedQuarterlyReportItem newDrillConductedQuarterlyReportItem = new Model.InformationProject_DrillConductedQuarterlyReportItem { DrillConductedQuarterlyReportItemId = drillConductedQuarterlyReportItem.DrillConductedQuarterlyReportItemId, @@ -71,7 +71,7 @@ namespace BLL /// public static void UpdateDrillConductedQuarterlyReportItem(Model.InformationProject_DrillConductedQuarterlyReportItem drillConductedQuarterlyReportItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillConductedQuarterlyReportItem newDrillConductedQuarterlyReportItem = db.InformationProject_DrillConductedQuarterlyReportItem.FirstOrDefault(e => e.DrillConductedQuarterlyReportItemId == drillConductedQuarterlyReportItem.DrillConductedQuarterlyReportItemId); if (newDrillConductedQuarterlyReportItem != null) { @@ -102,7 +102,7 @@ namespace BLL /// public static void DeleteDrillConductedQuarterlyReportItemById(string drillConductedQuarterlyReportItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillConductedQuarterlyReportItem drillConductedQuarterlyReportItem = db.InformationProject_DrillConductedQuarterlyReportItem.FirstOrDefault(e => e.DrillConductedQuarterlyReportItemId == drillConductedQuarterlyReportItemId); if (drillConductedQuarterlyReportItem != null) { @@ -117,7 +117,7 @@ namespace BLL /// public static void DeleteDrillConductedQuarterlyReportItemList(string drillConductedQuarterlyReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.InformationProject_DrillConductedQuarterlyReportItem where x.DrillConductedQuarterlyReportId == drillConductedQuarterlyReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs index 185b9b1..a990254 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectDrillConductedQuarterlyReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ユ紨缁冨紑灞曟儏鍐靛鎶ヨ〃 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddDrillConductedQuarterlyReport(Model.InformationProject_DrillConductedQuarterlyReport drillConductedQuarterlyReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillConductedQuarterlyReport newDrillConductedQuarterlyReport = new Model.InformationProject_DrillConductedQuarterlyReport { DrillConductedQuarterlyReportId = drillConductedQuarterlyReport.DrillConductedQuarterlyReportId, @@ -50,7 +50,7 @@ namespace BLL /// public static void UpdateDrillConductedQuarterlyReport(Model.InformationProject_DrillConductedQuarterlyReport drillConductedQuarterlyReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillConductedQuarterlyReport newDrillConductedQuarterlyReport = db.InformationProject_DrillConductedQuarterlyReport.FirstOrDefault(e => e.DrillConductedQuarterlyReportId == drillConductedQuarterlyReport.DrillConductedQuarterlyReportId); if (newDrillConductedQuarterlyReport != null) { @@ -71,7 +71,7 @@ namespace BLL /// public static void DeleteDrillConductedQuarterlyReportById(string drillConductedQuarterlyReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillConductedQuarterlyReport drillConductedQuarterlyReport = db.InformationProject_DrillConductedQuarterlyReport.FirstOrDefault(e => e.DrillConductedQuarterlyReportId == drillConductedQuarterlyReportId); if (drillConductedQuarterlyReport != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs index 7723cb2..648413c 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectDrillPlanHalfYearReportItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ユ紨缁冨伐浣滆鍒掑崐骞存姤鏄庣粏淇℃伅 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddDrillPlanHalfYearReportItem(Model.InformationProject_DrillPlanHalfYearReportItem drillPlanHalfYearReportItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillPlanHalfYearReportItem newDrillPlanHalfYearReportItem = new Model.InformationProject_DrillPlanHalfYearReportItem { DrillPlanHalfYearReportItemId = drillPlanHalfYearReportItem.DrillPlanHalfYearReportItemId, @@ -60,7 +60,7 @@ namespace BLL /// public static void UpdateDrillPlanHalfYearReportItem(Model.InformationProject_DrillPlanHalfYearReportItem drillPlanHalfYearReportItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillPlanHalfYearReportItem newDrillPlanHalfYearReportItem = db.InformationProject_DrillPlanHalfYearReportItem.FirstOrDefault(e => e.DrillPlanHalfYearReportItemId == drillPlanHalfYearReportItem.DrillPlanHalfYearReportItemId); if (newDrillPlanHalfYearReportItem != null) { @@ -80,7 +80,7 @@ namespace BLL /// public static void DeleteDrillPlanHalfYearReportItemById(string drillPlanHalfYearReportItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillPlanHalfYearReportItem drillPlanHalfYearReportItem = db.InformationProject_DrillPlanHalfYearReportItem.FirstOrDefault(e => e.DrillPlanHalfYearReportItemId == drillPlanHalfYearReportItemId); if (drillPlanHalfYearReportItem != null) { @@ -95,7 +95,7 @@ namespace BLL /// public static void DeleteDrillPlanHalfYearReportItemList(string drillPlanHalfYearReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.InformationProject_DrillPlanHalfYearReportItem where x.DrillPlanHalfYearReportId == drillPlanHalfYearReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs index 7c14eca..ee4d39b 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectDrillPlanHalfYearReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ユ紨缁冨伐浣滆鍒掑崐骞存姤 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddDrillPlanHalfYearReport(Model.InformationProject_DrillPlanHalfYearReport drillPlanHalfYearReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillPlanHalfYearReport newDrillPlanHalfYearReport = new Model.InformationProject_DrillPlanHalfYearReport { DrillPlanHalfYearReportId = drillPlanHalfYearReport.DrillPlanHalfYearReportId, @@ -51,7 +51,7 @@ namespace BLL /// public static void UpdateDrillPlanHalfYearReport(Model.InformationProject_DrillPlanHalfYearReport drillPlanHalfYearReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillPlanHalfYearReport newDrillPlanHalfYearReport = db.InformationProject_DrillPlanHalfYearReport.FirstOrDefault(e => e.DrillPlanHalfYearReportId == drillPlanHalfYearReport.DrillPlanHalfYearReportId); if (newDrillPlanHalfYearReport != null) { @@ -73,7 +73,7 @@ namespace BLL /// public static void DeleteDrillPlanHalfYearReportById(string drillPlanHalfYearReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_DrillPlanHalfYearReport drillPlanHalfYearReport = db.InformationProject_DrillPlanHalfYearReport.FirstOrDefault(e => e.DrillPlanHalfYearReportId == drillPlanHalfYearReportId); if (drillPlanHalfYearReport != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs index 7111075..236cf63 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectMillionsMonthlyReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浼佷笟瀹夊叏鏁版嵁缁熻鏈堟姤 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddMillionsMonthlyReport(Model.InformationProject_MillionsMonthlyReport millionsMonthlyReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_MillionsMonthlyReport newMillionsMonthlyReport = new Model.InformationProject_MillionsMonthlyReport { MillionsMonthlyReportId = millionsMonthlyReport.MillionsMonthlyReportId, @@ -98,7 +98,7 @@ namespace BLL /// public static void UpdateMillionsMonthlyReport(Model.InformationProject_MillionsMonthlyReport millionsMonthlyReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_MillionsMonthlyReport newMillionsMonthlyReport = db.InformationProject_MillionsMonthlyReport.FirstOrDefault(e => e.MillionsMonthlyReportId == millionsMonthlyReport.MillionsMonthlyReportId); if (newMillionsMonthlyReport != null) { @@ -168,7 +168,7 @@ namespace BLL /// public static void DeleteMillionsMonthlyReportById(string millionsMonthlyReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_MillionsMonthlyReport millionsMonthlyReport = db.InformationProject_MillionsMonthlyReport.FirstOrDefault(e => e.MillionsMonthlyReportId == millionsMonthlyReportId); if (millionsMonthlyReport != null) { diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs index f8c25e6..5080631 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectSafetyQuarterlyReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏鐢熶骇鏁版嵁瀛ｆ姤 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddSafetyQuarterlyReport(Model.InformationProject_SafetyQuarterlyReport safetyQuarterlyReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_SafetyQuarterlyReport newSafetyQuarterlyReport = new Model.InformationProject_SafetyQuarterlyReport { SafetyQuarterlyReportId = safetyQuarterlyReport.SafetyQuarterlyReportId, @@ -124,7 +124,7 @@ namespace BLL /// public static void UpdateSafetyQuarterlyReport(Model.InformationProject_SafetyQuarterlyReport safetyQuarterlyReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_SafetyQuarterlyReport newSafetyQuarterlyReport = db.InformationProject_SafetyQuarterlyReport.FirstOrDefault(e => e.SafetyQuarterlyReportId == safetyQuarterlyReport.SafetyQuarterlyReportId); if (newSafetyQuarterlyReport != null) { @@ -218,7 +218,7 @@ namespace BLL /// public static void DeleteSafetyQuarterlyReportById(string safetyQuarterlyReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_SafetyQuarterlyReport safetyQuarterlyReport = db.InformationProject_SafetyQuarterlyReport.FirstOrDefault(e => e.SafetyQuarterlyReportId == safetyQuarterlyReportId); if (safetyQuarterlyReport != null) { diff --git a/SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs b/SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs index 73dedbb..8f91379 100644 --- a/SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs +++ b/SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs @@ -5,7 +5,7 @@ namespace BLL { public class HSSEStandardsListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁id鏌ヨ鏍囧噯瑙勮寖淇℃伅 @@ -129,7 +129,7 @@ namespace BLL /// public static void UpdateHSSEStandardsListIsPass(Model.Law_HSSEStandardsList standardsList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_HSSEStandardsList newHSSEStandardsList = db.Law_HSSEStandardsList.FirstOrDefault(e => e.StandardId == standardsList.StandardId); if (newHSSEStandardsList != null) { @@ -183,7 +183,7 @@ namespace BLL /// public static void DeleteHSSEStandardsList(string standardId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_HSSEStandardsList hSSEStandardsList = db.Law_HSSEStandardsList.FirstOrDefault(e => e.StandardId == standardId); if (hSSEStandardsList != null) { diff --git a/SGGL/BLL/HSSE/Law/LawRegulationListService.cs b/SGGL/BLL/HSSE/Law/LawRegulationListService.cs index 6c119ac..2b71921 100644 --- a/SGGL/BLL/HSSE/Law/LawRegulationListService.cs +++ b/SGGL/BLL/HSSE/Law/LawRegulationListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class LawRegulationListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇娉曞緥娉曡 @@ -48,7 +48,7 @@ namespace BLL /// public static void AddLawRegulationList(Model.Law_LawRegulationList lawRegulationList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_LawRegulationList newLawRegulationList = new Model.Law_LawRegulationList { LawRegulationId = lawRegulationList.LawRegulationId, @@ -76,7 +76,7 @@ namespace BLL /// public static void UpdateLawRegulationList(Model.Law_LawRegulationList lawRegulationList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_LawRegulationList newLawRegulationList = db.Law_LawRegulationList.FirstOrDefault(e => e.LawRegulationId == lawRegulationList.LawRegulationId); if (newLawRegulationList != null) { @@ -98,7 +98,7 @@ namespace BLL /// public static void UpdateLawRegulationListIsPass(Model.Law_LawRegulationList lawRegulationList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_LawRegulationList newLawRegulationList = db.Law_LawRegulationList.FirstOrDefault(e => e.LawRegulationId == lawRegulationList.LawRegulationId); if (newLawRegulationList != null) { @@ -116,7 +116,7 @@ namespace BLL /// public static void DeleteLawRegulationListById(string lawRegulationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_LawRegulationList lawRegulationList = db.Law_LawRegulationList.FirstOrDefault(e => e.LawRegulationId == lawRegulationId); if (lawRegulationList!=null) { diff --git a/SGGL/BLL/HSSE/Law/ManageRuleService.cs b/SGGL/BLL/HSSE/Law/ManageRuleService.cs index f78ceda..504359f 100644 --- a/SGGL/BLL/HSSE/Law/ManageRuleService.cs +++ b/SGGL/BLL/HSSE/Law/ManageRuleService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ManageRuleService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇绠＄悊瑙勫畾 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddManageRule(Model.Law_ManageRule manageRule) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_ManageRule newManageRule = new Model.Law_ManageRule { ManageRuleId = manageRule.ManageRuleId, @@ -65,7 +65,7 @@ namespace BLL /// public static void UpdateManageRule(Model.Law_ManageRule manageRule) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_ManageRule newManageRule = db.Law_ManageRule.FirstOrDefault(e => e.ManageRuleId == manageRule.ManageRuleId); if (newManageRule != null) { @@ -89,7 +89,7 @@ namespace BLL /// public static void UpdateManageRuleIsPass(Model.Law_ManageRule manageRule) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_ManageRule newManageRule = db.Law_ManageRule.FirstOrDefault(e => e.ManageRuleId == manageRule.ManageRuleId); if (newManageRule!=null) { @@ -106,7 +106,7 @@ namespace BLL /// public static void DeleteManageRuleById(string manageRuleId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_ManageRule manageRule = db.Law_ManageRule.FirstOrDefault(e => e.ManageRuleId == manageRuleId); if (manageRule != null) { diff --git a/SGGL/BLL/HSSE/Law/RulesRegulationsService.cs b/SGGL/BLL/HSSE/Law/RulesRegulationsService.cs index 5a2e3fd..ad4add0 100644 --- a/SGGL/BLL/HSSE/Law/RulesRegulationsService.cs +++ b/SGGL/BLL/HSSE/Law/RulesRegulationsService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RulesRegulationsService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐢熶骇瑙勭珷鍒跺害 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddRulesRegulations(Model.Law_RulesRegulations rulesRegulations) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_RulesRegulations newRuleRegulations = new Model.Law_RulesRegulations { RulesRegulationsId = rulesRegulations.RulesRegulationsId, @@ -65,7 +65,7 @@ namespace BLL /// public static void UpdateRulesRegulations(Model.Law_RulesRegulations rulesRegulations) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_RulesRegulations newRuleRegulations = db.Law_RulesRegulations.FirstOrDefault(e => e.RulesRegulationsId == rulesRegulations.RulesRegulationsId); if (newRuleRegulations != null) { @@ -87,7 +87,7 @@ namespace BLL /// public static void UpdateRulesRegulationsIsPass(Model.Law_RulesRegulations rulesRegulations) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_RulesRegulations newRuleRegulations = db.Law_RulesRegulations.FirstOrDefault(e => e.RulesRegulationsId == rulesRegulations.RulesRegulationsId); if (newRuleRegulations != null) { @@ -104,7 +104,7 @@ namespace BLL /// public static void DeleteRuleRegulationsById(string ruleRegulationsId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Law_RulesRegulations rulesRegulations = db.Law_RulesRegulations.FirstOrDefault(e => e.RulesRegulationsId == ruleRegulationsId); if (rulesRegulations != null) { diff --git a/SGGL/BLL/HSSE/License/HSETechnicalService.cs b/SGGL/BLL/HSSE/License/HSETechnicalService.cs index 7fe5874..29a743e 100644 --- a/SGGL/BLL/HSSE/License/HSETechnicalService.cs +++ b/SGGL/BLL/HSSE/License/HSETechnicalService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HSETechnicalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏鎶鏈氦搴 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddHSETechnical(Model.License_HSETechnical hseTechnical) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_HSETechnical newHSETechnical = new Model.License_HSETechnical { HSETechnicalId = hseTechnical.HSETechnicalId, @@ -58,7 +58,7 @@ namespace BLL /// public static void UpdateHSETechnical(Model.License_HSETechnical hseTechnical) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_HSETechnical newHSETechnical = db.License_HSETechnical.FirstOrDefault(e => e.HSETechnicalId == hseTechnical.HSETechnicalId); if (newHSETechnical != null) { @@ -85,7 +85,7 @@ namespace BLL /// public static void DeleteHSETechnicalById(string hseTechnicalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_HSETechnical hseTechnical = db.License_HSETechnical.FirstOrDefault(e => e.HSETechnicalId == hseTechnicalId); if (hseTechnical != null) { diff --git a/SGGL/BLL/HSSE/License/LicenseManagerService.cs b/SGGL/BLL/HSSE/License/LicenseManagerService.cs index 468ed11..b045f2e 100644 --- a/SGGL/BLL/HSSE/License/LicenseManagerService.cs +++ b/SGGL/BLL/HSSE/License/LicenseManagerService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class LicenseManagerService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏璁稿彲璇 @@ -40,7 +40,7 @@ namespace BLL /// public static void AddLicenseManager(Model.License_LicenseManager licenseManager) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LicenseManager newLicenseManager = new Model.License_LicenseManager { LicenseManagerId = licenseManager.LicenseManagerId, @@ -73,7 +73,7 @@ namespace BLL /// public static void UpdateLicenseManager(Model.License_LicenseManager licenseManager) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LicenseManager newLicenseManager = db.License_LicenseManager.FirstOrDefault(e => e.LicenseManagerId == licenseManager.LicenseManagerId); if (newLicenseManager != null) { @@ -100,7 +100,7 @@ namespace BLL /// public static void DeleteLicenseManagerById(string licenseManagerId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LicenseManager licenseManager = db.License_LicenseManager.FirstOrDefault(e => e.LicenseManagerId == licenseManagerId); if (licenseManager != null) { diff --git a/SGGL/BLL/HSSE/License/LicensePublicService.cs b/SGGL/BLL/HSSE/License/LicensePublicService.cs index d2a66f3..49f7e84 100644 --- a/SGGL/BLL/HSSE/License/LicensePublicService.cs +++ b/SGGL/BLL/HSSE/License/LicensePublicService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class LicensePublicService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鐘舵佷笅鎷夋 /// @@ -55,7 +55,7 @@ namespace BLL /// public static void AddFireWork(Model.License_FireWork fireWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_FireWork newFireWork = new Model.License_FireWork { FireWorkId = fireWork.FireWorkId, @@ -91,7 +91,7 @@ namespace BLL /// public static void UpdateFireWork(Model.License_FireWork fireWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_FireWork newFireWork = db.License_FireWork.FirstOrDefault(e => e.FireWorkId == fireWork.FireWorkId); if (newFireWork != null) { @@ -118,7 +118,7 @@ namespace BLL /// public static void DeleteFireWorkById(string fireWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_FireWork fireWork = db.License_FireWork.FirstOrDefault(e => e.FireWorkId == fireWorkId); if (fireWork != null) { @@ -151,7 +151,7 @@ namespace BLL /// public static void AddApply(Model.License_Apply fireWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_Apply newFireWork = new Model.License_Apply { LicenseApplyId = fireWork.LicenseApplyId, @@ -175,7 +175,7 @@ namespace BLL /// public static void UpdateApply(Model.License_Apply fireWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_Apply newFireWork = db.License_Apply.FirstOrDefault(e => e.LicenseApplyId == fireWork.LicenseApplyId); if (newFireWork != null) { @@ -199,7 +199,7 @@ namespace BLL /// public static void DeleteApplyById(string licenseApplyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_Apply fireWork = db.License_Apply.FirstOrDefault(e => e.LicenseApplyId == licenseApplyId); if (fireWork!=null) { @@ -230,7 +230,7 @@ namespace BLL /// public static void AddJiaBan(Model.License_JiaBan jiaBan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_JiaBan newJiaBan = new Model.License_JiaBan { JiaBanId = jiaBan.JiaBanId, @@ -271,7 +271,7 @@ namespace BLL /// public static void UpdateJiaBan(Model.License_JiaBan jiaBan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_JiaBan newJiaBan = db.License_JiaBan.FirstOrDefault(e => e.JiaBanId == jiaBan.JiaBanId); if (newJiaBan != null) { @@ -304,7 +304,7 @@ namespace BLL /// public static void DeleteJiaBanById(string jiaBanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_JiaBan jiaBan = db.License_JiaBan.FirstOrDefault(e => e.JiaBanId == jiaBanId); if (jiaBan != null) { @@ -337,7 +337,7 @@ namespace BLL /// public static void AddHeightWork(Model.License_HeightWork heightWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_HeightWork newHeightWork = new Model.License_HeightWork { HeightWorkId = heightWork.HeightWorkId, @@ -373,7 +373,7 @@ namespace BLL /// public static void UpdateHeightWork(Model.License_HeightWork heightWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_HeightWork newHeightWork = db.License_HeightWork.FirstOrDefault(e => e.HeightWorkId == heightWork.HeightWorkId); if (newHeightWork != null) { @@ -401,7 +401,7 @@ namespace BLL /// public static void DeleteHeightWorkById(string heightWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_HeightWork heightWork = db.License_HeightWork.FirstOrDefault(e => e.HeightWorkId == heightWorkId); if (heightWork != null) { @@ -434,7 +434,7 @@ namespace BLL /// public static void AddLimitedSpace(Model.License_LimitedSpace limitedSpace) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LimitedSpace newLimitedSpace = new Model.License_LimitedSpace { LimitedSpaceId = limitedSpace.LimitedSpaceId, @@ -470,7 +470,7 @@ namespace BLL /// public static void UpdateLimitedSpace(Model.License_LimitedSpace limitedSpace) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LimitedSpace newLimitedSpace = db.License_LimitedSpace.FirstOrDefault(e => e.LimitedSpaceId == limitedSpace.LimitedSpaceId); if (newLimitedSpace != null) { @@ -497,7 +497,7 @@ namespace BLL /// public static void DeleteLimitedSpaceById(string limitedSpaceId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LimitedSpace limitedSpace = db.License_LimitedSpace.FirstOrDefault(e => e.LimitedSpaceId == limitedSpaceId); if (limitedSpace != null) { @@ -530,7 +530,7 @@ namespace BLL /// public static void AddRadialWork(Model.License_RadialWork radialWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_RadialWork newRadialWork = new Model.License_RadialWork { RadialWorkId = radialWork.RadialWorkId, @@ -569,7 +569,7 @@ namespace BLL /// public static void UpdateRadialWork(Model.License_RadialWork radialWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_RadialWork newRadialWork = db.License_RadialWork.FirstOrDefault(e => e.RadialWorkId == radialWork.RadialWorkId); if (newRadialWork != null) { @@ -606,7 +606,7 @@ namespace BLL /// public static void DeleteRadialWorkById(string radialWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_RadialWork radialWork = db.License_RadialWork.FirstOrDefault(e => e.RadialWorkId == radialWorkId); if (radialWork != null) { @@ -641,7 +641,7 @@ namespace BLL /// public static void AddOpenCircuit(Model.License_OpenCircuit openCircuit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_OpenCircuit newOpenCircuit = new Model.License_OpenCircuit { OpenCircuitId = openCircuit.OpenCircuitId, @@ -677,7 +677,7 @@ namespace BLL /// public static void UpdateOpenCircuit(Model.License_OpenCircuit openCircuit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_OpenCircuit newOpenCircuit = db.License_OpenCircuit.FirstOrDefault(e => e.OpenCircuitId == openCircuit.OpenCircuitId); if (newOpenCircuit != null) { @@ -705,7 +705,7 @@ namespace BLL /// public static void DeleteOpenCircuitById(string openCircuitId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_OpenCircuit openCircuit = db.License_OpenCircuit.FirstOrDefault(e => e.OpenCircuitId == openCircuitId); if (openCircuit != null) { @@ -738,7 +738,7 @@ namespace BLL /// public static void AddBreakGround(Model.License_BreakGround breakGround) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_BreakGround newBreakGround = new Model.License_BreakGround { BreakGroundId = breakGround.BreakGroundId, @@ -773,7 +773,7 @@ namespace BLL /// public static void UpdateBreakGround(Model.License_BreakGround breakGround) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_BreakGround newBreakGround = db.License_BreakGround.FirstOrDefault(e => e.BreakGroundId == breakGround.BreakGroundId); if (newBreakGround != null) { @@ -800,7 +800,7 @@ namespace BLL /// public static void DeleteBreakGroundById(string breakGroundId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_BreakGround breakGround = db.License_BreakGround.FirstOrDefault(e => e.BreakGroundId == breakGroundId); if (breakGround != null) { @@ -835,7 +835,7 @@ namespace BLL /// public static void AddNightWork(Model.License_NightWork nightWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_NightWork newNightWork = new Model.License_NightWork { NightWorkId = nightWork.NightWorkId, @@ -873,7 +873,7 @@ namespace BLL /// public static void UpdateNightWork(Model.License_NightWork nightWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_NightWork newNightWork = db.License_NightWork.FirstOrDefault(e => e.NightWorkId == nightWork.NightWorkId); if (newNightWork != null) { @@ -903,7 +903,7 @@ namespace BLL /// public static void DeleteNightWorkById(string nightWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_NightWork nightWork = db.License_NightWork.FirstOrDefault(e => e.NightWorkId == nightWorkId); if (nightWork != null) { @@ -936,7 +936,7 @@ namespace BLL /// public static void AddLiftingWork(Model.License_LiftingWork liftingWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LiftingWork newLiftingWork = new Model.License_LiftingWork { LiftingWorkId = liftingWork.LiftingWorkId, @@ -972,7 +972,7 @@ namespace BLL /// public static void UpdateLiftingWork(Model.License_LiftingWork liftingWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LiftingWork newLiftingWork = db.License_LiftingWork.FirstOrDefault(e => e.LiftingWorkId == liftingWork.LiftingWorkId); if (newLiftingWork != null) { @@ -1000,7 +1000,7 @@ namespace BLL /// public static void DeleteLiftingWorkById(string liftingWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LiftingWork liftingWork = db.License_LiftingWork.FirstOrDefault(e => e.LiftingWorkId == liftingWorkId); if (liftingWork != null) { @@ -1033,7 +1033,7 @@ namespace BLL /// public static void AddTempElectricity(Model.License_TempElectricity tempElectricity) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_TempElectricity newTempElectricity = new Model.License_TempElectricity { TempElectricityId = tempElectricity.TempElectricityId, @@ -1069,7 +1069,7 @@ namespace BLL /// public static void UpdateTempElectricity(Model.License_TempElectricity tempElectricity) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_TempElectricity newTempElectricity = db.License_TempElectricity.FirstOrDefault(e => e.TempElectricityId == tempElectricity.TempElectricityId); if (newTempElectricity != null) { @@ -1096,7 +1096,7 @@ namespace BLL /// public static void DeleteTempElectricityById(string tempElectricityId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_TempElectricity tempElectricity = db.License_TempElectricity.FirstOrDefault(e => e.TempElectricityId == tempElectricityId); if (tempElectricity != null) { @@ -1129,7 +1129,7 @@ namespace BLL /// public static void AddPressureTest(Model.License_PressureTest pressureTest) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_PressureTest newPressureTest = new Model.License_PressureTest { PressureTestId = pressureTest.PressureTestId, @@ -1166,7 +1166,7 @@ namespace BLL /// public static void UpdatePressureTest(Model.License_PressureTest pressureTest) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_PressureTest newPressureTest = db.License_PressureTest.FirstOrDefault(e => e.PressureTestId == pressureTest.PressureTestId); if (newPressureTest != null) { @@ -1193,7 +1193,7 @@ namespace BLL /// public static void DeletePressureTestById(string pressureTestId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_PressureTest pressureTest = db.License_PressureTest.FirstOrDefault(e => e.PressureTestId == pressureTestId); if (pressureTest != null) { @@ -1240,7 +1240,7 @@ namespace BLL /// public static void AddLicenseItem(Model.License_LicenseItem licenseItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LicenseItem newLicenseItem = new Model.License_LicenseItem { LicenseItemId = SQLHelper.GetNewID(), @@ -1260,7 +1260,7 @@ namespace BLL /// public static void UpdateLicenseItem(Model.License_LicenseItem licenseItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LicenseItem newLicenseItem = db.License_LicenseItem.FirstOrDefault(e => e.LicenseItemId == licenseItem.LicenseItemId); if (newLicenseItem != null) { @@ -1276,7 +1276,7 @@ namespace BLL /// public static void DeleteLicenseItemById(string licenseItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_LicenseItem licenseItem = db.License_LicenseItem.FirstOrDefault(e => e.LicenseItemId == licenseItemId); if (licenseItem != null) { @@ -1291,7 +1291,7 @@ namespace BLL /// public static void DeleteLicenseItemByDataId(string dataId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var licenseItems = from x in db.License_LicenseItem where x.DataId == dataId select x; if (licenseItems.Count()>0) { @@ -1332,7 +1332,7 @@ namespace BLL /// public static void AddFlowOperate(Model.License_FlowOperate flowOperate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate { FlowOperateId = SQLHelper.GetNewID(), @@ -1354,7 +1354,7 @@ namespace BLL /// public static void UpdateFlowOperate(Model.License_FlowOperate flowOperate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_FlowOperate newFlowOperate = db.License_FlowOperate.FirstOrDefault(e => e.FlowOperateId == flowOperate.FlowOperateId); if (newFlowOperate != null) { @@ -1373,7 +1373,7 @@ namespace BLL /// public static void DeleteFlowOperateById(string flowOperateId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_FlowOperate flowOperate = db.License_FlowOperate.FirstOrDefault(e => e.FlowOperateId == flowOperateId); if (flowOperate != null) { @@ -1389,7 +1389,7 @@ namespace BLL /// public static void DeleteFlowOperateByDataId(string dataId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var flowOperates = from x in db.License_FlowOperate where x.DataId == dataId select x; if (flowOperates.Count() > 0) { @@ -1431,7 +1431,7 @@ namespace BLL /// public static void AddFlowOperateItem(Model.License_FlowOperateItem flowOperateItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.License_FlowOperateItem newFlowOperateItem = new Model.License_FlowOperateItem { FlowOperateItemId = flowOperateItem.FlowOperateItemId, @@ -1451,7 +1451,7 @@ namespace BLL /// public static void DeleteFlowOperateItemByDataId(string flowOperateId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var flowOperateItems = from x in db.License_FlowOperateItem where x.FlowOperateId == flowOperateId select x; if (flowOperateItems.Count() > 0) { diff --git a/SGGL/BLL/HSSE/Manager/CompletionReportService.cs b/SGGL/BLL/HSSE/Manager/CompletionReportService.cs index cc1c1f1..0049beb 100644 --- a/SGGL/BLL/HSSE/Manager/CompletionReportService.cs +++ b/SGGL/BLL/HSSE/Manager/CompletionReportService.cs @@ -7,7 +7,7 @@ namespace BLL /// public static class CompletionReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹屽伐鎶ュ憡 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddCompletionReport(Model.Manager_CompletionReport completionReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_CompletionReport newCompletionReport = new Model.Manager_CompletionReport { CompletionReportId = completionReport.CompletionReportId, @@ -49,7 +49,7 @@ namespace BLL /// public static void UpdateCompletionReport(Model.Manager_CompletionReport completionReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_CompletionReport newCompletionReport = db.Manager_CompletionReport.FirstOrDefault(e => e.CompletionReportId == completionReport.CompletionReportId); if (newCompletionReport != null) { @@ -70,7 +70,7 @@ namespace BLL /// public static void DeleteCompletionReportById(string completionReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_CompletionReport completionReport = db.Manager_CompletionReport.FirstOrDefault(e => e.CompletionReportId == completionReportId); if (completionReport != null) { diff --git a/SGGL/BLL/HSSE/Manager/HeadMonthReportBService.cs b/SGGL/BLL/HSSE/Manager/HeadMonthReportBService.cs index de0725f..0324377 100644 --- a/SGGL/BLL/HSSE/Manager/HeadMonthReportBService.cs +++ b/SGGL/BLL/HSSE/Manager/HeadMonthReportBService.cs @@ -8,7 +8,7 @@ namespace BLL { public class HeadMonthReportBService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁瀹夊叏缁熻涓婚敭鑾峰彇瀹夊叏缁熻淇℃伅 @@ -69,7 +69,7 @@ namespace BLL /// 瀹夊叏缁熻瀹炰綋 public static void AddHeadMonthReport(Model.Manager_HeadMonthReportB headMonthReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_HeadMonthReportB)); Model.Manager_HeadMonthReportB newHeadMonthReport = new Model.Manager_HeadMonthReportB { @@ -94,7 +94,7 @@ namespace BLL /// 瀹夊叏缁熻瀹炰綋 public static void UpdateHeadMonthReport(Model.Manager_HeadMonthReportB headMonthReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_HeadMonthReportB newHeadMonthReport = db.Manager_HeadMonthReportB.First(e => e.HeadMonthReportId == headMonthReport.HeadMonthReportId); newHeadMonthReport.MonthReportCode = headMonthReport.MonthReportCode; newHeadMonthReport.Months = headMonthReport.Months; @@ -114,7 +114,7 @@ namespace BLL /// 瀹夊叏缁熻涓婚敭 public static void DeleteHeadMonthReportByHeadMonthReportId(string headMonthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_HeadMonthReportB headMonthReport = db.Manager_HeadMonthReportB.First(e => e.HeadMonthReportId == headMonthReportId); db.Manager_HeadMonthReportB.DeleteOnSubmit(headMonthReport); db.SubmitChanges(); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/AccidentReport2Service.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/AccidentReport2Service.cs index 589c57d..2b2b89b 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/AccidentReport2Service.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/AccidentReport2Service.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentReport2Service { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浜嬫晠璋冩煡鎶ュ憡 @@ -355,7 +355,7 @@ namespace BLL /// public static void AddAccidentReport(Model.Accident_AccidentReport accidentReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReport newAccidentReport = new Model.Accident_AccidentReport { AccidentReportId = accidentReport.AccidentReportId, @@ -399,7 +399,7 @@ namespace BLL /// public static void UpdateAccidentReport(Model.Accident_AccidentReport accidentReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReport newAccidentReport = db.Accident_AccidentReport.FirstOrDefault(e => e.AccidentReportId == accidentReport.AccidentReportId); if (newAccidentReport != null) { @@ -440,7 +440,7 @@ namespace BLL /// public static void DeleteAccidentReportById(string accidentReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Accident_AccidentReport accidentReport = db.Accident_AccidentReport.FirstOrDefault(e => e.AccidentReportId == accidentReportId); if (accidentReport != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/AccidentSortBService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/AccidentSortBService.cs index 60828da..30fcb75 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/AccidentSortBService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/AccidentSortBService.cs @@ -7,7 +7,7 @@ namespace BLL { public class AccidentSortBService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; public static Model.Manager_AccidentSortB GetAccidentSortsByMonthReportIdAndAccidentType(string monthReportId, string accidentType) { @@ -73,7 +73,7 @@ namespace BLL /// 鏈堟姤鍛婁簨鏁呭垎绫诲疄浣 public static void AddAccidentSort(Model.Manager_AccidentSortB accidentSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_AccidentSortB)); Model.Manager_AccidentSortB newAccidentSort = new Model.Manager_AccidentSortB { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/CheckSortBService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/CheckSortBService.cs index b213c22..5403984 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/CheckSortBService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/CheckSortBService.cs @@ -7,7 +7,7 @@ namespace BLL { public class CheckSortBService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE妫鏌ユ儏鍐典俊鎭 @@ -52,7 +52,7 @@ namespace BLL /// 鏈堟姤鍛奌SE妫鏌ユ儏鍐靛疄浣 public static void AddCheckSort(Model.Manager_CheckSortB checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortB)); Model.Manager_CheckSortB newCheckSort = new Model.Manager_CheckSortB { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostAnalyseService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostAnalyseService.cs index 4242597..7fd5e8b 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostAnalyseService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostAnalyseService.cs @@ -36,7 +36,7 @@ namespace BLL /// public static void AddCostAnalyse(Model.Manager_CostAnalyse costAnalyse) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_CostAnalyse)); Model.Manager_CostAnalyse newCostAnalyse = new Model.Manager_CostAnalyse { @@ -60,7 +60,7 @@ namespace BLL /// public static void UpdateCostAnalyse(Model.Manager_CostAnalyse costAnalyse) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_CostAnalyse newCostAnalyse = db.Manager_CostAnalyse.First(e => e.AnalyseId == costAnalyse.AnalyseId); newCostAnalyse.Months = costAnalyse.Months; newCostAnalyse.Analyse = costAnalyse.Analyse; @@ -76,7 +76,7 @@ namespace BLL /// public static void DeleteCostAnalyse(string analyseId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_CostAnalyse costAnalyse = db.Manager_CostAnalyse.First(e => e.AnalyseId == analyseId); db.Manager_CostAnalyse.DeleteOnSubmit(costAnalyse); db.SubmitChanges(); @@ -88,7 +88,7 @@ namespace BLL /// public static void DeleteCostAnalyseByMonths(DateTime? months) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_CostAnalyse costAnalyse = db.Manager_CostAnalyse.First(e => e.Months == months); db.Manager_CostAnalyse.DeleteOnSubmit(costAnalyse); db.SubmitChanges(); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostStatisticDetailService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostStatisticDetailService.cs index 4a40e7c..8c6a647 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostStatisticDetailService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostStatisticDetailService.cs @@ -35,7 +35,7 @@ namespace BLL /// 璐圭敤姹囨绘槑缁嗗疄浣 public static void AddCostStatisticDetail(Model.TC_CostStatisticDetail detail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string CostStatisticDetailId = SQLHelper.GetNewID(typeof(Model.TC_CostStatisticDetail)); Model.TC_CostStatisticDetail newtc_CostDetail = new Model.TC_CostStatisticDetail { @@ -89,7 +89,7 @@ namespace BLL /// 鏂借鍒掔紪鍙 public static void DeleteCostStatisticDetailByCostStatisticCode(string costStatisticCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.TC_CostStatisticDetail where x.CostStatisticCode == costStatisticCode select x).ToList(); db.TC_CostStatisticDetail.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostStatisticService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostStatisticService.cs index b5f806e..4b59522 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostStatisticService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/CostStatisticService.cs @@ -10,7 +10,7 @@ namespace BLL { public class CostStatisticService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 /// @@ -100,7 +100,7 @@ namespace BLL /// 璐圭敤姹囨诲疄浣 public static void AddCostStatistic(Model.TC_CostStatistic tc_CostStatistic) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.TC_CostStatistic newtc_CostStatistic = new Model.TC_CostStatistic { CostStatisticCode = tc_CostStatistic.CostStatisticCode, @@ -119,7 +119,7 @@ namespace BLL /// 璐圭敤姹囨讳富閿 public static void DeleteCostStatisticByCostStatisticCode(string costStatisticCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.TC_CostStatistic tc_CostStatistic = db.TC_CostStatistic.FirstOrDefault(e => e.CostStatisticCode == costStatisticCode); if (tc_CostStatistic != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/HseCostBService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/HseCostBService.cs index 98d2381..a5dea03 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/HseCostBService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/HseCostBService.cs @@ -56,7 +56,7 @@ namespace BLL /// 鏈堟姤鍛奌SE鎶鏈帾鏂借垂鐢ㄥ疄浣 public static void AddHseCost(Model.Manager_HseCostB hseCost) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_HseCostB)); Model.Manager_HseCostB newHseCost = new Model.Manager_HseCostB { @@ -83,7 +83,7 @@ namespace BLL /// 鏈堟姤鍛婁富閿 public static void DeleteHseCostsByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_HseCostB where x.MonthReportId == monthReportId select x).ToList(); db.Manager_HseCostB.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/IncentiveSortBService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/IncentiveSortBService.cs index 5711493..f6515f9 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/IncentiveSortBService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/IncentiveSortBService.cs @@ -7,7 +7,7 @@ namespace BLL { public class IncentiveSortBService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; public static Model.Manager_IncentiveSortB GetIncentiveSortByMonthReportIdAndIncentiveType(string monthReportId, string incentiveType) { @@ -52,7 +52,7 @@ namespace BLL /// 鏈堟姤鍛奌SE濂栨儵鎯呭喌瀹炰綋 public static void AddIncentiveSort(Model.Manager_IncentiveSortB incentiveSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortB)); Model.Manager_IncentiveSortB newIncentiveSort = new Model.Manager_IncentiveSortB { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/ManhoursSortBService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/ManhoursSortBService.cs index 821a30d..acd5db1 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/ManhoursSortBService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/ManhoursSortBService.cs @@ -8,7 +8,7 @@ namespace BLL { public class ManhoursSortBService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -66,7 +66,7 @@ namespace BLL /// 鏈堟姤鍛婁汉宸ユ椂鍒嗙被瀹炰綋 public static void AddManhoursSort(Model.Manager_ManhoursSortB manhoursSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_ManhoursSortB)); Model.Manager_ManhoursSortB newManhoursSort = new Model.Manager_ManhoursSortB { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/MeetingSortBService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/MeetingSortBService.cs index 72fc4be..a434fef 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/MeetingSortBService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/MeetingSortBService.cs @@ -7,7 +7,7 @@ namespace BLL { public class MeetingSortBService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE浼氳鎯呭喌淇℃伅 @@ -54,7 +54,7 @@ namespace BLL public static void AddMeetingSort(Model.Manager_MeetingSortB meetingSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortB)); Model.Manager_MeetingSortB newMeetingSort = new Model.Manager_MeetingSortB diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthB/TrainSortBService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthB/TrainSortBService.cs index 7c71632..3b096ca 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthB/TrainSortBService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthB/TrainSortBService.cs @@ -7,7 +7,7 @@ namespace BLL { public class TrainSortBService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE鍩硅鎯呭喌淇℃伅 @@ -52,7 +52,7 @@ namespace BLL /// 鏈堟姤鍛奌SE鍩硅鎯呭喌瀹炰綋 public static void AddTrainSort(Model.Manager_TrainSortB trainSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_TrainSortB)); Model.Manager_TrainSortB newTrainSort = new Model.Manager_TrainSortB { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs index 082226b..179990c 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs @@ -8,7 +8,7 @@ namespace BLL { public class AccidentDesciptionCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇浜嬫晠璇存槑 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddAccidentDesciption(Model.Manager_Month_AccidentDesciptionC accidentDesciption) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_AccidentDesciptionC newAccidentDesciption = new Model.Manager_Month_AccidentDesciptionC { AccidentDesId = SQLHelper.GetNewID(typeof(Model.Manager_Month_AccidentDesciptionC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteAccidentDesciptionByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_AccidentDesciptionC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs index 59f7729..e5b19b3 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs @@ -8,7 +8,7 @@ namespace BLL { public class AccidentDesciptionItemCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇绠＄悊缁╂晥鏁版嵁缁熻 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddAccidentDesciptionItem(Model.Manager_Month_AccidentDesciptionItemC item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_AccidentDesciptionItemC newItem = new Model.Manager_Month_AccidentDesciptionItemC { AccidentDesItemId = SQLHelper.GetNewID(typeof(Model.Manager_Month_AccidentDesciptionItemC)), @@ -44,7 +44,7 @@ namespace BLL /// public static void DeleteAccidentDesciptionItemByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_AccidentDesciptionItemC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs index da35174..8e8d3e5 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class AccidentSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; public static Model.Manager_AccidentSortC GetAccidentSortsByMonthReportIdAndAccidentType(string monthReportId, string accidentType) { @@ -63,7 +63,7 @@ namespace BLL /// 鏈堟姤鍛婁簨鏁呭垎绫诲疄浣 public static void AddAccidentSort(Model.Manager_AccidentSortC accidentSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_AccidentSortC)); Model.Manager_AccidentSortC newAccidentSort = new Model.Manager_AccidentSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs index 135aef2..7ec50ea 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class ActivitiesCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇HSSE娲诲姩 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddActivities(Model.Manager_Month_ActivitiesC activities) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_ActivitiesC newActivities = new Model.Manager_Month_ActivitiesC { ActivitiesId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ActivitiesC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteActivitiesByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_ActivitiesC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivityDesCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivityDesCService.cs index 63a6623..c342bd9 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivityDesCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivityDesCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class ActivityDesCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇鐩稿叧鎵鏈夋椿鍔ㄦ儏鍐佃鏄庝俊鎭 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddActivityDes(Model.Manager_Month_ActivityDesC des) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_ActivityDesC newDes = new Model.Manager_Month_ActivityDesC { ActivityDesId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ActivityDesC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteActivityDesByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_ActivityDesC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs index 119cc97..cd86f32 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class CheckCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇HSSE妫鏌 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddCheck(Model.Manager_Month_CheckC check) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_CheckC newCheck = new Model.Manager_Month_CheckC { CheckId = SQLHelper.GetNewID(typeof(Model.Manager_Month_CheckC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteCheckByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_CheckC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs index b48153a..c5cc041 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class CheckDetailSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE妫鏌ユ槑缁嗘儏鍐典俊鎭 @@ -30,7 +30,7 @@ namespace BLL /// 鏈堟姤鍛奌SE妫鏌ユ槑缁嗘儏鍐靛疄浣 public static void AddCheckDetailSort(Model.Manager_CheckDetailSortC checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)); Model.Manager_CheckDetailSortC newCheckDetailSort = new Model.Manager_CheckDetailSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs index 1252af9..7b9e3e4 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class CheckSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE妫鏌ユ儏鍐典俊鎭 @@ -52,7 +52,7 @@ namespace BLL /// 鏈堟姤鍛奌SE妫鏌ユ儏鍐靛疄浣 public static void AddCheckSort(Model.Manager_CheckSortC checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)); Model.Manager_CheckSortC newCheckSort = new Model.Manager_CheckSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs index 69e4daa..e0effe3 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class CostInvestmentPlanCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇HSE璐圭敤鎶曞叆璁″垝 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddCostInvestmentPlan(Model.Manager_Month_CostInvestmentPlanC plan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_CostInvestmentPlanC newP = new Model.Manager_Month_CostInvestmentPlanC { CostInvestmentPlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_CostInvestmentPlanC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteCostInvestmentPlanByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_CostInvestmentPlanC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs index d180978..306dfa7 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class DrillSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡搴旀ユ紨缁冧俊鎭 @@ -25,7 +25,7 @@ namespace BLL /// 鏈堟姤鍛婂簲鎬ユ紨缁冨疄浣 public static void AddDrillSort(Model.Manager_DrillSortC checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_DrillSortC)); Model.Manager_DrillSortC newDrillSort = new Model.Manager_DrillSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs index f56f4c8..9b67b78 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class EmergencyExercisesCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇搴旀ユ紨缁冩椿鍔 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddEmergencyExercises(Model.Manager_Month_EmergencyExercisesC exercises) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_EmergencyExercisesC newE = new Model.Manager_Month_EmergencyExercisesC { EmergencyExercisesId = SQLHelper.GetNewID(typeof(Model.Manager_Month_EmergencyExercisesC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteEmergencyExercisesByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_EmergencyExercisesC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs index 2a77ac7..b83d20a 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class EmergencyPlanCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇搴旀ラ妗堜慨缂 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddEmergencyPlan(Model.Manager_Month_EmergencyPlanC plan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_EmergencyPlanC newPlan = new Model.Manager_Month_EmergencyPlanC { EmergencyPlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_EmergencyPlanC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteEmergencyPlanByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_EmergencyPlanC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs index a3bd743..ff4b409 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class EmergencySortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡搴旀ラ妗堜俊鎭 @@ -25,7 +25,7 @@ namespace BLL /// 鏈堟姤鍛婂簲鎬ラ妗堝疄浣 public static void AddEmergencySort(Model.Manager_EmergencySortC checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_EmergencySortC)); Model.Manager_EmergencySortC newEmergencySort = new Model.Manager_EmergencySortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs index 98b89db..509dd4e 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class FileManageCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇鏂囦欢绠＄悊淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddFileManage(Model.Manager_Month_FileManageC fileManage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_FileManageC newFileManage = new Model.Manager_Month_FileManageC { FileManageId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FileManageC)), @@ -45,7 +45,7 @@ namespace BLL /// public static void DeleteFileManageByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_FileManageC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs index 0508dac..d16d69d 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class FiveExpenseCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇鍏徃HSE璐圭敤鎶曞叆 @@ -24,7 +24,7 @@ namespace BLL /// public static void AddFiveExpense(Model.Manager_Month_FiveExpenseC fiveExpense) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_FiveExpenseC newFiveExpense = new Model.Manager_Month_FiveExpenseC { FiveExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FiveExpenseC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteFiveExpenseByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_FiveExpenseC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs index 63fa176..376ec29 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class HazardCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇鍗遍櫓婧愬姩鎬佽瘑鍒強鎺у埗 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddHazard(Model.Manager_Month_HazardC hazard) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_HazardC newHazard = new Model.Manager_Month_HazardC { HazardId = SQLHelper.GetNewID(typeof(Model.Manager_Month_HazardC)), @@ -46,7 +46,7 @@ namespace BLL /// 鏈堟姤Id public static void DeleteHazardByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_HazardC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs index a757fa9..4736cd1 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class HazardSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡鍗遍櫓婧愪俊鎭 @@ -25,7 +25,7 @@ namespace BLL /// 鏈堟姤鍛婂嵄闄╂簮瀹炰綋 public static void AddHazardSort(Model.Manager_HazardSortC checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_HazardSortC)); Model.Manager_HazardSortC newHazardSort = new Model.Manager_HazardSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs index 2a28579..b2da72e 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs @@ -8,7 +8,7 @@ namespace BLL { public class HseCostCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -55,7 +55,7 @@ namespace BLL /// 鏈堟姤鍛奌SE鎶鏈帾鏂借垂鐢ㄥ疄浣 public static void AddHseCost(Model.Manager_HseCostC hseCost) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_HseCostC)); Model.Manager_HseCostC newHseCost = new Model.Manager_HseCostC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs index 299f1d8..239ffb2 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class IncentiveSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; public static List GetIncentiveSortsByMonthReportIdAndBigType(string monthReportId, string bigType) { @@ -41,7 +41,7 @@ namespace BLL /// 鏈堟姤鍛奌SE濂栨儵鎯呭喌瀹炰綋 public static void AddIncentiveSort(Model.Manager_IncentiveSortC incentiveSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)); Model.Manager_IncentiveSortC newIncentiveSort = new Model.Manager_IncentiveSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs index 3663a34..bf1ed03 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class ManageDocPlanCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇HSE绠＄悊鏂囦欢/鏂规淇紪璁″垝 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddManageDocPlan(Model.Manager_Month_ManageDocPlanC manageDocPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_ManageDocPlanC newManageDocPlan = new Model.Manager_Month_ManageDocPlanC { ManageDocPlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ManageDocPlanC)), @@ -45,7 +45,7 @@ namespace BLL /// public static void DeleteManageDocPlanByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_ManageDocPlanC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs index 1631060..7cc7750 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class MeetingCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏃ユ姤Id鑾峰彇浼氳 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddMeeting(Model.Manager_Month_MeetingC meeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_MeetingC newMeeting = new Model.Manager_Month_MeetingC { MeetingId = SQLHelper.GetNewID(typeof(Model.Manager_Month_MeetingC)), @@ -46,7 +46,7 @@ namespace BLL /// public static void DeleteMeetingByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_MeetingC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs index 0802838..de3f72f 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class MeetingSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE浼氳鎯呭喌淇℃伅 @@ -30,7 +30,7 @@ namespace BLL /// 鏈堟姤鍛奌SE浼氳鎯呭喌瀹炰綋 public static void AddMeetingSort(Model.Manager_MeetingSortC meetingSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)); Model.Manager_MeetingSortC newMeetingSort = new Model.Manager_MeetingSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs index 724cb04..000b1a3 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs @@ -172,7 +172,7 @@ namespace BLL /// 鏈堟姤鍛婂疄浣 public static void AddMonthReport(Model.Manager_MonthReportC monthReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_MonthReportC newMonthReport = new Model.Manager_MonthReportC { MonthReportId = monthReport.MonthReportId, @@ -240,7 +240,7 @@ namespace BLL /// 鏈堟姤鍛婂疄浣 public static void UpdateMonthReport(Model.Manager_MonthReportC monthReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_MonthReportC newMonthReport = db.Manager_MonthReportC.First(e => e.MonthReportId == monthReport.MonthReportId); newMonthReport.MonthReportCode = monthReport.MonthReportCode; newMonthReport.ProjectId = monthReport.ProjectId; @@ -305,7 +305,7 @@ namespace BLL /// 鏈堟姤鍛婁富閿 public static void DeleteMonthReportByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_MonthReportC monthReport = db.Manager_MonthReportC.First(e => e.MonthReportId == monthReportId); ///鍒犻櫎缂栫爜琛ㄨ褰 BLL.CodeRecordsService.DeleteCodeRecordsByDataId(monthReportId); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs index 6356765..ff81e22 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class OtherActiveSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡鍏朵粬HSE绠＄悊娲诲姩淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// 鏈堟姤鍛婂叾浠朒SE绠＄悊娲诲姩瀹炰綋 public static void AddOtherActiveSort(Model.Manager_OtherActiveSortC checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_OtherActiveSortC)); Model.Manager_OtherActiveSortC newOtherActiveSort = new Model.Manager_OtherActiveSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherManagementCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherManagementCService.cs index c660ef5..b17b0d0 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherManagementCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherManagementCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class OtherManagementCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇HSE鐜板満鍏朵粬绠＄悊鎯呭喌淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddOtherManagement(Model.Manager_Month_OtherManagementC otherManagement) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_OtherManagementC newOtherManagement = new Model.Manager_Month_OtherManagementC { OtherManagementId = SQLHelper.GetNewID(typeof(Model.Manager_Month_OtherManagementC)), @@ -43,7 +43,7 @@ namespace BLL /// public static void DeleteOtherManagementByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_OtherManagementC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs index d28da9e..8578d95 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class OtherWorkCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤ID鑾峰彇鍏朵粬宸ヤ綔鎯呭喌鍒楄〃 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddOtherWork(Model.Manager_Month_OtherWorkC otherWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_OtherWorkC newOtherWork = new Model.Manager_Month_OtherWorkC { OtherWorkId = SQLHelper.GetNewID(typeof(Model.Manager_Month_OtherWorkC)), @@ -43,7 +43,7 @@ namespace BLL /// public static void DeleteOtherWorkByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_OtherWorkC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs index 6a99d06..44c2cd4 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class OtherWorkPlanCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇鎵鏈夌浉鍏冲叾浠朒SE宸ヤ綔璁″垝 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddOtherWorkPlan(Model.Manager_Month_OtherWorkPlanC otherWorkPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_OtherWorkPlanC newP = new Model.Manager_Month_OtherWorkPlanC { OtherWorkPlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_OtherWorkPlanC)), @@ -43,7 +43,7 @@ namespace BLL /// public static void DeleteOtherWorkPlanByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_OtherWorkPlanC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs index 60a7d28..52b784f 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class PersonSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE浜哄姏鎶曞叆淇℃伅 @@ -31,7 +31,7 @@ namespace BLL /// 鏈堟姤鍛奌SE浜哄姏鎶曞叆瀹炰綋 public static void AddPersonSort(Model.Manager_PersonSortC checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_PersonSortC)); Model.Manager_PersonSortC newPersonSort = new Model.Manager_PersonSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PlanCService.cs index bc3b629..bf882a4 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PlanCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PlanCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class PlanCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇鏈湀鏂囦欢銆佹柟妗堜慨缂栨儏鍐佃鏄 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddPlan(Model.Manager_Month_PlanC plan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_PlanC newPlan = new Model.Manager_Month_PlanC { PlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PlanC)), @@ -45,7 +45,7 @@ namespace BLL /// public static void DeletePlanByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_PlanC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs index 70252a2..51591bc 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class PromotionalActiviteSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE瀹ｄ紶娲诲姩淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// 鏈堟姤鍛奌SE瀹ｄ紶娲诲姩瀹炰綋 public static void AddPromotionalActiviteSort(Model.Manager_PromotionalActiviteSortC checkSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_PromotionalActiviteSortC)); Model.Manager_PromotionalActiviteSortC newPromotionalActiviteSort = new Model.Manager_PromotionalActiviteSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs index 5a4e21a..42d196c 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class ReviewRecordCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇璇︾粏瀹℃煡璁板綍 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddReviewRecord(Model.Manager_Month_ReviewRecordC reviewRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_ReviewRecordC newReviewRecord = new Model.Manager_Month_ReviewRecordC { ReviewRecordId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ReviewRecordC)), @@ -45,7 +45,7 @@ namespace BLL /// public static void DeleteReviewRecordByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_ReviewRecordC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs index ee33540..8793761 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class SubExpenseCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇鎵鏈夌浉鍏冲垎鍖呭晢HSE璐圭敤鎶曞叆 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddSubExpense(Model.Manager_Month_SubExpenseC subExpense) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_SubExpenseC newSubExpense = new Model.Manager_Month_SubExpenseC { SubExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_SubExpenseC)), @@ -45,7 +45,7 @@ namespace BLL /// public static void DeleteSubExpenseByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_SubExpenseC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs index e9767cb..954398b 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class TrainActivitySortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE鍩硅娲诲姩淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// 鏈堟姤鍛奌SE鍩硅娲诲姩瀹炰綋 public static void AddTrainActivitySort(Model.Manager_TrainActivitySortC trainSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_TrainActivitySortC)); Model.Manager_TrainActivitySortC newTrainActivitySort = new Model.Manager_TrainActivitySortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs index 38ceba3..71c2673 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class TrainCService { - private static Model.SGGLDB db = Funs.DB; + private static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤Id鑾峰彇HSSE鍩硅 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddTrain(Model.Manager_Month_TrainC train) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Manager_Month_TrainC newTrain = new Model.Manager_Month_TrainC { TrainId = SQLHelper.GetNewID(typeof(Model.Manager_Month_TrainC)), @@ -47,7 +47,7 @@ namespace BLL /// public static void DeleteTrainByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Manager_Month_TrainC where x.MonthReportId == monthReportId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs index bfecd4a..59fa650 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class TrainSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鏈堟姤鍛婁富閿幏鍙栨墍鏈夋湀鎶ュ憡HSE鍩硅鎯呭喌淇℃伅 @@ -25,7 +25,7 @@ namespace BLL /// 鏈堟姤鍛奌SE鍩硅鎯呭喌瀹炰綋 public static void AddTrainSort(Model.Manager_TrainSortC trainSort) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_TrainSortC)); Model.Manager_TrainSortC newTrainSort = new Model.Manager_TrainSortC { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonth_SeDinService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonth_SeDinService.cs index a469df5..5a6ee71 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonth_SeDinService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonth_SeDinService.cs @@ -38,7 +38,7 @@ namespace BLL /// 鏈堟姤鍛婁富閿 public static void DeleteMonthReportByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SeDin_MonthReport monthReport = db.SeDin_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReportId); if (monthReport != null) { diff --git a/SGGL/BLL/HSSE/Material/MaterialService.cs b/SGGL/BLL/HSSE/Material/MaterialService.cs index 5f875fc..f768005 100644 --- a/SGGL/BLL/HSSE/Material/MaterialService.cs +++ b/SGGL/BLL/HSSE/Material/MaterialService.cs @@ -9,7 +9,7 @@ namespace BLL.HSSE public static class MaterialService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓鑸満鍏疯澶囪祫璐 @@ -29,7 +29,7 @@ namespace BLL.HSSE /// public static void AddMaterial(Model.HSSE_Material material) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Material materialNew = new Model.HSSE_Material { MaterialId = material.MaterialId, @@ -52,7 +52,7 @@ namespace BLL.HSSE /// public static void UpdateMaterial(Model.HSSE_Material material) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Material materialold = db.HSSE_Material.FirstOrDefault(e => e.MaterialId == material.MaterialId); if (materialold != null) { @@ -74,7 +74,7 @@ namespace BLL.HSSE /// public static void DeleteMaterial(string materialId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HSSE_Material material = db.HSSE_Material.FirstOrDefault(e => e.MaterialId == materialId); if (material != null) { diff --git a/SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs b/SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs index a94d045..f07af3d 100644 --- a/SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AttendMeetingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍏朵粬浼氳璁板綍 @@ -52,7 +52,7 @@ namespace BLL /// public static void AddAttendMeeting(Model.Meeting_AttendMeeting attendMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_AttendMeeting newAttendMeeting = new Model.Meeting_AttendMeeting { AttendMeetingId = attendMeeting.AttendMeetingId, @@ -86,7 +86,7 @@ namespace BLL /// public static void UpdateAttendMeeting(Model.Meeting_AttendMeeting attendMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_AttendMeeting newAttendMeeting = db.Meeting_AttendMeeting.FirstOrDefault(e => e.AttendMeetingId == attendMeeting.AttendMeetingId); if (newAttendMeeting != null) { @@ -117,7 +117,7 @@ namespace BLL /// public static void DeleteAttendMeetingById(string attendMeetingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_AttendMeeting attendMeeting = db.Meeting_AttendMeeting.FirstOrDefault(e => e.AttendMeetingId == attendMeetingId); if (attendMeeting != null) { diff --git a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs index 69c5df7..eadb7e9 100644 --- a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs @@ -7,7 +7,7 @@ namespace BLL /// public static class ClassMeetingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐝墠浼 @@ -25,7 +25,7 @@ namespace BLL /// public static void AddClassMeeting(Model.Meeting_ClassMeeting classMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_ClassMeeting newClassMeeting = new Model.Meeting_ClassMeeting { ClassMeetingId = classMeeting.ClassMeetingId, @@ -58,7 +58,7 @@ namespace BLL /// public static void UpdateClassMeeting(Model.Meeting_ClassMeeting classMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_ClassMeeting newClassMeeting = db.Meeting_ClassMeeting.FirstOrDefault(e => e.ClassMeetingId == classMeeting.ClassMeetingId); if (newClassMeeting != null) { @@ -89,7 +89,7 @@ namespace BLL /// public static void DeleteClassMeetingById(string classMeetingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_ClassMeeting classMeeting = db.Meeting_ClassMeeting.FirstOrDefault(e => e.ClassMeetingId == classMeetingId); if (classMeeting != null) { diff --git a/SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs b/SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs index 33c3ffa..f7287c3 100644 --- a/SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class MonthMeetingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏鏈堜緥浼 @@ -68,7 +68,7 @@ namespace BLL /// public static void AddMonthMeeting(Model.Meeting_MonthMeeting monthMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_MonthMeeting newMonthMeeting = new Model.Meeting_MonthMeeting { MonthMeetingId = monthMeeting.MonthMeetingId, @@ -102,7 +102,7 @@ namespace BLL /// public static void UpdateMonthMeeting(Model.Meeting_MonthMeeting monthMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_MonthMeeting newMonthMeeting = db.Meeting_MonthMeeting.FirstOrDefault(e => e.MonthMeetingId == monthMeeting.MonthMeetingId); if (newMonthMeeting != null) { @@ -133,7 +133,7 @@ namespace BLL /// public static void DeleteMonthMeetingById(string monthMeetingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_MonthMeeting monthMeeting = db.Meeting_MonthMeeting.FirstOrDefault(e => e.MonthMeetingId == monthMeetingId); if (monthMeeting != null) { diff --git a/SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs b/SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs index 3f6e11c..c802a13 100644 --- a/SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class SafetyLeaderGroupMeetingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏棰嗗灏忕粍浼氳 @@ -70,7 +70,7 @@ namespace BLL /// public static void AddSafetyLeaderGroupMeeting(Model.Meeting_SafetyLeaderGroupMeeting SafetyLeaderGroupMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_SafetyLeaderGroupMeeting newSafetyLeaderGroupMeeting = new Model.Meeting_SafetyLeaderGroupMeeting { SafetyLeaderGroupMeetingId = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingId, @@ -104,7 +104,7 @@ namespace BLL /// public static void UpdateSafetyLeaderGroupMeeting(Model.Meeting_SafetyLeaderGroupMeeting SafetyLeaderGroupMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_SafetyLeaderGroupMeeting newSafetyLeaderGroupMeeting = db.Meeting_SafetyLeaderGroupMeeting.FirstOrDefault(e => e.SafetyLeaderGroupMeetingId == SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingId); if (newSafetyLeaderGroupMeeting != null) { @@ -135,7 +135,7 @@ namespace BLL /// public static void DeleteSafetyLeaderGroupMeetingById(string SafetyLeaderGroupMeetingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_SafetyLeaderGroupMeeting SafetyLeaderGroupMeeting = db.Meeting_SafetyLeaderGroupMeeting.FirstOrDefault(e => e.SafetyLeaderGroupMeetingId == SafetyLeaderGroupMeetingId); if (SafetyLeaderGroupMeeting != null) { diff --git a/SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs b/SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs index a0f20a6..449d74d 100644 --- a/SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class SpecialMeetingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓撻渚嬩細 @@ -68,7 +68,7 @@ namespace BLL /// public static void AddSpecialMeeting(Model.Meeting_SpecialMeeting specialMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_SpecialMeeting newSpecialMeeting = new Model.Meeting_SpecialMeeting { SpecialMeetingId = specialMeeting.SpecialMeetingId, @@ -102,7 +102,7 @@ namespace BLL /// public static void UpdateSpecialMeeting(Model.Meeting_SpecialMeeting specialMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_SpecialMeeting newSpecialMeeting = db.Meeting_SpecialMeeting.FirstOrDefault(e => e.SpecialMeetingId == specialMeeting.SpecialMeetingId); if (newSpecialMeeting != null) { @@ -133,7 +133,7 @@ namespace BLL /// public static void DeleteSpecialMeetingById(string specialMeetingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_SpecialMeeting spcialMeeting = db.Meeting_SpecialMeeting.FirstOrDefault(e => e.SpecialMeetingId == specialMeetingId); if (spcialMeeting != null) { diff --git a/SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs b/SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs index a27a40c..1fe953e 100644 --- a/SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class WeekMeetingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍛ㄤ緥浼 @@ -68,7 +68,7 @@ namespace BLL /// public static void AddWeekMeeting(Model.Meeting_WeekMeeting weekMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_WeekMeeting newWeekMeeting = new Model.Meeting_WeekMeeting { WeekMeetingId = weekMeeting.WeekMeetingId, @@ -102,7 +102,7 @@ namespace BLL /// public static void UpdateWeekMeeting(Model.Meeting_WeekMeeting weekMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_WeekMeeting newWeekMeeting = db.Meeting_WeekMeeting.FirstOrDefault(e => e.WeekMeetingId == weekMeeting.WeekMeetingId); if (newWeekMeeting != null) { @@ -133,7 +133,7 @@ namespace BLL /// public static void DeleteWeekMeetingById(string weekMeetingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_WeekMeeting weekMeeting = db.Meeting_WeekMeeting.FirstOrDefault(e => e.WeekMeetingId == weekMeetingId); if (weekMeeting != null) { diff --git a/SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs b/SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs index 7293e7e..8dea4de 100644 --- a/SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs +++ b/SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HazardDetectionService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍗卞妫娴 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddHazardDetection(Model.OccupationHealth_HazardDetection HazardDetection) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_HazardDetection newHazardDetection = new Model.OccupationHealth_HazardDetection { FileId = HazardDetection.FileId, @@ -53,7 +53,7 @@ namespace BLL /// public static void UpdateHazardDetection(Model.OccupationHealth_HazardDetection HazardDetection) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_HazardDetection newHazardDetection = db.OccupationHealth_HazardDetection.FirstOrDefault(e => e.FileId == HazardDetection.FileId); if (newHazardDetection != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeleteHazardDetectionById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_HazardDetection HazardDetection = db.OccupationHealth_HazardDetection.FirstOrDefault(e => e.FileId == FileId); if (HazardDetection != null) { diff --git a/SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs b/SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs index 8f4caa7..a44d84d 100644 --- a/SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs +++ b/SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class OccupationalDiseaseAccidentService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鑱屼笟鐥呬簨鏁 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddOccupationalDiseaseAccident(Model.OccupationHealth_OccupationalDiseaseAccident OccupationalDiseaseAccident) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_OccupationalDiseaseAccident newOccupationalDiseaseAccident = new Model.OccupationHealth_OccupationalDiseaseAccident { FileId = OccupationalDiseaseAccident.FileId, @@ -53,7 +53,7 @@ namespace BLL /// public static void UpdateOccupationalDiseaseAccident(Model.OccupationHealth_OccupationalDiseaseAccident OccupationalDiseaseAccident) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_OccupationalDiseaseAccident newOccupationalDiseaseAccident = db.OccupationHealth_OccupationalDiseaseAccident.FirstOrDefault(e => e.FileId == OccupationalDiseaseAccident.FileId); if (newOccupationalDiseaseAccident != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeleteOccupationalDiseaseAccidentById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_OccupationalDiseaseAccident OccupationalDiseaseAccident = db.OccupationHealth_OccupationalDiseaseAccident.FirstOrDefault(e => e.FileId == FileId); if (OccupationalDiseaseAccident != null) { diff --git a/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs b/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs index 60d2dd1..25e98e1 100644 --- a/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs +++ b/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PhysicalExaminationService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浣撴绠＄悊 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddPhysicalExamination(Model.OccupationHealth_PhysicalExamination PhysicalExamination) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_PhysicalExamination newPhysicalExamination = new Model.OccupationHealth_PhysicalExamination { FileId = PhysicalExamination.FileId, @@ -53,7 +53,7 @@ namespace BLL /// public static void UpdatePhysicalExamination(Model.OccupationHealth_PhysicalExamination PhysicalExamination) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_PhysicalExamination newPhysicalExamination = db.OccupationHealth_PhysicalExamination.FirstOrDefault(e => e.FileId == PhysicalExamination.FileId); if (newPhysicalExamination != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeletePhysicalExaminationById(string FileId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.OccupationHealth_PhysicalExamination PhysicalExamination = db.OccupationHealth_PhysicalExamination.FirstOrDefault(e => e.FileId == FileId); if (PhysicalExamination != null) { diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordDetailService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordDetailService.cs index e30bfa4..118b0b6 100644 --- a/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordDetailService.cs +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordDetailService.cs @@ -93,7 +93,7 @@ namespace BLL /// public static void DeleteTrainDetailByTrainDetail(string detailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.PostTraining_Record_Detail trainDetails = Funs.DB.PostTraining_Record_Detail.FirstOrDefault(e => e.Id == detailId); if (trainDetails != null) { diff --git a/SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs index 3a2554a..d06ccec 100644 --- a/SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentPersonQualityService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗圭璁惧浣滀笟浜哄憳璧勮川 @@ -48,7 +48,7 @@ namespace BLL /// public static int GetCountByDate(string projectId, DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.QualityAudit_EquipmentPersonQuality join y in db.SitePerson_Person @@ -66,7 +66,7 @@ namespace BLL /// public static void AddEquipmentPersonQuality(Model.QualityAudit_EquipmentPersonQuality EquipmentPersonQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentPersonQuality newEquipmentPersonQuality = new Model.QualityAudit_EquipmentPersonQuality { EquipmentPersonQualityId = EquipmentPersonQuality.EquipmentPersonQualityId, @@ -97,7 +97,7 @@ namespace BLL /// public static void UpdateEquipmentPersonQuality(Model.QualityAudit_EquipmentPersonQuality EquipmentPersonQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentPersonQuality newEquipmentPersonQuality = db.QualityAudit_EquipmentPersonQuality.FirstOrDefault(e => e.EquipmentPersonQualityId == EquipmentPersonQuality.EquipmentPersonQualityId); if (newEquipmentPersonQuality != null) { diff --git a/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs b/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs index 50e70ca..b581dc3 100644 --- a/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentQualityAuditDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗圭璁惧璧勮川瀹℃煡鏄庣粏 @@ -53,7 +53,7 @@ namespace BLL /// public static void AddEquipmentQualityAuditDetail(Model.QualityAudit_EquipmentQualityAuditDetail auditDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentQualityAuditDetail newEquipmentQualityAuditDetail = new Model.QualityAudit_EquipmentQualityAuditDetail { AuditDetailId = auditDetail.AuditDetailId, @@ -74,7 +74,7 @@ namespace BLL /// public static void UpdateEquipmentQualityAuditDetail(Model.QualityAudit_EquipmentQualityAuditDetail auditDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentQualityAuditDetail newEquipmentQualityAuditDetail = db.QualityAudit_EquipmentQualityAuditDetail.FirstOrDefault(e => e.AuditDetailId == auditDetail.AuditDetailId); if (newEquipmentQualityAuditDetail != null) { @@ -92,7 +92,7 @@ namespace BLL /// public static void DeleteEquipmentQualityAuditDetailById(string auditDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentQualityAuditDetail auditDetail = db.QualityAudit_EquipmentQualityAuditDetail.FirstOrDefault(e => e.AuditDetailId == auditDetailId); if (auditDetail != null) { diff --git a/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs index 58ff34f..41240c9 100644 --- a/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentQualityService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗规畩鏈哄叿璁惧璧勮川 @@ -41,7 +41,7 @@ namespace BLL /// public static void AddEquipmentQuality(Model.QualityAudit_EquipmentQuality equipmentQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentQuality newEquipmentQuality = new Model.QualityAudit_EquipmentQuality { EquipmentQualityId = equipmentQuality.EquipmentQualityId, @@ -74,7 +74,7 @@ namespace BLL /// public static void UpdateEquipmentQuality(Model.QualityAudit_EquipmentQuality equipmentQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentQuality newEquipmentQuality = db.QualityAudit_EquipmentQuality.FirstOrDefault(e => e.EquipmentQualityId == equipmentQuality.EquipmentQualityId); if (newEquipmentQuality != null) { @@ -106,7 +106,7 @@ namespace BLL /// public static void DeleteEquipmentQualityById(string equipmentQualityId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_EquipmentQuality equipmentQuality = db.QualityAudit_EquipmentQuality.FirstOrDefault(e => e.EquipmentQualityId == equipmentQualityId); if (equipmentQuality != null) { diff --git a/SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs index 0d9f336..4338ff9 100644 --- a/SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GeneralEquipmentQualityService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓鑸満鍏疯澶囪祫璐 @@ -58,7 +58,7 @@ namespace BLL /// public static void AddGeneralEquipmentQuality(Model.QualityAudit_GeneralEquipmentQuality generalEquipmentQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_GeneralEquipmentQuality newGeneralEquipmentQuality = new Model.QualityAudit_GeneralEquipmentQuality { GeneralEquipmentQualityId = generalEquipmentQuality.GeneralEquipmentQualityId, @@ -84,7 +84,7 @@ namespace BLL /// public static void UpdateGeneralEquipmentQuality(Model.QualityAudit_GeneralEquipmentQuality generalEquipmentQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_GeneralEquipmentQuality newGeneralEquipmentQuality = db.QualityAudit_GeneralEquipmentQuality.FirstOrDefault(e => e.GeneralEquipmentQualityId == generalEquipmentQuality.GeneralEquipmentQualityId); if (newGeneralEquipmentQuality != null) { @@ -109,7 +109,7 @@ namespace BLL /// public static void DeleteGeneralEquipmentQualityById(string generalEquipmentQualityId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_GeneralEquipmentQuality generalEquipmentQuality = db.QualityAudit_GeneralEquipmentQuality.FirstOrDefault(e => e.GeneralEquipmentQualityId == generalEquipmentQualityId); if (generalEquipmentQuality != null) { diff --git a/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs index 59f9062..efaad2f 100644 --- a/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PersonQualityService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐗规畩宀椾綅浜哄憳璧勮川 @@ -48,7 +48,7 @@ namespace BLL /// public static int GetCountByDate(string projectId, DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.QualityAudit_PersonQuality join y in db.SitePerson_Person @@ -66,7 +66,7 @@ namespace BLL /// public static void AddPersonQuality(Model.QualityAudit_PersonQuality personQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_PersonQuality newPersonQuality = new Model.QualityAudit_PersonQuality { PersonQualityId = personQuality.PersonQualityId, @@ -97,7 +97,7 @@ namespace BLL /// public static void UpdatePersonQuality(Model.QualityAudit_PersonQuality personQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_PersonQuality newPersonQuality = db.QualityAudit_PersonQuality.FirstOrDefault(e => e.PersonQualityId == personQuality.PersonQualityId); if (newPersonQuality != null) { @@ -125,7 +125,7 @@ namespace BLL /// 浜哄憳Id public static void DeletePersonQuality(string personId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_PersonQuality personQuality = db.QualityAudit_PersonQuality.FirstOrDefault(e => e.PersonId == personId); if (personQuality != null) { diff --git a/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs index 8b3781e..36ed6be 100644 --- a/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SafePersonQualityService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏浜哄憳璧勮川 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddSafePersonQuality(Model.QualityAudit_SafePersonQuality SafePersonQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_SafePersonQuality newSafePersonQuality = new Model.QualityAudit_SafePersonQuality { SafePersonQualityId = SafePersonQuality.SafePersonQualityId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateSafePersonQuality(Model.QualityAudit_SafePersonQuality SafePersonQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_SafePersonQuality newSafePersonQuality = db.QualityAudit_SafePersonQuality.FirstOrDefault(e => e.SafePersonQualityId == SafePersonQuality.SafePersonQualityId); if (newSafePersonQuality != null) { diff --git a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs index 68df496..6ffcec0 100644 --- a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SubUnitQualityAuditDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍒嗗寘鍟嗚祫璐ㄥ鏌ユ槑缁 @@ -63,7 +63,7 @@ namespace BLL /// public static void AddSubUnitQualityAuditDetail(Model.QualityAudit_SubUnitQualityAuditDetail auditDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_SubUnitQualityAuditDetail newSubUnitQualityAuditDetail = new Model.QualityAudit_SubUnitQualityAuditDetail { AuditDetailId = auditDetail.AuditDetailId, @@ -84,7 +84,7 @@ namespace BLL /// public static void UpdateSubUnitQualityAuditDetail(Model.QualityAudit_SubUnitQualityAuditDetail auditDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_SubUnitQualityAuditDetail newSubUnitQualityAuditDetail = db.QualityAudit_SubUnitQualityAuditDetail.FirstOrDefault(e => e.AuditDetailId == auditDetail.AuditDetailId); if (newSubUnitQualityAuditDetail != null) { @@ -102,7 +102,7 @@ namespace BLL /// public static void DeleteSubUnitQualityAuditDetailById(string auditDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_SubUnitQualityAuditDetail auditDetail = db.QualityAudit_SubUnitQualityAuditDetail.FirstOrDefault(e => e.AuditDetailId == auditDetailId); if (auditDetail != null) { diff --git a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs index 0d70d2d..7e64035 100644 --- a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SubUnitQualityService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍒嗗寘鍟嗚祫璐 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddSubUnitQuality(Model.QualityAudit_SubUnitQuality subUnitQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_SubUnitQuality newSubUnitQuality = new Model.QualityAudit_SubUnitQuality { SubUnitQualityId = subUnitQuality.SubUnitQualityId, @@ -79,7 +79,7 @@ namespace BLL /// public static void UpdateSubUnitQuality(Model.QualityAudit_SubUnitQuality subUnitQuality) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_SubUnitQuality newSubUnitQuality = db.QualityAudit_SubUnitQuality.FirstOrDefault(e => e.SubUnitQualityId == subUnitQuality.SubUnitQualityId); if (newSubUnitQuality != null) { @@ -119,7 +119,7 @@ namespace BLL /// public static void DeleteSubUnitQualityById(string subUnitQualityId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.QualityAudit_SubUnitQuality subUnitQuality = db.QualityAudit_SubUnitQuality.FirstOrDefault(e => e.SubUnitQualityId == subUnitQualityId); if (subUnitQuality != null) { diff --git a/SGGL/BLL/HSSE/Resources/SignManageService.cs b/SGGL/BLL/HSSE/Resources/SignManageService.cs index 1f49cbf..dc4e616 100644 --- a/SGGL/BLL/HSSE/Resources/SignManageService.cs +++ b/SGGL/BLL/HSSE/Resources/SignManageService.cs @@ -7,7 +7,7 @@ public static class SignManageService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鏍囩墝淇℃伅 @@ -25,7 +25,7 @@ /// public static void AddSignManage(Model.Resources_SignManage SignManage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Resources_SignManage newSignManage = new Model.Resources_SignManage { SignManageId = SignManage.SignManageId, @@ -53,7 +53,7 @@ /// public static void UpdateSignManage(Model.Resources_SignManage SignManage) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Resources_SignManage updateSignManage = db.Resources_SignManage.FirstOrDefault(e => e.SignManageId == SignManage.SignManageId); if (updateSignManage != null) { @@ -78,7 +78,7 @@ /// public static void DeleteSignManage(string signManageId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Resources_SignManage deleteSignManage = db.Resources_SignManage.FirstOrDefault(e => e.SignManageId == signManageId); if (deleteSignManage != null) { diff --git a/SGGL/BLL/HSSE/SecuritySystem/SafetyOrganizationService.cs b/SGGL/BLL/HSSE/SecuritySystem/SafetyOrganizationService.cs index 6edcdeb..375cfed 100644 --- a/SGGL/BLL/HSSE/SecuritySystem/SafetyOrganizationService.cs +++ b/SGGL/BLL/HSSE/SecuritySystem/SafetyOrganizationService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SafetyOrganizationService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏绠＄悊鏈烘瀯淇℃伅 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddSafetyOrganization(Model.SecuritySystem_SafetyOrganization item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SecuritySystem_SafetyOrganization newItem = new Model.SecuritySystem_SafetyOrganization { SafetyOrganizationId = item.SafetyOrganizationId, @@ -52,7 +52,7 @@ namespace BLL /// public static void UpdateSafetyOrganization(Model.SecuritySystem_SafetyOrganization item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SecuritySystem_SafetyOrganization newItem = db.SecuritySystem_SafetyOrganization.FirstOrDefault(e => e.SafetyOrganizationId == item.SafetyOrganizationId); if (newItem != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeleteSafetyOrganization(string SafetyOrganizationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SecuritySystem_SafetyOrganization item = db.SecuritySystem_SafetyOrganization.FirstOrDefault(e => e.SafetyOrganizationId == SafetyOrganizationId); if (item != null) { diff --git a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs index 966a2c0..5c49290 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class PersonInOutService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -128,7 +128,7 @@ namespace BLL /// public static void AddPersonInOut(Model.SitePerson_PersonInOut personInOut) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SitePerson_PersonInOut newPersonInOut = new Model.SitePerson_PersonInOut { @@ -194,7 +194,7 @@ namespace BLL public static void AddPersonInOut(List personInOuts) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { db.SitePerson_PersonInOut.InsertAllOnSubmit(personInOuts); @@ -225,7 +225,7 @@ namespace BLL /// public static void InsertPersonInOutNowNow(Model.SitePerson_PersonInOut PersonInOut) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string proCode = ProjectService.GetContractNoByProjectId(PersonInOut.ProjectId); var getRealNameP = db.RealName_Project.FirstOrDefault(x => x.ProCode == proCode); @@ -285,7 +285,7 @@ namespace BLL /// public static void InsertPersonInOutNowNow(Model.SitePerson_PersonInOutNow PersonInOut) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getNow = db.SitePerson_PersonInOutNow.FirstOrDefault(x => x.PersonInOutId == PersonInOut.PersonInOutId); if (getNow == null) @@ -349,7 +349,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void UpdatePersonInfo(Model.SitePerson_PersonInOut personInOut) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var getPersonInOut = db.SitePerson_PersonInOut.FirstOrDefault(x => x.PersonInOutId == personInOut.PersonInOutId); if (getPersonInOut != null) { @@ -410,7 +410,7 @@ namespace BLL /// public static void DeletePersonInOutByPersonId(string personId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var personInOut = from x in db.SitePerson_PersonInOut where x.PersonId == personId select x; if (personInOut.Count() > 0) { @@ -424,7 +424,7 @@ namespace BLL /// public static void DeletePersonInOutById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var realName = db.RealName_PersonInOutNow.FirstOrDefault(x => x.PersonInOutId == id); if (realName != null) @@ -453,7 +453,7 @@ namespace BLL /// public static void UpdateRealNameInOut(string personId, string oldCardNo, string newIdCardNo) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var personInOuts = from x in db.RealName_PersonInOutNow where x.PersonId == personId && x.IdcardNumber == oldCardNo select x; @@ -473,7 +473,7 @@ namespace BLL /// public static List getWorkPostStatistic(List getAllPersonInOutList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List reports = new List(); var getUnitIdList = getAllPersonInOutList.Select(x => x.UnitId).Distinct(); diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs index 8c78da0..7f2b912 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class PersonService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鍔冲姟浜哄憳鍒楄〃 /// @@ -356,7 +356,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void AddPerson(Model.SitePerson_Person person) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SitePerson_Person newPerson = new Model.SitePerson_Person { @@ -430,7 +430,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void UpdatePerson(Model.SitePerson_Person person) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SitePerson_Person newPerson = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == person.PersonId); if (newPerson != null) @@ -505,7 +505,7 @@ namespace BLL /// public static void PersonOut(string personId, DateTime date) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var person = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == personId); if (person != null) @@ -634,7 +634,7 @@ namespace BLL /// public static void SaveSendCard(string personId, string cardNo, int personIndex) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.SitePerson_Person card = db.SitePerson_Person.FirstOrDefault(e => e.CardNo == cardNo); if (card != null) diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_CheckingService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_CheckingService.cs index e9b5bab..bfdb03c 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_CheckingService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_CheckingService.cs @@ -8,7 +8,7 @@ namespace BLL { public class SitePerson_CheckingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁浜哄憳鑰冨嫟涓婚敭鑾峰彇浜哄憳鑰冨嫟绠＄悊淇℃伅 @@ -26,7 +26,7 @@ namespace BLL /// 浜哄憳鑰冨嫟绠＄悊瀹炰綋 public static void AddPersonInfo(Model.SitePerson_Checking personInfo) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_Checking newPersonInfo = new Model.SitePerson_Checking { CheckingId = personInfo.CheckingId, @@ -52,7 +52,7 @@ namespace BLL /// 浜哄憳鑰冨嫟绠＄悊瀹炰綋 public static void UpdatePersonInfo(Model.SitePerson_Checking personInfo) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_Checking newPersonInfo = db.SitePerson_Checking.First(e => e.CheckingId == personInfo.CheckingId); newPersonInfo.CardNo = personInfo.CardNo; newPersonInfo.PersonId = personInfo.PersonId; @@ -83,7 +83,7 @@ namespace BLL /// 浜哄憳鑰冨嫟涓婚敭 public static void DeletePersonInfoByCheckingId(string checkingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_Checking personInfo = db.SitePerson_Checking.FirstOrDefault(e => e.CheckingId == checkingId); if (personInfo != null) { @@ -109,7 +109,7 @@ namespace BLL /// 浜哄憳鑰冨嫟涓婚敭 public static void DeletePersonInOutByCheckingId(string PersonInOutId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_PersonInOut personInOut = db.SitePerson_PersonInOut.FirstOrDefault(e => e.PersonInOutId == PersonInOutId); if (personInOut != null) { diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportDetailService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportDetailService.cs index 1b6ec2c..2aa6109 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportDetailService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportDetailService.cs @@ -27,7 +27,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤鏄庣粏瀹炰綋 public static void AddDayReportDetail(Model.SitePerson_DayReportDetail dayReportDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_DayReportDetail newDayReportDetail = new Model.SitePerson_DayReportDetail { DayReportDetailId = dayReportDetail.DayReportDetailId, @@ -53,7 +53,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤鏄庣粏瀹炰綋 public static void UpdateReportDetail(Model.SitePerson_DayReportDetail dayReportDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_DayReportDetail newDayReportDetail = db.SitePerson_DayReportDetail.FirstOrDefault(e => e.DayReportDetailId == dayReportDetail.DayReportDetailId); if (newDayReportDetail != null) { @@ -76,7 +76,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤涓婚敭 public static void DeleteDayReportDetailsByDayReportId(string dayReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var dayReportDetail = (from x in db.SitePerson_DayReportDetail where x.DayReportId == dayReportId select x).ToList(); if (dayReportDetail.Count() > 0) { @@ -115,7 +115,7 @@ namespace BLL /// public static List getDayReportDetails(string projectId, DateTime sDate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List reportDetails = new List(); var getAllPersonInOutList = from x in db.SitePerson_PersonInOut where x.ProjectId == projectId && x.ChangeTime.Value.Year == sDate.Year diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportService.cs index 851226c..149b8a2 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportService.cs @@ -22,7 +22,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤瀹炰綋 public static void AddDayReport(Model.SitePerson_DayReport dayReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_DayReport newDayReport = new Model.SitePerson_DayReport { DayReportId = dayReport.DayReportId, @@ -44,7 +44,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤瀹炰綋 public static void UpdateDayReport(Model.SitePerson_DayReport dayReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_DayReport newDayReport = db.SitePerson_DayReport.First(e => e.DayReportId == dayReport.DayReportId); newDayReport.ProjectId = dayReport.ProjectId; newDayReport.CompileMan = dayReport.CompileMan; @@ -60,7 +60,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤涓婚敭 public static void DeleteDayReportByDayReportId(string dayReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_DayReport dayReport = db.SitePerson_DayReport.FirstOrDefault(e => e.DayReportId == dayReportId); if (dayReport != null) { @@ -134,7 +134,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤淇℃伅 public static List GetDayReportsByCompileDateAndUnitId(DateTime startTime, DateTime endTime, string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.SitePerson_DayReport join y in db.SitePerson_DayReportDetail @@ -152,7 +152,7 @@ namespace BLL /// public static List getDayReports(string projectId, DateTime? sDate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List reports = new List(); var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber where x.ProjectId == projectId @@ -195,7 +195,7 @@ namespace BLL /// public static List getMonthChart() { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var sDate = DateTime.Now.AddMonths(-6); var eDate = DateTime.Now; diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportUnitDetailService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportUnitDetailService.cs index a8b678e..7c81fcb 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportUnitDetailService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_DayReportUnitDetailService.cs @@ -8,7 +8,7 @@ namespace BLL { public class SitePerson_DayReportUnitDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// @@ -17,7 +17,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤鏄庣粏瀹炰綋 public static void AddDayReportUnitDetail(Model.SitePerson_DayReportUnitDetail dayReportUnitDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_DayReportUnitDetail newDayReportUnitDetail = new Model.SitePerson_DayReportUnitDetail(); string newKeyID = SQLHelper.GetNewID(typeof(Model.SitePerson_DayReportUnitDetail)); newDayReportUnitDetail.DayReportUnitDetailId = newKeyID; @@ -37,7 +37,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤鏄庣粏瀹炰綋 public static void UpdateDayReportUnitDetail(Model.SitePerson_DayReportUnitDetail dayReportUnitDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_DayReportUnitDetail newDayReportUnitDetail = db.SitePerson_DayReportUnitDetail.FirstOrDefault(e => e.DayReportUnitDetailId == dayReportUnitDetail.DayReportUnitDetailId); if (newDayReportUnitDetail != null) { @@ -59,7 +59,7 @@ namespace BLL /// public static List getDayReportUnitDetails(string projectId, string unitId, DateTime sDate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List reportDetails = new List(); var getAllPersonInOutList = from x in db.SitePerson_PersonInOut where x.ProjectId == projectId && x.ChangeTime.Value.Year == sDate.Year diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportDetailService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportDetailService.cs index 79c532a..4098c2a 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportDetailService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportDetailService.cs @@ -24,7 +24,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤鏄庣粏瀹炰綋 public static void AddMonthReportDetail(Model.SitePerson_MonthReportDetail monthReportDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_MonthReportDetail newMonthReportDetail = new Model.SitePerson_MonthReportDetail { MonthReportDetailId = monthReportDetail.MonthReportDetailId, @@ -50,7 +50,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤鏄庣粏瀹炰綋 public static void UpdateReportDetail(Model.SitePerson_MonthReportDetail monthReportDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_MonthReportDetail newMonthReportDetail = db.SitePerson_MonthReportDetail.FirstOrDefault(e => e.MonthReportDetailId == monthReportDetail.MonthReportDetailId); if (newMonthReportDetail != null) { @@ -73,7 +73,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤涓婚敭 public static void DeleteMonthReportDetailsByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var monthReportDetail = (from x in db.SitePerson_MonthReportDetail where x.MonthReportId == monthReportId select x).ToList(); if (monthReportDetail.Count() > 0) { @@ -112,7 +112,7 @@ namespace BLL /// public static List getMonthReportDetails(string projectId, DateTime sDate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List reportDetails = new List(); var getAllPersonInOutList = from x in db.SitePerson_PersonInOut where x.ProjectId == projectId && x.ChangeTime.Value.Year == sDate.Year diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportService.cs index f68c173..82503b4 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportService.cs @@ -24,7 +24,7 @@ namespace BLL /// 宸ヤ綔鏈堟姤瀹炰綋 public static void AddMonthReport(Model.SitePerson_MonthReport monthReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_MonthReport newMonthReport = new Model.SitePerson_MonthReport { MonthReportId = monthReport.MonthReportId, @@ -46,7 +46,7 @@ namespace BLL /// 宸ヤ綔鏈堟姤瀹炰綋 public static void UpdateMonthReport(Model.SitePerson_MonthReport monthReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_MonthReport newMonthReport = db.SitePerson_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReport.MonthReportId); if (newMonthReport != null) { @@ -65,7 +65,7 @@ namespace BLL /// 宸ヤ綔鏈堟姤涓婚敭 public static void DeleteMonthReportByMonthReportId(string monthReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_MonthReport monthReport = db.SitePerson_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReportId); if (monthReport != null) { @@ -116,7 +116,7 @@ namespace BLL /// public static List getMonthReports(string projectId, DateTime? sDate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List reports = new List(); var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber where x.ProjectId == projectId @@ -158,7 +158,7 @@ namespace BLL /// public static List getTotalMonthReports(string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List reports = new List(); var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber where x.ProjectId == projectId diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportUnitDetailService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportUnitDetailService.cs index 532d57b..fd863e2 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportUnitDetailService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportUnitDetailService.cs @@ -8,7 +8,7 @@ namespace BLL { public class SitePerson_MonthReportUnitDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 澧炲姞宸ヤ綔鏃ユ姤鏄庣粏淇℃伅 @@ -16,7 +16,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤鏄庣粏瀹炰綋 public static void AddMonthReportUnitDetail(Model.SitePerson_MonthReportUnitDetail monthReportUnitDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_MonthReportUnitDetail newMonthReportUnitDetail = new Model.SitePerson_MonthReportUnitDetail(); string newKeyID = SQLHelper.GetNewID(typeof(Model.SitePerson_MonthReportUnitDetail)); newMonthReportUnitDetail.MonthReportUnitDetailId = newKeyID; @@ -36,7 +36,7 @@ namespace BLL /// 宸ヤ綔鏃ユ姤鏄庣粏瀹炰綋 public static void UpdateMonthReportUnitDetail(Model.SitePerson_MonthReportUnitDetail monthReportUnitDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SitePerson_MonthReportUnitDetail newMonthReportUnitDetail = db.SitePerson_MonthReportUnitDetail.FirstOrDefault(e => e.MonthReportUnitDetailId == monthReportUnitDetail.MonthReportUnitDetailId); if (newMonthReportUnitDetail != null) { diff --git a/SGGL/BLL/HSSE/Solution/ConstructSolutionService.cs b/SGGL/BLL/HSSE/Solution/ConstructSolutionService.cs index a655086..033c5ec 100644 --- a/SGGL/BLL/HSSE/Solution/ConstructSolutionService.cs +++ b/SGGL/BLL/HSSE/Solution/ConstructSolutionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ConstructSolutionService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏂藉伐鏂规/瀹℃煡 @@ -53,7 +53,7 @@ namespace BLL /// public static void AddConstructSolution(Model.Solution_ConstructSolution constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_ConstructSolution newConstructSolution = new Model.Solution_ConstructSolution { ConstructSolutionId = constructSolution.ConstructSolutionId, @@ -85,7 +85,7 @@ namespace BLL /// public static void UpdateConstructSolution(Model.Solution_ConstructSolution constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_ConstructSolution newConstructSolution = db.Solution_ConstructSolution.FirstOrDefault(e => e.ConstructSolutionId == constructSolution.ConstructSolutionId); if (newConstructSolution != null) { @@ -116,7 +116,7 @@ namespace BLL /// public static void DeleteConstructSolutionById(string constructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_ConstructSolution constructSolution = db.Solution_ConstructSolution.FirstOrDefault(e => e.ConstructSolutionId == constructSolutionId); if (constructSolution != null) { diff --git a/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs b/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs index 6cf86a2..f05bb8f 100644 --- a/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs +++ b/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ExpertArgumentService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 涓撳璁鸿瘉娓呭崟 /// @@ -29,7 +29,7 @@ namespace BLL /// public static void AddExpertArgument(Model.Solution_ExpertArgument expertArgument) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_ExpertArgument newExpertArgument = new Model.Solution_ExpertArgument { ExpertArgumentId = expertArgument.ExpertArgumentId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateExpertArgument(Model.Solution_ExpertArgument expertArgument) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_ExpertArgument newExpertArgument = db.Solution_ExpertArgument.FirstOrDefault(e => e.ExpertArgumentId == expertArgument.ExpertArgumentId); if (newExpertArgument != null) { @@ -82,7 +82,7 @@ namespace BLL /// public static void DeleteExpertArgumentById(string expertArgumentId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_ExpertArgument expertArgument = db.Solution_ExpertArgument.FirstOrDefault(e => e.ExpertArgumentId == expertArgumentId); if (expertArgument != null) { @@ -109,7 +109,7 @@ namespace BLL /// public static void AddLargerHazardList(Model.Solution_LargerHazardList LargerHazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_LargerHazardList newLargerHazardList = new Model.Solution_LargerHazardList { LargerHazardListId = LargerHazardList.LargerHazardListId, @@ -133,7 +133,7 @@ namespace BLL /// public static void UpdateLargerHazardList(Model.Solution_LargerHazardList LargerHazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_LargerHazardList newLargerHazardList = db.Solution_LargerHazardList.FirstOrDefault(e => e.LargerHazardListId == LargerHazardList.LargerHazardListId); if (newLargerHazardList != null) { @@ -153,7 +153,7 @@ namespace BLL /// public static void DeleteLargerHazardListById(string LargerHazardListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var getDelLargerHazardList = db.Solution_LargerHazardList.FirstOrDefault(e => e.LargerHazardListId == LargerHazardListId); if (getDelLargerHazardList != null) { @@ -185,7 +185,7 @@ namespace BLL /// public static void AddLargerHazardListItem(Model.Solution_LargerHazardListItem LargerHazardListItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_LargerHazardListItem newLargerHazardListItem = new Model.Solution_LargerHazardListItem { LargerHazardListItemId = LargerHazardListItem.LargerHazardListItemId, @@ -209,7 +209,7 @@ namespace BLL /// public static void UpdateLargerHazardListItem(Model.Solution_LargerHazardListItem LargerHazardListItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_LargerHazardListItem newLargerHazardListItem = db.Solution_LargerHazardListItem.FirstOrDefault(e => e.LargerHazardListItemId == LargerHazardListItem.LargerHazardListItemId); if (newLargerHazardListItem != null) { @@ -231,7 +231,7 @@ namespace BLL /// public static void DeleteLargerHazardListItemById(string LargerHazardListItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var getDelLargerHazardListItem = db.Solution_LargerHazardListItem.FirstOrDefault(e => e.LargerHazardListItemId == LargerHazardListItemId); if (getDelLargerHazardListItem != null) { @@ -247,7 +247,7 @@ namespace BLL /// public static void DeleteLargerHazardListItemByLargerHazardListId(string LargerHazardListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var getDelLargerHazardListItems = from x in db.Solution_LargerHazardListItem where x.LargerHazardListId == LargerHazardListId select x; diff --git a/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs b/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs index 8d1d235..f41b7f0 100644 --- a/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs +++ b/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs @@ -19,13 +19,13 @@ namespace BLL } public static Model.Solution_HSSEConstructSolutionApprove GetSee(string ConstructSolutionId, string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string ConstructSolutionId, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var res = db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) @@ -63,7 +63,7 @@ namespace BLL /// 鏂藉伐鏂规瀹℃壒瀹炰綋 public static void UpdateConstructSolutionApprove(Model.Solution_HSSEConstructSolutionApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_HSSEConstructSolutionApprove newApprove = db.Solution_HSSEConstructSolutionApprove.First(e => e.ConstructSolutionApproveId == approve.ConstructSolutionApproveId ); newApprove.ConstructSolutionId = approve.ConstructSolutionId; newApprove.ApproveMan = approve.ApproveMan; @@ -99,7 +99,7 @@ namespace BLL /// 鏂藉伐鏂规瀹℃壒闆嗗悎 public static List GetConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId, string state) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var reDate = (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { @@ -119,7 +119,7 @@ namespace BLL /// public static IList getListData(string ConstructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -141,7 +141,7 @@ namespace BLL } public static IList getListDataForExport(string ConstructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var res = from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveType,x.Edition @@ -192,7 +192,7 @@ namespace BLL /// public static void delSolutionApprove(string constructSolutionId, string man) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == constructSolutionId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList(); db.Solution_HSSEConstructSolutionApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -206,7 +206,7 @@ namespace BLL /// public static void delApprove(string ConstructSolutionApproveId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var del = db.Solution_HSSEConstructSolutionApprove.Where(c => c.ConstructSolutionApproveId == ConstructSolutionApproveId).FirstOrDefault(); db.Solution_HSSEConstructSolutionApprove.DeleteOnSubmit(del); db.SubmitChanges(); @@ -222,7 +222,7 @@ namespace BLL /// 鏂藉伐鏂规缂栧彿 public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList(); db.Solution_HSSEConstructSolutionApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -284,7 +284,7 @@ namespace BLL } public static void AddConstructSolutionApproveForApi(Model.Solution_HSSEConstructSolutionApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_HSSEConstructSolutionApprove newApprove = new Model.Solution_HSSEConstructSolutionApprove(); if (string.IsNullOrWhiteSpace(approve.ConstructSolutionApproveId)) @@ -309,7 +309,7 @@ namespace BLL } public static List getListDataForApi(string ConstructSolutionId, int edition) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S" @@ -347,7 +347,7 @@ namespace BLL } public static List getListDataForApi(string ConstructSolutionId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" @@ -387,7 +387,7 @@ namespace BLL } public static Model.Solution_HSSEConstructSolutionApprove getCurrApproveForApi(string ConstructSolutionId, string approveMan, int edition) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_HSSEConstructSolutionApprove newApprove = db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(e => e.ConstructSolutionId == ConstructSolutionId && e.ApproveMan == approveMan && e.Edition == edition && e.ApproveType != "S" && e.ApproveDate == null); if (newApprove != null) @@ -403,7 +403,7 @@ namespace BLL } public static List getConApproveForApi(string ConstructSolutionId, int edition) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List res = new List(); var newApproves = db.Solution_HSSEConstructSolutionApprove.Where(e => e.ConstructSolutionId == ConstructSolutionId && e.Edition == edition && e.ApproveType == "2").ToList(); @@ -433,7 +433,7 @@ namespace BLL } public static List getConApprovesForApi(string ConstructSolutionId, int edition) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { List res = new List(); var newApproves = db.Solution_HSSEConstructSolutionApprove.Where(e => e.ConstructSolutionId == ConstructSolutionId && e.Edition == edition).ToList(); @@ -463,7 +463,7 @@ namespace BLL } public static Model.Solution_HSSEConstructSolutionApprove UpdateConstructSolutionApproveForApi(Model.Solution_HSSEConstructSolutionApprove approve) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_HSSEConstructSolutionApprove newApprove = db.Solution_HSSEConstructSolutionApprove.First(e => e.ConstructSolutionApproveId == approve.ConstructSolutionApproveId); if (!string.IsNullOrEmpty(approve.ConstructSolutionId)) diff --git a/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionService.cs b/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionService.cs index 5cfe65f..bf144c5 100644 --- a/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionService.cs +++ b/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionService.cs @@ -36,7 +36,7 @@ namespace BLL /// 鏂规瀹℃煡Id public static void DeleteConstructSolution(string constructSolutionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_HSSEConstructSolution constructSolution = db.Solution_HSSEConstructSolution.First(e => e.ConstructSolutionId == constructSolutionId); db.Solution_HSSEConstructSolution.DeleteOnSubmit(constructSolution); @@ -49,7 +49,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void AddConstructSolution(Model.Solution_HSSEConstructSolution constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_HSSEConstructSolution newConstructSolution = new Model.Solution_HSSEConstructSolution(); newConstructSolution.ConstructSolutionId = constructSolution.ConstructSolutionId; newConstructSolution.Code = constructSolution.Code; @@ -74,7 +74,7 @@ namespace BLL /// 鏂规瀹℃煡瀹炰綋 public static void UpdateConstructSolution(Model.Solution_HSSEConstructSolution constructSolution) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_HSSEConstructSolution newConstructSolution = db.Solution_HSSEConstructSolution.FirstOrDefault(e => e.ConstructSolutionId == constructSolution.ConstructSolutionId); if (newConstructSolution == null) { @@ -153,7 +153,7 @@ namespace BLL } public static Model.Solution_HSSEConstructSolution GetConstructSolutionByConstructSolutionIdForApi(string constructSolutionId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_HSSEConstructSolution solution = db.Solution_HSSEConstructSolution.FirstOrDefault(x => x.ConstructSolutionId == constructSolutionId); solution.AttachUrl = AttachFileService.getFileUrl(solution.ConstructSolutionId+solution.Edition); @@ -234,7 +234,7 @@ namespace BLL } public static List getListDataForApi(string name, string unitId, string unitWork, string cNProfessionalCodes, string solutionType, string state, string projectId, int startRowIndex, int maximumRows) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Solution_HSSEConstructSolution; @@ -402,7 +402,7 @@ namespace BLL } public static void UpdateConstructSolutionForApi(Model.Solution_HSSEConstructSolution constructSolution) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Solution_HSSEConstructSolution newConstructSolution = db.Solution_HSSEConstructSolution.First(e => e.ConstructSolutionId == constructSolution.ConstructSolutionId); if (!string.IsNullOrEmpty(constructSolution.Code)) diff --git a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs index e4dee6e..a2fccca 100644 --- a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs +++ b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs @@ -27,7 +27,7 @@ namespace BLL /// public static void AddLargerHazard(Model.Solution_LargerHazard largerHazard) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_LargerHazard newLargerHazard = new Model.Solution_LargerHazard { HazardId = largerHazard.HazardId, @@ -58,7 +58,7 @@ namespace BLL /// public static void UpdateLargerHazard(Model.Solution_LargerHazard largerHazard) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_LargerHazard newLargerHazard = db.Solution_LargerHazard.FirstOrDefault(e => e.HazardId == largerHazard.HazardId); if (newLargerHazard != null) { @@ -83,7 +83,7 @@ namespace BLL /// public static void DeleteLargerHazard(string hazardId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var largerHazard = (from x in db.Solution_LargerHazard where x.HazardId == hazardId select x).FirstOrDefault(); if (largerHazard != null) { diff --git a/SGGL/BLL/HSSE/Solution/SolutionTemplateService.cs b/SGGL/BLL/HSSE/Solution/SolutionTemplateService.cs index 0155127..b5250a6 100644 --- a/SGGL/BLL/HSSE/Solution/SolutionTemplateService.cs +++ b/SGGL/BLL/HSSE/Solution/SolutionTemplateService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SolutionTemplateService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鏂规妯℃澘 @@ -39,7 +39,7 @@ namespace BLL /// public static void AddSolutionTemplate(Model.Solution_SolutionTemplate solutionTemplate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_SolutionTemplate newSolutionTemplate = new Model.Solution_SolutionTemplate { SolutionTemplateId = solutionTemplate.SolutionTemplateId, @@ -63,7 +63,7 @@ namespace BLL /// public static void UpdateSolutionTemplate(Model.Solution_SolutionTemplate solutionTemplate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_SolutionTemplate newSolutionTemplate = db.Solution_SolutionTemplate.FirstOrDefault(e => e.SolutionTemplateId == solutionTemplate.SolutionTemplateId); if (newSolutionTemplate != null) { @@ -83,7 +83,7 @@ namespace BLL /// public static void DeleteSolutionTemplateById(string solutionTemplateId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Solution_SolutionTemplate solutionTemplate = db.Solution_SolutionTemplate.FirstOrDefault(e => e.SolutionTemplateId == solutionTemplateId); if (solutionTemplate != null) { diff --git a/SGGL/BLL/HSSE/Technique/EmergencyService.cs b/SGGL/BLL/HSSE/Technique/EmergencyService.cs index 7a309ca..08280e8 100644 --- a/SGGL/BLL/HSSE/Technique/EmergencyService.cs +++ b/SGGL/BLL/HSSE/Technique/EmergencyService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class EmergencyService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ラ妗 @@ -35,7 +35,7 @@ namespace BLL /// public static void AddEmergencyList(Model.Technique_Emergency emergencyList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Emergency newEmergencyList = new Model.Technique_Emergency { EmergencyId = emergencyList.EmergencyId, @@ -62,7 +62,7 @@ namespace BLL /// public static void UpdateEmergencyList(Model.Technique_Emergency emergencyList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Emergency newEmergencyList = db.Technique_Emergency.FirstOrDefault(e => e.EmergencyId == emergencyList.EmergencyId); if (newEmergencyList != null) { @@ -83,7 +83,7 @@ namespace BLL /// public static void UpdateEmergencyListIsPass(Model.Technique_Emergency emergencyList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Emergency newEmergencyList = db.Technique_Emergency.FirstOrDefault(e => e.EmergencyId == emergencyList.EmergencyId); if (newEmergencyList != null) { @@ -100,7 +100,7 @@ namespace BLL /// public static void DeleteEmergencyListById(string emergencyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Emergency emergencyList = db.Technique_Emergency.FirstOrDefault(e => e.EmergencyId == emergencyId); if (emergencyList != null) { diff --git a/SGGL/BLL/HSSE/Technique/EnvironmentalService.cs b/SGGL/BLL/HSSE/Technique/EnvironmentalService.cs index 9a4944b..49cd609 100644 --- a/SGGL/BLL/HSSE/Technique/EnvironmentalService.cs +++ b/SGGL/BLL/HSSE/Technique/EnvironmentalService.cs @@ -4,7 +4,7 @@ namespace BLL { public static class EnvironmentalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鐜鍗遍櫓婧愪俊鎭 @@ -22,7 +22,7 @@ namespace BLL /// public static void AddEnvironmental(Model.Technique_Environmental environmental) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Environmental newEnvironmental = new Model.Technique_Environmental { EnvironmentalId = environmental.EnvironmentalId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateEnvironmental(Model.Technique_Environmental environmental) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Environmental newEnvironmental = db.Technique_Environmental.FirstOrDefault(e => e.EnvironmentalId == environmental.EnvironmentalId); if (newEnvironmental != null) { @@ -86,7 +86,7 @@ namespace BLL /// public static void DeleteEnvironmental(string environmentalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Environmental environmental = db.Technique_Environmental.FirstOrDefault(e => e.EnvironmentalId == environmentalId); if (environmental != null) { diff --git a/SGGL/BLL/HSSE/Technique/HazardListService.cs b/SGGL/BLL/HSSE/Technique/HazardListService.cs index 902888a..ada7661 100644 --- a/SGGL/BLL/HSSE/Technique/HazardListService.cs +++ b/SGGL/BLL/HSSE/Technique/HazardListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HazardListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍗遍櫓婧愭竻鍗 @@ -48,7 +48,7 @@ namespace BLL /// public static void AddHazardList(Model.Technique_HazardList hazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_HazardList newHazardList = new Model.Technique_HazardList { HazardId = hazardList.HazardId, @@ -80,7 +80,7 @@ namespace BLL /// public static void UpdateHazardList(Model.Technique_HazardList hazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_HazardList newHazardList = db.Technique_HazardList.FirstOrDefault(e => e.HazardId == hazardList.HazardId); if (newHazardList != null) { @@ -107,7 +107,7 @@ namespace BLL /// public static void UpdateHazardListIsPass(Model.Technique_HazardList hazardList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_HazardList newHazardList = db.Technique_HazardList.FirstOrDefault(e => e.HazardId == hazardList.HazardId); if (newHazardList != null) { @@ -125,7 +125,7 @@ namespace BLL /// public static void DeleteHazardListById(string hazardId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_HazardList hazardList = db.Technique_HazardList.FirstOrDefault(e => e.HazardId == hazardId); if (hazardList != null) { diff --git a/SGGL/BLL/HSSE/Technique/HazardListTypeService.cs b/SGGL/BLL/HSSE/Technique/HazardListTypeService.cs index b607e74..5b61edc 100644 --- a/SGGL/BLL/HSSE/Technique/HazardListTypeService.cs +++ b/SGGL/BLL/HSSE/Technique/HazardListTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HazardListTypeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍗遍櫓婧愮被鍨 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddHazardListType(Model.Technique_HazardListType hazardListType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_HazardListType newHazardListType = new Model.Technique_HazardListType { HazardListTypeId = hazardListType.HazardListTypeId, @@ -59,7 +59,7 @@ namespace BLL /// public static void UpdateHazardListType(Model.Technique_HazardListType hazardListType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_HazardListType newHazardListType = db.Technique_HazardListType.FirstOrDefault(e => e.HazardListTypeId == hazardListType.HazardListTypeId); if (newHazardListType != null) { @@ -79,7 +79,7 @@ namespace BLL /// public static void DeleteHazardListTypeById(string hazardListTypeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_HazardListType hazardListType = db.Technique_HazardListType.FirstOrDefault(e => e.HazardListTypeId == hazardListTypeId); if (hazardListType != null) { diff --git a/SGGL/BLL/HSSE/Technique/RectifyItemService.cs b/SGGL/BLL/HSSE/Technique/RectifyItemService.cs index 4c11d7d..6d6c3f1 100644 --- a/SGGL/BLL/HSSE/Technique/RectifyItemService.cs +++ b/SGGL/BLL/HSSE/Technique/RectifyItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RectifyItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏闅愭偅鏄庣粏 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddRectifyItem(Model.Technique_RectifyItem rectifyItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_RectifyItem newRectifyItem = new Model.Technique_RectifyItem { RectifyItemId = rectifyItem.RectifyItemId, @@ -63,7 +63,7 @@ namespace BLL /// public static void UpdateRectifyItem(Model.Technique_RectifyItem rectifyItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_RectifyItem newRectifyItem = db.Technique_RectifyItem.FirstOrDefault(e => e.RectifyItemId == rectifyItem.RectifyItemId); if (newRectifyItem != null) { @@ -82,7 +82,7 @@ namespace BLL /// public static void UpdateRectifyItemIsPass(Model.Technique_RectifyItem rectifyItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_RectifyItem newRectifyItem = db.Technique_RectifyItem.FirstOrDefault(e => e.RectifyItemId == rectifyItem.RectifyItemId); if (newRectifyItem != null) { @@ -100,7 +100,7 @@ namespace BLL /// public static void DeleteRectifyItem(string rectifyItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_RectifyItem rectifyItem = db.Technique_RectifyItem.FirstOrDefault(e => e.RectifyItemId == rectifyItemId); if (rectifyItem != null) { @@ -115,7 +115,7 @@ namespace BLL /// public static void DeleteRectifyItemByRectifyId(string rectifyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Technique_RectifyItem where x.RectifyId == rectifyId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/HSSE/Technique/RectifyService.cs b/SGGL/BLL/HSSE/Technique/RectifyService.cs index f70844a..43df2c1 100644 --- a/SGGL/BLL/HSSE/Technique/RectifyService.cs +++ b/SGGL/BLL/HSSE/Technique/RectifyService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RectifyService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀹夊叏闅愭偅 @@ -38,7 +38,7 @@ namespace BLL /// public static void AddRectify(Model.Technique_Rectify rectify) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Rectify newRectify = new Model.Technique_Rectify { RectifyId = rectify.RectifyId, @@ -58,7 +58,7 @@ namespace BLL /// public static void UpdateRectify(Model.Technique_Rectify rectify) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Rectify newRectify = db.Technique_Rectify.FirstOrDefault(e => e.RectifyId == rectify.RectifyId); if (newRectify != null) { @@ -77,7 +77,7 @@ namespace BLL /// public static void DeleteRectify(string rectifyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_Rectify rectify = db.Technique_Rectify.FirstOrDefault(e => e.RectifyId == rectifyId); if (rectify != null) { diff --git a/SGGL/BLL/HSSE/Technique/RiskEvaluationRecordService.cs b/SGGL/BLL/HSSE/Technique/RiskEvaluationRecordService.cs index afd3ec6..6241922 100644 --- a/SGGL/BLL/HSSE/Technique/RiskEvaluationRecordService.cs +++ b/SGGL/BLL/HSSE/Technique/RiskEvaluationRecordService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class RiskEvaluationRecordService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椋庨櫓璇勪环璁板綍 @@ -46,7 +46,7 @@ namespace BLL /// public static void AddRiskEvaluationRecord(Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_RiskEvaluationRecord newRiskEvaluationRecord = new Model.Hazard_RiskEvaluationRecord { LECItemRecordId = RiskEvaluationRecord.LECItemRecordId, @@ -72,7 +72,7 @@ namespace BLL /// public static void UpdateRiskEvaluationRecord(Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_RiskEvaluationRecord newRiskEvaluationRecord = db.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.LECItemRecordId == RiskEvaluationRecord.LECItemRecordId); if (newRiskEvaluationRecord != null) { @@ -97,7 +97,7 @@ namespace BLL /// public static void DeleteRiskEvaluationRecordByLECItemRecordId(string LECItemRecordId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord = db.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.LECItemRecordId == LECItemRecordId); if (RiskEvaluationRecord != null) { diff --git a/SGGL/BLL/HSSE/Technique/SpecialSchemeService.cs b/SGGL/BLL/HSSE/Technique/SpecialSchemeService.cs index 4a11214..82f65a7 100644 --- a/SGGL/BLL/HSSE/Technique/SpecialSchemeService.cs +++ b/SGGL/BLL/HSSE/Technique/SpecialSchemeService.cs @@ -8,7 +8,7 @@ namespace BLL public static class SpecialSchemeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓撻」鏂规 @@ -36,7 +36,7 @@ namespace BLL /// public static void AddSpecialSchemeList(Model.Technique_SpecialScheme specialSchemeList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_SpecialScheme newSpecialSchemeList = new Model.Technique_SpecialScheme { SpecialSchemeId = specialSchemeList.SpecialSchemeId, @@ -63,7 +63,7 @@ namespace BLL /// public static void UpdateSpecialSchemeList(Model.Technique_SpecialScheme specialSchemeList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_SpecialScheme newSpecialSchemeList = db.Technique_SpecialScheme.FirstOrDefault(e => e.SpecialSchemeId == specialSchemeList.SpecialSchemeId); if (newSpecialSchemeList != null) { @@ -86,7 +86,7 @@ namespace BLL /// public static void UpdateSpecialSchemeListIsPass(Model.Technique_SpecialScheme specialSchemeList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_SpecialScheme newSpecialSchemeList = db.Technique_SpecialScheme.FirstOrDefault(e => e.SpecialSchemeId == specialSchemeList.SpecialSchemeId); if (newSpecialSchemeList != null) { @@ -103,7 +103,7 @@ namespace BLL /// public static void DeleteSpecialSchemeListById(string specialSchemeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_SpecialScheme specialSchemeList = db.Technique_SpecialScheme.FirstOrDefault(e => e.SpecialSchemeId == specialSchemeId); if (specialSchemeList != null) { diff --git a/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs b/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs index 989fb20..c98b1ac 100644 --- a/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs +++ b/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class Technique_CheckItemDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇妫鏌ラ」鏄庣粏 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddCheckItemDetail(Model.Technique_CheckItemDetail checkItemDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_CheckItemDetail newCheckItemDetail = new Model.Technique_CheckItemDetail { CheckItemDetailId = checkItemDetail.CheckItemDetailId, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdateCheckItemDetail(Model.Technique_CheckItemDetail checkItemDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_CheckItemDetail newCheckItemDetail = db.Technique_CheckItemDetail.FirstOrDefault(e => e.CheckItemDetailId == checkItemDetail.CheckItemDetailId); if (newCheckItemDetail != null) { @@ -64,7 +64,7 @@ namespace BLL /// public static void DeleteCheckItemDetail(string checkItemDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_CheckItemDetail checkItemDetail = db.Technique_CheckItemDetail.FirstOrDefault(e => e.CheckItemDetailId == checkItemDetailId); if (checkItemDetail != null) { @@ -79,7 +79,7 @@ namespace BLL /// public static void DeleteCheckItemDetailByCheckItemSetId(string checkItemSetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Technique_CheckItemDetail where x.CheckItemSetId == checkItemSetId select x).ToList(); if (q.Count() > 0) { diff --git a/SGGL/BLL/HSSE/Technique/Technique_CheckItemSetService.cs b/SGGL/BLL/HSSE/Technique/Technique_CheckItemSetService.cs index 02315d3..48ee83c 100644 --- a/SGGL/BLL/HSSE/Technique/Technique_CheckItemSetService.cs +++ b/SGGL/BLL/HSSE/Technique/Technique_CheckItemSetService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class Technique_CheckItemSetService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇妫鏌ラ」 @@ -67,7 +67,7 @@ namespace BLL /// public static void AddCheckItemSet(Model.Technique_CheckItemSet checkItemSet) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_CheckItemSet newCheckItemSet = new Model.Technique_CheckItemSet { CheckItemSetId = checkItemSet.CheckItemSetId, @@ -89,7 +89,7 @@ namespace BLL /// public static void UpdateCheckItemSet(Model.Technique_CheckItemSet checkItemSet) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_CheckItemSet newCheckItemSet = db.Technique_CheckItemSet.FirstOrDefault(e => e.CheckItemSetId == checkItemSet.CheckItemSetId); if (newCheckItemSet != null) { @@ -108,7 +108,7 @@ namespace BLL /// public static void DeleteCheckItemSet(string checkItemSetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Technique_CheckItemSet checkItemSet = db.Technique_CheckItemSet.FirstOrDefault(e => e.CheckItemSetId == checkItemSetId); if (checkItemSet != null) { diff --git a/SGGL/BLL/InformationProject/ConstructionLogNewService.cs b/SGGL/BLL/InformationProject/ConstructionLogNewService.cs index 1da7b3b..f195e10 100644 --- a/SGGL/BLL/InformationProject/ConstructionLogNewService.cs +++ b/SGGL/BLL/InformationProject/ConstructionLogNewService.cs @@ -10,7 +10,7 @@ namespace BLL { public class ConstructionLogNewService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇浜哄憳鍒楄〃淇℃伅 /// @@ -107,7 +107,7 @@ namespace BLL /// public static void AddConstructionLog(Model.InformationProject_ConstructionLog ConstructionLog) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.InformationProject_ConstructionLog newConstructionLog = new Model.InformationProject_ConstructionLog { @@ -131,7 +131,7 @@ namespace BLL /// public static void UpdateConstructionLog(Model.InformationProject_ConstructionLog ConstructionLog) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.InformationProject_ConstructionLog newConstructionLog = db.InformationProject_ConstructionLog.FirstOrDefault(e => e.ConstructionLogId == ConstructionLog.ConstructionLogId); if (newConstructionLog != null) @@ -154,7 +154,7 @@ namespace BLL /// public static void DeleteConstructionLogById(string ConstructionLogId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.InformationProject_ConstructionLog ConstructionLog = db.InformationProject_ConstructionLog.FirstOrDefault(e => e.ConstructionLogId == ConstructionLogId); if (ConstructionLog != null) @@ -202,7 +202,7 @@ namespace BLL /// public static void AddConstructionLogItem(Model.InformationProject_ConstructionLogItem item) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.InformationProject_ConstructionLogItem newConstructionLog = new Model.InformationProject_ConstructionLogItem { @@ -222,7 +222,7 @@ namespace BLL /// public static void UpdateConstructionLogItem(Model.InformationProject_ConstructionLogItem item) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.InformationProject_ConstructionLogItem newConstructionLog = db.InformationProject_ConstructionLogItem.FirstOrDefault(e => e.ConstructionLogItemId == item.ConstructionLogItemId); if (newConstructionLog != null) @@ -240,7 +240,7 @@ namespace BLL /// public static void DeleteConstructionLogItemById(string ConstructionLogId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDeleteItem = db.InformationProject_ConstructionLogItem.Where(e => e.ConstructionLogId == ConstructionLogId); if (getDeleteItem.Count() > 0) @@ -257,7 +257,7 @@ namespace BLL /// public static void DeleteConstructionLogItemByConstructionLogItemId(string ConstructionLogItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.InformationProject_ConstructionLogItem ConstructionLog = db.InformationProject_ConstructionLogItem.FirstOrDefault(e => e.ConstructionLogItemId == ConstructionLogItemId); if (ConstructionLog != null) diff --git a/SGGL/BLL/InformationProject/PersonStarLevelService.cs b/SGGL/BLL/InformationProject/PersonStarLevelService.cs index a1c09f9..2751033 100644 --- a/SGGL/BLL/InformationProject/PersonStarLevelService.cs +++ b/SGGL/BLL/InformationProject/PersonStarLevelService.cs @@ -8,7 +8,7 @@ namespace BLL { public class PersonStarLevelService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁剧疆浜哄憳鏄熺骇 @@ -16,7 +16,7 @@ namespace BLL /// public static string SetPersonStarLevel(string projectId, string userId, int? starLevelValue, string starLevelId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string levelId = starLevelId; var getPersons = db.Sys_User.FirstOrDefault(x => x.UserId == userId); @@ -76,7 +76,7 @@ namespace BLL /// public static string UpPersonStarLevel(string projectId, string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string levelId = string.Empty; var getPersons = db.Sys_User.FirstOrDefault(x => x.UserId == userId); @@ -109,7 +109,7 @@ namespace BLL /// public static string collectLog(string projectId, string personId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string starMark = string.Empty; ///宸茬粡瀛樺湪鏄熺骇鐨勪汉鍛 鎵嶈兘鍗囨槦 diff --git a/SGGL/BLL/InformationProject/ProjectConstructionLogService.cs b/SGGL/BLL/InformationProject/ProjectConstructionLogService.cs index 3f209c5..6c4eb3f 100644 --- a/SGGL/BLL/InformationProject/ProjectConstructionLogService.cs +++ b/SGGL/BLL/InformationProject/ProjectConstructionLogService.cs @@ -9,7 +9,7 @@ namespace BLL { public class ProjectConstructionLogService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇浜哄憳鍒楄〃淇℃伅 /// diff --git a/SGGL/BLL/InformationProject/ProjectPersonStarService.cs b/SGGL/BLL/InformationProject/ProjectPersonStarService.cs index 8988fd3..bcd963b 100644 --- a/SGGL/BLL/InformationProject/ProjectPersonStarService.cs +++ b/SGGL/BLL/InformationProject/ProjectPersonStarService.cs @@ -9,7 +9,7 @@ namespace BLL { public class ProjectPersonStarService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鍔冲姟浜哄憳鍒楄〃 /// diff --git a/SGGL/BLL/InformationProject/StarLevelService.cs b/SGGL/BLL/InformationProject/StarLevelService.cs index cbb7324..ddb8e2d 100644 --- a/SGGL/BLL/InformationProject/StarLevelService.cs +++ b/SGGL/BLL/InformationProject/StarLevelService.cs @@ -5,7 +5,7 @@ namespace BLL { public class StarLevelService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浜旀槦绾у埆 @@ -66,7 +66,7 @@ namespace BLL /// public static void AddStarLevel(Model.Base_StarLevel StarLevel) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Base_StarLevel newStarLevel = new Model.Base_StarLevel { @@ -88,7 +88,7 @@ namespace BLL /// public static void UpdateStarLevel(Model.Base_StarLevel StarLevel) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Base_StarLevel newStarLevel = db.Base_StarLevel.FirstOrDefault(e => e.StarLevelId == StarLevel.StarLevelId); if (newStarLevel != null) @@ -109,7 +109,7 @@ namespace BLL /// public static void DeleteStarLevelById(string starLevelId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Base_StarLevel StarLevel = db.Base_StarLevel.FirstOrDefault(e => e.StarLevelId == starLevelId); if (StarLevel != null) @@ -187,7 +187,7 @@ namespace BLL /// public static void AddStarLevelItem(Model.Base_StarLevelItem item) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Base_StarLevelItem newStarLevel = new Model.Base_StarLevelItem { @@ -207,7 +207,7 @@ namespace BLL /// public static void UpdateStarLevelItem(Model.Base_StarLevelItem item) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Base_StarLevelItem newStarLevel = db.Base_StarLevelItem.FirstOrDefault(e => e.StarLevelItemId == item.StarLevelItemId); if (newStarLevel != null) @@ -225,7 +225,7 @@ namespace BLL /// public static void DeleteStarLevelItemById(string StarLevelId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDeleteItem = db.Base_StarLevelItem.Where(e => e.StarLevelId == StarLevelId); if (getDeleteItem.Count() > 0) @@ -242,7 +242,7 @@ namespace BLL /// public static void DeleteStarLevelItemByStarLevelItemId(string StarLevelItemId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Base_StarLevelItem StarLevel = db.Base_StarLevelItem.FirstOrDefault(e => e.StarLevelItemId == StarLevelItemId); if (StarLevel != null) diff --git a/SGGL/BLL/JDGL/WBS/CnProfessionInitService.cs b/SGGL/BLL/JDGL/WBS/CnProfessionInitService.cs index 3c7edcd..986c57a 100644 --- a/SGGL/BLL/JDGL/WBS/CnProfessionInitService.cs +++ b/SGGL/BLL/JDGL/WBS/CnProfessionInitService.cs @@ -30,7 +30,7 @@ namespace BLL /// 涓撲笟 //public static void AddCnProfessionInit(Model.WBS_CnProfessionInit cnProfessionInit) //{ - // Model.SGGLDB db = Funs.DB; + // Model.CNPCDB db = Funs.DB; // Model.WBS_CnProfessionInit newCnP = new Model.WBS_CnProfessionInit(); // newCnP.CnProfessionId = SQLHelper.GetNewID(typeof(Model.WBS_CnProfessionInit)); // newCnP.CnProfessionName = cnProfessionInit.CnProfessionName; @@ -52,7 +52,7 @@ namespace BLL /// 涓撲笟 public static void UpdateCnProfession(Model.WBS_CnProfessionInit cnProfessionInit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_CnProfessionInit newCnP = db.WBS_CnProfessionInit.First(e => e.CnProfessionId == cnProfessionInit.CnProfessionId); newCnP.CnProfessionName = cnProfessionInit.CnProfessionName; @@ -68,7 +68,7 @@ namespace BLL /// public static void DeleteCnProfessionInit(string cnProfessionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_CnProfessionInit CnP = db.WBS_CnProfessionInit.First(e => e.CnProfessionId.ToString() == cnProfessionId); db.WBS_CnProfessionInit.DeleteOnSubmit(CnP); db.SubmitChanges(); diff --git a/SGGL/BLL/JDGL/WBS/CnProfessionService.cs b/SGGL/BLL/JDGL/WBS/CnProfessionService.cs index 8c6cb59..f96a29b 100644 --- a/SGGL/BLL/JDGL/WBS/CnProfessionService.cs +++ b/SGGL/BLL/JDGL/WBS/CnProfessionService.cs @@ -30,7 +30,7 @@ namespace BLL /// 涓撲笟 public static void AddCnProfession(Model.WBS_CnProfession cnProfession) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_CnProfession newCnP = new Model.WBS_CnProfession(); newCnP.CnProfessionId = SQLHelper.GetNewID(typeof(Model.WBS_CnProfession)); newCnP.CnProfessionName = cnProfession.CnProfessionName; @@ -53,7 +53,7 @@ namespace BLL /// 涓撲笟 public static void UpdateCnProfession(Model.WBS_CnProfession cnProfession) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_CnProfession newCnP = db.WBS_CnProfession.First(e => e.CnProfessionId == cnProfession.CnProfessionId); newCnP.CnProfessionName = cnProfession.CnProfessionName; @@ -73,7 +73,7 @@ namespace BLL /// public static void DeleteCnProfession(string cnProfessionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_CnProfession CnP = db.WBS_CnProfession.First(e => e.CnProfessionId == cnProfessionId); db.WBS_CnProfession.DeleteOnSubmit(CnP); db.SubmitChanges(); diff --git a/SGGL/BLL/JDGL/WBS/UnitProjectInitService.cs b/SGGL/BLL/JDGL/WBS/UnitProjectInitService.cs index 25a68e8..0dc8239 100644 --- a/SGGL/BLL/JDGL/WBS/UnitProjectInitService.cs +++ b/SGGL/BLL/JDGL/WBS/UnitProjectInitService.cs @@ -54,7 +54,7 @@ namespace BLL /// 鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋 public static void AddUnitProjectInit(Model.Wbs_UnitProjectInit unitProjectInit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_UnitProjectInit newUP = new Model.Wbs_UnitProjectInit(); newUP.UnitProjectCode = unitProjectInit.UnitProjectCode; newUP.UnitProjectName = unitProjectInit.UnitProjectName; @@ -73,7 +73,7 @@ namespace BLL /// 鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋 public static void UpdateUnitProjectInit(Model.Wbs_UnitProjectInit unitProjectInit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_UnitProjectInit newUP = db.Wbs_UnitProjectInit.First(e => e.UnitProjectCode == unitProjectInit.UnitProjectCode); newUP.UnitProjectName = unitProjectInit.UnitProjectName; @@ -87,7 +87,7 @@ namespace BLL /// public static void DeleteUnitProjectInit(string unitProjectCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_UnitProjectInit UP = db.Wbs_UnitProjectInit.First(e => e.UnitProjectCode == unitProjectCode); db.Wbs_UnitProjectInit.DeleteOnSubmit(UP); db.SubmitChanges(); @@ -99,7 +99,7 @@ namespace BLL /// public static void DeleteUnitProjectInitBySuperUnitProject(string superUnitProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Wbs_UnitProjectInit where x.SuperUnitProject == superUnitProject select x; db.Wbs_UnitProjectInit.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/JDGL/WBS/UnitProjectService.cs b/SGGL/BLL/JDGL/WBS/UnitProjectService.cs index e5f34bb..70141d4 100644 --- a/SGGL/BLL/JDGL/WBS/UnitProjectService.cs +++ b/SGGL/BLL/JDGL/WBS/UnitProjectService.cs @@ -70,7 +70,7 @@ namespace BLL /// 鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋 public static void AddUnitProject(Model.Wbs_UnitProject unitProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_UnitProject newUP = new Model.Wbs_UnitProject(); newUP.UnitProjectId = unitProject.UnitProjectId; newUP.UnitProjectName = unitProject.UnitProjectName; @@ -102,7 +102,7 @@ namespace BLL /// 鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋 public static void UpdateUnitProject(Model.Wbs_UnitProject unitProject) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_UnitProject newUP = db.Wbs_UnitProject.First(e => e.UnitProjectId == unitProject.UnitProjectId); newUP.UnitProjectName = unitProject.UnitProjectName; @@ -130,7 +130,7 @@ namespace BLL /// public static void DeleteUnitProject(string unitProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_UnitProject UP = db.Wbs_UnitProject.First(e => e.UnitProjectId == unitProjectId); db.Wbs_UnitProject.DeleteOnSubmit(UP); db.SubmitChanges(); @@ -142,7 +142,7 @@ namespace BLL /// public static void DeleteUnitProjectBySuperUnitProjectId(string superUnitProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Wbs_UnitProject where x.SuperUnitProjectId == superUnitProjectId select x; db.Wbs_UnitProject.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/JDGL/WBS/WbsDetailHistoryService.cs b/SGGL/BLL/JDGL/WBS/WbsDetailHistoryService.cs index f0344bd..dc2b0bd 100644 --- a/SGGL/BLL/JDGL/WBS/WbsDetailHistoryService.cs +++ b/SGGL/BLL/JDGL/WBS/WbsDetailHistoryService.cs @@ -38,7 +38,7 @@ namespace BLL /// WBS鐗堟湰鍘嗗彶鏄庣粏 public static void AddWbsDetailHistory(Model.WbsDetailHistory wbsDetailHistory) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WbsDetailHistory newWbsDetailHistory = new Model.WbsDetailHistory(); newWbsDetailHistory.WbsDetailHistoryId = wbsDetailHistory.WbsDetailHistoryId; newWbsDetailHistory.ToWbs = wbsDetailHistory.ToWbs; @@ -59,7 +59,7 @@ namespace BLL /// public static void DeleteWbsDetailHistory(string wbsDetailHistoryId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WbsDetailHistory ins = db.WbsDetailHistory.First(e => e.WbsDetailHistoryId == wbsDetailHistoryId); db.WbsDetailHistory.DeleteOnSubmit(ins); db.SubmitChanges(); @@ -71,7 +71,7 @@ namespace BLL /// public static void DeleteWbsDetailHistoryByToWbs(string toWbs) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var details = from x in db.WbsDetailHistory where x.ToWbs == toWbs select x; if (details.Count() > 0) { diff --git a/SGGL/BLL/JDGL/WBS/WbsDetailService.cs b/SGGL/BLL/JDGL/WBS/WbsDetailService.cs index 78a2b38..f878634 100644 --- a/SGGL/BLL/JDGL/WBS/WbsDetailService.cs +++ b/SGGL/BLL/JDGL/WBS/WbsDetailService.cs @@ -128,7 +128,7 @@ namespace BLL /// WBS鏄庣粏 public static void AddWbsDetail(Model.WbsDetail wbsDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WbsDetail newWbsDetail = new Model.WbsDetail(); newWbsDetail.WbsDetailId = wbsDetail.WbsDetailId; newWbsDetail.ToWbs = wbsDetail.ToWbs; @@ -153,7 +153,7 @@ namespace BLL /// WBS鏄庣粏 public static void UpdateWbsDetail(Model.WbsDetail wbsDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WbsDetail newWbsDetail = db.WbsDetail.First(e => e.WbsDetailId == wbsDetail.WbsDetailId); newWbsDetail.EngineeringQuantity = wbsDetail.EngineeringQuantity; @@ -175,7 +175,7 @@ namespace BLL /// public static void DeleteWbsDetail(string wbsDetailId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WbsDetail ins = db.WbsDetail.First(e => e.WbsDetailId == wbsDetailId); db.WbsDetail.DeleteOnSubmit(ins); db.SubmitChanges(); @@ -187,7 +187,7 @@ namespace BLL /// public static void DeleteWbsDetailByToWbs(string toWbs) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var details = from x in db.WbsDetail where x.ToWbs == toWbs select x; if (details.Count() > 0) { diff --git a/SGGL/BLL/JDGL/WBS/WbsSetInitService.cs b/SGGL/BLL/JDGL/WBS/WbsSetInitService.cs index 14a8d9f..c07bc80 100644 --- a/SGGL/BLL/JDGL/WBS/WbsSetInitService.cs +++ b/SGGL/BLL/JDGL/WBS/WbsSetInitService.cs @@ -20,7 +20,7 @@ namespace BLL /// 鍒嗛儴/瀛愬垎閮/鍒嗛」/瀛愬垎椤 public static void AddWbsSetInit(Model.WBS_WbsSetInit wbsSetInit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WbsSetInit newWS = new Model.WBS_WbsSetInit(); newWS.WbsSetCode = wbsSetInit.WbsSetCode; newWS.WbsSetName = wbsSetInit.WbsSetName; @@ -44,7 +44,7 @@ namespace BLL /// 鍒嗛儴/瀛愬垎閮/鍒嗛」/瀛愬垎椤 public static void UpdateWbsSetInit(Model.WBS_WbsSetInit wbsSetInit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WbsSetInit newWS = db.WBS_WbsSetInit.First(e => e.WbsSetCode == wbsSetInit.WbsSetCode); newWS.WbsSetName = wbsSetInit.WbsSetName; @@ -63,7 +63,7 @@ namespace BLL /// public static void DeleteWbsSetInit(string wbsSetCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_WbsSetInit WS = db.WBS_WbsSetInit.First(e => e.WbsSetCode == wbsSetCode); db.WBS_WbsSetInit.DeleteOnSubmit(WS); db.SubmitChanges(); @@ -75,7 +75,7 @@ namespace BLL /// public static void DeleteWbsSetInitByUnitProjectCode(string unitProjectCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.WBS_WbsSetInit where x.UnitProjectCode == unitProjectCode select x; db.WBS_WbsSetInit.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/JDGL/WBS/WbsSetService.cs b/SGGL/BLL/JDGL/WBS/WbsSetService.cs index 381d34d..2bab1e2 100644 --- a/SGGL/BLL/JDGL/WBS/WbsSetService.cs +++ b/SGGL/BLL/JDGL/WBS/WbsSetService.cs @@ -20,7 +20,7 @@ namespace BLL /// 鍒嗛儴/瀛愬垎閮/鍒嗛」/瀛愬垎椤 public static void AddWbsSet(Model.Wbs_WbsSet wbsSet) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_WbsSet newWS = new Model.Wbs_WbsSet(); newWS.WbsSetId = wbsSet.WbsSetId; newWS.WbsSetName = wbsSet.WbsSetName; @@ -59,7 +59,7 @@ namespace BLL /// 鍒嗛儴/瀛愬垎閮/鍒嗛」/瀛愬垎椤 public static void UpdateWbsSet(Model.Wbs_WbsSet wbsSet) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_WbsSet newWS = db.Wbs_WbsSet.First(e => e.WbsSetId == wbsSet.WbsSetId); newWS.WbsSetName = wbsSet.WbsSetName; @@ -100,7 +100,7 @@ namespace BLL /// 鍒嗛儴/瀛愬垎閮/鍒嗛」/瀛愬垎椤 public static void UpdateWbsSetIsPlanApprove(Model.Wbs_WbsSet wbsSet, bool isPlanApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_WbsSet newWS = db.Wbs_WbsSet.First(e => e.WbsSetId == wbsSet.WbsSetId); newWS.IsPlanApprove = wbsSet.IsPlanApprove; db.SubmitChanges(); @@ -112,7 +112,7 @@ namespace BLL /// public static void DeleteWbsSet(string wbsSetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Wbs_WbsSet WS = db.Wbs_WbsSet.First(e => e.WbsSetId == wbsSetId); db.Wbs_WbsSet.DeleteOnSubmit(WS); db.SubmitChanges(); @@ -124,7 +124,7 @@ namespace BLL /// public static void DeleteWbsSetByUnitProjectId(string unitProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Wbs_WbsSet where x.UnitProjectId == unitProjectId select x; db.Wbs_WbsSet.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/LoginService.cs b/SGGL/BLL/LoginService.cs index a6f25fc..7fededf 100644 --- a/SGGL/BLL/LoginService.cs +++ b/SGGL/BLL/LoginService.cs @@ -10,7 +10,7 @@ namespace BLL public static class LoginService { - public static SGGLDB db = Funs.DB; + public static CNPCDB db = Funs.DB; /// /// 用户登录成功方法 diff --git a/SGGL/BLL/Notice/NoticeService.cs b/SGGL/BLL/Notice/NoticeService.cs index 9118f2c..15ac28e 100644 --- a/SGGL/BLL/Notice/NoticeService.cs +++ b/SGGL/BLL/Notice/NoticeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class NoticeService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇閫氱煡 @@ -28,7 +28,7 @@ namespace BLL /// 鍥剧墖瀹炰綋 public static void AddNotice(Model.InformationProject_Notice Notice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_Notice newNotice = new Model.InformationProject_Notice { NoticeId = Notice.NoticeId, @@ -70,7 +70,7 @@ namespace BLL /// public static void UpdateNotice(Model.InformationProject_Notice notice) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_Notice newNotice = db.InformationProject_Notice.FirstOrDefault(e => e.NoticeId == notice.NoticeId); if (newNotice != null) { @@ -114,7 +114,7 @@ namespace BLL /// public static void DeleteNoticeById(string noticeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_Notice Notice = db.InformationProject_Notice.FirstOrDefault(e => e.NoticeId == noticeId); if (Notice != null) { diff --git a/SGGL/BLL/OfficeCheck/ProjectEvaluation/ProjectEvaluationService.cs b/SGGL/BLL/OfficeCheck/ProjectEvaluation/ProjectEvaluationService.cs index 8784ec2..39141b2 100644 --- a/SGGL/BLL/OfficeCheck/ProjectEvaluation/ProjectEvaluationService.cs +++ b/SGGL/BLL/OfficeCheck/ProjectEvaluation/ProjectEvaluationService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectEvaluationService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰缁╂晥璇勪环 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddPerfomanceRecord(Model.ProjectSupervision_ProjectEvaluation perfomanceRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectSupervision_ProjectEvaluation newPerfomanceRecord = new Model.ProjectSupervision_ProjectEvaluation { PerfomanceRecordId = perfomanceRecord.PerfomanceRecordId, @@ -96,7 +96,7 @@ namespace BLL /// public static void UpdatePerfomanceRecord(Model.ProjectSupervision_ProjectEvaluation perfomanceRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectSupervision_ProjectEvaluation newPerfomanceRecord = db.ProjectSupervision_ProjectEvaluation.FirstOrDefault(e => e.PerfomanceRecordId == perfomanceRecord.PerfomanceRecordId); if (newPerfomanceRecord != null) { @@ -163,7 +163,7 @@ namespace BLL /// public static void DeletePerfomanceRecordById(string perfomanceRecordId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectSupervision_ProjectEvaluation perfomanceRecord = db.ProjectSupervision_ProjectEvaluation.FirstOrDefault(e => e.PerfomanceRecordId == perfomanceRecordId); if (perfomanceRecord != null) { diff --git a/SGGL/BLL/OpenService/GetDataService.cs b/SGGL/BLL/OpenService/GetDataService.cs index d708caa..8e61f70 100644 --- a/SGGL/BLL/OpenService/GetDataService.cs +++ b/SGGL/BLL/OpenService/GetDataService.cs @@ -17,7 +17,7 @@ namespace BLL /// public static void CreateTrainingTaskItemByTaskId(string taskId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { /////鏌ユ壘鏈敓鎴愭暀鏉愭槑缁嗙殑 鍩硅浠诲姟 var getTasks = from x in db.Training_Task @@ -71,7 +71,7 @@ namespace BLL /// public static void UpdateTestPlanStates() { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var getTestPlans = from x in db.Training_TestPlan where x.States == Const.State_2 && x.TestEndTime.AddMinutes(x.Duration) < DateTime.Now select x; @@ -104,7 +104,7 @@ namespace BLL /// public static void UpdateServerTestPlanStates() { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var getTrainingTestRecords = from x in db.Test_TestRecord where x.TestStartTime.Value.AddMinutes(x.Duration.Value) < DateTime.Now @@ -125,7 +125,7 @@ namespace BLL /// public static void CorrectingPersonInOutNumber(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getProjects = (from x in db.Base_Project where x.ProjectState == null || x.ProjectState == Const.ProjectState_1 @@ -246,7 +246,7 @@ namespace BLL /// public static void CreateQRCode() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPersons = from x in db.SitePerson_Person where x.IdentityCard != null && x.QRCodeAttachUrl == null @@ -273,7 +273,7 @@ namespace BLL /// public static void SitePersonjAutomaticOut() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPersons = from x in db.SitePerson_Person where x.OutTime < DateTime.Now && x.IsUsed == true @@ -336,7 +336,7 @@ namespace BLL /// public static void CloseLicenseData() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { ////鍔ㄧ伀浣滀笟 //var getFireWorks = from x in db.License_FireWork diff --git a/SGGL/BLL/OpenService/MonitorService.cs b/SGGL/BLL/OpenService/MonitorService.cs index ffedab2..958b46b 100644 --- a/SGGL/BLL/OpenService/MonitorService.cs +++ b/SGGL/BLL/OpenService/MonitorService.cs @@ -140,7 +140,7 @@ namespace BLL /// 浜嬩欢鍙傛暟 private static void AdWeather(object sender, ElapsedEventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var projects = from x in db.Base_Project where x.ProjectState2 != "7" && x.City != null && x.City != "" select x; string APPID = "83247952"; diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs index cd0f27b..fe7129e 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class GJSXItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁鍏抽敭浜嬮」ID鏌ヨ鎵鏈夊叧閿簨椤硅繘灞 @@ -50,7 +50,7 @@ namespace BLL /// public static void AddGJSXMX(Model.GJSX_detail gjsxmx) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.GJSX_detail)); Model.GJSX_detail newGJSXMX = new Model.GJSX_detail(); @@ -72,7 +72,7 @@ namespace BLL /// 鍏抽敭浜嬮」ID public static void DeleteGJSXMXByGJSXID(string GJSXID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.GJSX_detail where x.GJSXID == GJSXID select x).ToList(); if (q != null) { @@ -87,7 +87,7 @@ namespace BLL /// public static void AddItemUser(Model.GJSX_detail item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.GJSX_detail newitem = new Model.GJSX_detail(); string newKeyID = SQLHelper.GetNewID(typeof(Model.GJSX_detail)); newitem.Cuid = newKeyID; @@ -101,7 +101,7 @@ namespace BLL } public static void UpdateGJSXdetail(Model.GJSX_detail _GJSX_detail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.GJSX_detail newGJSX_detail = db.GJSX_detail.FirstOrDefault(e => e.Cuid == _GJSX_detail.Cuid); if (newGJSX_detail != null) { diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXProcessService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXProcessService.cs index eac0f76..0526ad6 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXProcessService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXProcessService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class GJSXProcessService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 娣诲姞 @@ -16,7 +16,7 @@ namespace BLL /// public static void AddProcess(Model.GJSX_Process process) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.GJSX_Process newProcess = new Model.GJSX_Process(); string newKeyID = SQLHelper.GetNewID(typeof(Model.GJSX_Process)); newProcess.ProcessID = newKeyID; @@ -33,7 +33,7 @@ namespace BLL /// public static void DeleteProcess(string GJSXID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.GJSX_Process where x.GJSXID == GJSXID select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXService.cs index 5b7e2c1..7fac7d5 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class GJSXService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddGJSX(Model.GJSX _GJSX) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.GJSX newGJSX = new Model.GJSX { GJSXID = _GJSX.GJSXID, @@ -56,7 +56,7 @@ namespace BLL /// public static void UpdateGJSX(Model.GJSX _GJSX) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.GJSX newGJSX = db.GJSX.FirstOrDefault(e => e.GJSXID == _GJSX.GJSXID); if (newGJSX != null) { @@ -85,7 +85,7 @@ namespace BLL /// public static void DeleteGJSXById(string _GJSXID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.GJSX _GJSX = db.GJSX.FirstOrDefault(e => e.GJSXID == _GJSXID); { db.GJSX.DeleteOnSubmit(_GJSX); diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs index 3bc462a..08b2e2f 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class ConstructionLogService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰绾ф柦宸ユ棩蹇 @@ -40,7 +40,7 @@ namespace BLL /// public static void AddConstructionLog(Model.ZHGL_ConstructionLog ConstructionLog) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionLog newConstructionLog = new Model.ZHGL_ConstructionLog { ConstructionLogId = ConstructionLog.ConstructionLogId, @@ -64,7 +64,7 @@ namespace BLL /// public static void UpdateConstructionLog(Model.ZHGL_ConstructionLog ConstructionLog) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionLog newConstructionLog = db.ZHGL_ConstructionLog.FirstOrDefault(e => e.ConstructionLogId == ConstructionLog.ConstructionLogId); if (newConstructionLog != null) { @@ -84,7 +84,7 @@ namespace BLL /// public static void DeleteConstructionLogById(string ConstructionLogId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionLog ConstructionLog = db.ZHGL_ConstructionLog.FirstOrDefault(e => e.ConstructionLogId == ConstructionLogId); if (ConstructionLog != null) { diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanApproveService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanApproveService.cs index 68bd009..c3607d2 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanApproveService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class ConstructionPlanApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -41,7 +41,7 @@ namespace BLL /// 鎬绘壙鍖呭晢鏂藉伐璁″垝涓婚敭 public static void DeleteConstructionPlanApproveByConstructionPlanId(string noticeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var data = (from x in db.ZHGL_ConstructionPlanApprove where x.ConstructionPlanId == noticeId select x).ToList(); if (data != null) { @@ -56,7 +56,7 @@ namespace BLL /// 鎬绘壙鍖呭晢鏂藉伐璁″垝瀹℃壒瀹炰綋 public static void AddConstructionPlanApprove(Model.ZHGL_ConstructionPlanApprove ConstructionPlanApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.ZHGL_ConstructionPlanApprove)); Model.ZHGL_ConstructionPlanApprove newConstructionPlanApprove = new Model.ZHGL_ConstructionPlanApprove(); newConstructionPlanApprove.ConstructionPlanApproveId = newKeyID; @@ -73,7 +73,7 @@ namespace BLL } public static string AddConstructionPlanApproveForApi(Model.ZHGL_ConstructionPlanApprove ConstructionPlanApprove) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.ZHGL_ConstructionPlanApprove)); Model.ZHGL_ConstructionPlanApprove newConstructionPlanApprove = new Model.ZHGL_ConstructionPlanApprove(); @@ -106,7 +106,7 @@ namespace BLL /// 鎬绘壙鍖呭晢鏂藉伐璁″垝瀹℃壒瀹炰綋 public static void UpdateConstructionPlanApprove(Model.ZHGL_ConstructionPlanApprove ConstructionPlanApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionPlanApprove newConstructionPlanApprove = db.ZHGL_ConstructionPlanApprove.First(e => e.ConstructionPlanApproveId == ConstructionPlanApprove.ConstructionPlanApproveId); newConstructionPlanApprove.ConstructionPlanId = ConstructionPlanApprove.ConstructionPlanId; newConstructionPlanApprove.ApproveMan = ConstructionPlanApprove.ApproveMan; @@ -124,14 +124,14 @@ namespace BLL } public static Model.ZHGL_ConstructionPlanApprove GetConstructionPlanApproveById(string ConstructionPlanApproveId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return db.ZHGL_ConstructionPlanApprove.FirstOrDefault(x => x.ConstructionPlanApproveId == ConstructionPlanApproveId); } } public static List getListDataByIdForApi(string ConstructionPlanId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.ZHGL_ConstructionPlanApprove where x.ConstructionPlanId == ConstructionPlanId && x.ApproveDate != null && x.ApproveType != "S" @@ -169,7 +169,7 @@ namespace BLL } public static Model.ZHGL_ConstructionPlanApprove getCurrApproveForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.ZHGL_ConstructionPlanApprove newConstructionPlanApprove = db.ZHGL_ConstructionPlanApprove.FirstOrDefault(e => e.ConstructionPlanId == id && e.ApproveDate == null); if (newConstructionPlanApprove != null) @@ -188,7 +188,7 @@ namespace BLL /// 鎬绘壙鍖呭晢鏂藉伐璁″垝瀹℃壒瀹炰綋 public static void UpdateConstructionPlanApproveForApi(Model.ZHGL_ConstructionPlanApprove ConstructionPlanApprove) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.ZHGL_ConstructionPlanApprove newConstructionPlanApprove = db.ZHGL_ConstructionPlanApprove.FirstOrDefault(e => e.ConstructionPlanApproveId == ConstructionPlanApprove.ConstructionPlanApproveId); diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanService.cs index 88a1cff..2ab7621 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class ConstructionPlanService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鎬绘壙鍖呭晢鏂藉伐璁″垝 @@ -29,7 +29,7 @@ namespace BLL /// public static void AddConstructionPlan(Model.ZHGL_ConstructionPlan ConstructionPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionPlan newConstructionPlan = new Model.ZHGL_ConstructionPlan { ConstructionPlanId = ConstructionPlan.ConstructionPlanId, @@ -50,7 +50,7 @@ namespace BLL /// public static void UpdateConstructionPlan(Model.ZHGL_ConstructionPlan ConstructionPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionPlan newConstructionPlan = db.ZHGL_ConstructionPlan.FirstOrDefault(e => e.ConstructionPlanId == ConstructionPlan.ConstructionPlanId); if (newConstructionPlan != null) { @@ -67,7 +67,7 @@ namespace BLL /// public static void DeleteConstructionPlanById(string ConstructionPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionPlan ConstructionPlan = db.ZHGL_ConstructionPlan.FirstOrDefault(e => e.ConstructionPlanId == ConstructionPlanId); if (ConstructionPlan != null) { diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionReportApproveService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionReportApproveService.cs index e37b07c..180cc5e 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionReportApproveService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionReportApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class ConstructionReportApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -41,7 +41,7 @@ namespace BLL /// 鎬绘壙鍖呭晢鏂藉伐鎶ュ憡涓婚敭 public static void DeleteConstructionReportApproveByConstructionReportId(string noticeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var data = (from x in db.ZHGL_ConstructionReportApprove where x.ConstructionReportId == noticeId select x).ToList(); if (data != null) { @@ -56,7 +56,7 @@ namespace BLL /// 鎬绘壙鍖呭晢鏂藉伐鎶ュ憡瀹℃壒瀹炰綋 public static void AddConstructionReportApprove(Model.ZHGL_ConstructionReportApprove ConstructionReportApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.ZHGL_ConstructionReportApprove)); Model.ZHGL_ConstructionReportApprove newConstructionReportApprove = new Model.ZHGL_ConstructionReportApprove(); newConstructionReportApprove.ConstructionReportApproveId = newKeyID; @@ -73,7 +73,7 @@ namespace BLL } public static string AddConstructionReportApproveForApi(Model.ZHGL_ConstructionReportApprove ConstructionReportApprove) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.ZHGL_ConstructionReportApprove)); Model.ZHGL_ConstructionReportApprove newConstructionReportApprove = new Model.ZHGL_ConstructionReportApprove(); @@ -106,7 +106,7 @@ namespace BLL /// 鎬绘壙鍖呭晢鏂藉伐鎶ュ憡瀹℃壒瀹炰綋 public static void UpdateConstructionReportApprove(Model.ZHGL_ConstructionReportApprove ConstructionReportApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionReportApprove newConstructionReportApprove = db.ZHGL_ConstructionReportApprove.First(e => e.ConstructionReportApproveId == ConstructionReportApprove.ConstructionReportApproveId); newConstructionReportApprove.ConstructionReportId = ConstructionReportApprove.ConstructionReportId; newConstructionReportApprove.ApproveMan = ConstructionReportApprove.ApproveMan; @@ -124,14 +124,14 @@ namespace BLL } public static Model.ZHGL_ConstructionReportApprove GetConstructionReportApproveById(string ConstructionReportApproveId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return db.ZHGL_ConstructionReportApprove.FirstOrDefault(x => x.ConstructionReportApproveId == ConstructionReportApproveId); } } public static List getListDataByIdForApi(string ConstructionReportId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.ZHGL_ConstructionReportApprove where x.ConstructionReportId == ConstructionReportId && x.ApproveDate != null && x.ApproveType != "S" @@ -169,7 +169,7 @@ namespace BLL } public static Model.ZHGL_ConstructionReportApprove getCurrApproveForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.ZHGL_ConstructionReportApprove newConstructionReportApprove = db.ZHGL_ConstructionReportApprove.FirstOrDefault(e => e.ConstructionReportId == id && e.ApproveDate == null); if (newConstructionReportApprove != null) @@ -188,7 +188,7 @@ namespace BLL /// 鎬绘壙鍖呭晢鏂藉伐鎶ュ憡瀹℃壒瀹炰綋 public static void UpdateConstructionReportApproveForApi(Model.ZHGL_ConstructionReportApprove ConstructionReportApprove) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.ZHGL_ConstructionReportApprove newConstructionReportApprove = db.ZHGL_ConstructionReportApprove.FirstOrDefault(e => e.ConstructionReportApproveId == ConstructionReportApprove.ConstructionReportApproveId); diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionReportService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionReportService.cs index 13bb147..d8459f7 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionReportService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionReportService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class ConstructionReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鎬绘壙鍖呭晢鏂藉伐鎶ュ憡 @@ -29,7 +29,7 @@ namespace BLL /// public static void AddConstructionReport(Model.ZHGL_ConstructionReport ConstructionReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionReport newConstructionReport = new Model.ZHGL_ConstructionReport { ConstructionReportId = ConstructionReport.ConstructionReportId, @@ -51,7 +51,7 @@ namespace BLL /// public static void UpdateConstructionReport(Model.ZHGL_ConstructionReport ConstructionReport) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionReport newConstructionReport = db.ZHGL_ConstructionReport.FirstOrDefault(e => e.ConstructionReportId == ConstructionReport.ConstructionReportId); if (newConstructionReport != null) { @@ -68,7 +68,7 @@ namespace BLL /// public static void DeleteConstructionReportById(string ConstructionReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_ConstructionReport ConstructionReport = db.ZHGL_ConstructionReport.FirstOrDefault(e => e.ConstructionReportId == ConstructionReportId); if (ConstructionReport != null) { diff --git a/SGGL/BLL/PZHGL/InformationProject/PictureService.cs b/SGGL/BLL/PZHGL/InformationProject/PictureService.cs index b0d7314..aec19b1 100644 --- a/SGGL/BLL/PZHGL/InformationProject/PictureService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/PictureService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PictureService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰鍥剧墖 @@ -28,7 +28,7 @@ namespace BLL /// 鍥剧墖瀹炰綋 public static void AddPicture(Model.InformationProject_Picture picture) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_Picture newPicture = new Model.InformationProject_Picture { PictureId = picture.PictureId, @@ -54,7 +54,7 @@ namespace BLL /// public static void UpdatePicture(Model.InformationProject_Picture picture) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_Picture newPicture = db.InformationProject_Picture.FirstOrDefault(e => e.PictureId == picture.PictureId); if (newPicture != null) { @@ -76,7 +76,7 @@ namespace BLL /// public static void deletePictureById(string pictureId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_Picture picture = db.InformationProject_Picture.FirstOrDefault(e => e.PictureId == pictureId); if (picture != null) { diff --git a/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs b/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs index e9fee78..c9c5f04 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ReceiveFileManagerService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇涓鑸潵鏂 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddReceiveFileManager(Model.InformationProject_ReceiveFileManager ReceiveFileManager) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ReceiveFileManager newReceiveFileManager = new Model.InformationProject_ReceiveFileManager { ReceiveFileManagerId = ReceiveFileManager.ReceiveFileManagerId, @@ -61,7 +61,7 @@ namespace BLL /// public static void UpdateReceiveFileManager(Model.InformationProject_ReceiveFileManager ReceiveFileManager) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ReceiveFileManager newReceiveFileManager = db.InformationProject_ReceiveFileManager.FirstOrDefault(e => e.ReceiveFileManagerId == ReceiveFileManager.ReceiveFileManagerId); if (newReceiveFileManager != null) { @@ -88,7 +88,7 @@ namespace BLL /// public static void DeleteReceiveFileManagerById(string ReceiveFileManagerId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ReceiveFileManager ReceiveFileManager = db.InformationProject_ReceiveFileManager.FirstOrDefault(e => e.ReceiveFileManagerId == ReceiveFileManagerId); if (ReceiveFileManager != null) { diff --git a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverApproveService.cs b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverApproveService.cs index 7f208a5..8f46966 100644 --- a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverApproveService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class WorkHandoverApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -41,7 +41,7 @@ namespace BLL /// 宸ヤ綔浜ゆ帴涓婚敭 public static void DeleteWorkHandoverApproveByWorkHandoverId(string noticeId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var data = (from x in db.ZHGL_WorkHandoverApprove where x.WorkHandoverId == noticeId select x).ToList(); if (data != null) { @@ -56,7 +56,7 @@ namespace BLL /// 宸ヤ綔浜ゆ帴瀹℃壒瀹炰綋 public static void AddWorkHandoverApprove(Model.ZHGL_WorkHandoverApprove WorkHandoverApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.ZHGL_WorkHandoverApprove)); Model.ZHGL_WorkHandoverApprove newWorkHandoverApprove = new Model.ZHGL_WorkHandoverApprove(); newWorkHandoverApprove.WorkHandoverApproveId = newKeyID; @@ -73,7 +73,7 @@ namespace BLL } public static string AddWorkHandoverApproveForApi(Model.ZHGL_WorkHandoverApprove WorkHandoverApprove) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { string newKeyID = SQLHelper.GetNewID(typeof(Model.ZHGL_WorkHandoverApprove)); Model.ZHGL_WorkHandoverApprove newWorkHandoverApprove = new Model.ZHGL_WorkHandoverApprove(); @@ -106,7 +106,7 @@ namespace BLL /// 宸ヤ綔浜ゆ帴瀹℃壒瀹炰綋 public static void UpdateWorkHandoverApprove(Model.ZHGL_WorkHandoverApprove WorkHandoverApprove) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_WorkHandoverApprove newWorkHandoverApprove = db.ZHGL_WorkHandoverApprove.First(e => e.WorkHandoverApproveId == WorkHandoverApprove.WorkHandoverApproveId); newWorkHandoverApprove.WorkHandoverId = WorkHandoverApprove.WorkHandoverId; newWorkHandoverApprove.ApproveMan = WorkHandoverApprove.ApproveMan; @@ -124,14 +124,14 @@ namespace BLL } public static Model.ZHGL_WorkHandoverApprove GetWorkHandoverApproveById(string WorkHandoverApproveId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return db.ZHGL_WorkHandoverApprove.FirstOrDefault(x => x.WorkHandoverApproveId == WorkHandoverApproveId); } } public static List getListDataByIdForApi(string WorkHandoverId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.ZHGL_WorkHandoverApprove where x.WorkHandoverId == WorkHandoverId && x.ApproveDate != null && x.ApproveType != "S" @@ -169,7 +169,7 @@ namespace BLL } public static Model.ZHGL_WorkHandoverApprove getCurrApproveForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.ZHGL_WorkHandoverApprove newWorkHandoverApprove = db.ZHGL_WorkHandoverApprove.FirstOrDefault(e => e.WorkHandoverId == id && e.ApproveDate == null); if (newWorkHandoverApprove != null) @@ -188,7 +188,7 @@ namespace BLL /// 宸ヤ綔浜ゆ帴瀹℃壒瀹炰綋 public static void UpdateWorkHandoverApproveForApi(Model.ZHGL_WorkHandoverApprove WorkHandoverApprove) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.ZHGL_WorkHandoverApprove newWorkHandoverApprove = db.ZHGL_WorkHandoverApprove.FirstOrDefault(e => e.WorkHandoverApproveId == WorkHandoverApprove.WorkHandoverApproveId); diff --git a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverDetailService.cs b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverDetailService.cs index e51e2e2..b067721 100644 --- a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverDetailService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverDetailService.cs @@ -9,7 +9,7 @@ namespace BLL { public class WorkHandoverDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇宸ヤ綔浜ゆ帴鏄庣粏鍒楄〃 @@ -37,7 +37,7 @@ namespace BLL /// 鏈堟姤璐ㄩ噺楠屾敹鎯呭喌瀹炰綋 public static void AddMonthSpotCheckDetail(Model.ZHGL_WorkHandoverDetail monthSpotCheckDetail) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_WorkHandoverDetail newApprove = new Model.ZHGL_WorkHandoverDetail(); newApprove.WorkHandoverDetailId = monthSpotCheckDetail.WorkHandoverDetailId; newApprove.WorkHandoverId = monthSpotCheckDetail.WorkHandoverId; @@ -55,7 +55,7 @@ namespace BLL /// 鏈堟姤璐ㄩ噺楠屾敹鎯呭喌缂栧彿 public static void DeleteMonthSpotCheckDetailsByWorkHandoverId(string WorkHandoverId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.ZHGL_WorkHandoverDetail where x.WorkHandoverId == WorkHandoverId select x).ToList(); if (q.Count() > 0) { @@ -70,7 +70,7 @@ namespace BLL /// 鏈堟姤璐ㄩ噺楠屾敹鎯呭喌缂栧彿 public static List GetWorkHandoverDetailsByWorkHandoverId(string WorkHandoverId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in db.ZHGL_WorkHandoverDetail where x.WorkHandoverId == WorkHandoverId orderby x.SortIndex select x).ToList(); } } diff --git a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverService.cs b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverService.cs index e3d06d7..a6e6e49 100644 --- a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class WorkHandoverService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇宸ヤ綔浜ゆ帴 @@ -29,7 +29,7 @@ namespace BLL /// public static void AddWorkHandover(Model.ZHGL_WorkHandover WorkHandover) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_WorkHandover newWorkHandover = new Model.ZHGL_WorkHandover { WorkHandoverId = WorkHandover.WorkHandoverId, @@ -52,7 +52,7 @@ namespace BLL /// public static void UpdateWorkHandover(Model.ZHGL_WorkHandover WorkHandover) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_WorkHandover newWorkHandover = db.ZHGL_WorkHandover.FirstOrDefault(e => e.WorkHandoverId == WorkHandover.WorkHandoverId); if (newWorkHandover != null) { @@ -73,7 +73,7 @@ namespace BLL /// public static void DeleteWorkHandoverById(string WorkHandoverId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ZHGL_WorkHandover WorkHandover = db.ZHGL_WorkHandover.FirstOrDefault(e => e.WorkHandoverId == WorkHandoverId); if (WorkHandover != null) { diff --git a/SGGL/BLL/PZHGL/ProjectData/ProjectMapService.cs b/SGGL/BLL/PZHGL/ProjectData/ProjectMapService.cs index f43308b..841ecdd 100644 --- a/SGGL/BLL/PZHGL/ProjectData/ProjectMapService.cs +++ b/SGGL/BLL/PZHGL/ProjectData/ProjectMapService.cs @@ -7,7 +7,7 @@ namespace BLL /// public static class ProjectMapService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰鍦板浘 @@ -25,7 +25,7 @@ namespace BLL /// 鍦板浘瀹炰綋 public static void AddProjectMap(Model.InformationProject_ProjectMap ProjectMap) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ProjectMap newProjectMap = new Model.InformationProject_ProjectMap { ProjectMapId = ProjectMap.ProjectMapId, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdateProjectMap(Model.InformationProject_ProjectMap ProjectMap) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ProjectMap newProjectMap = db.InformationProject_ProjectMap.FirstOrDefault(e => e.ProjectMapId == ProjectMap.ProjectMapId); if (newProjectMap != null) { @@ -68,7 +68,7 @@ namespace BLL /// public static void deleteProjectMapById(string ProjectMapId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InformationProject_ProjectMap ProjectMap = db.InformationProject_ProjectMap.FirstOrDefault(e => e.ProjectMapId == ProjectMapId); if (ProjectMap != null) { diff --git a/SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs b/SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs index 387a8eb..f47dfd6 100644 --- a/SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs +++ b/SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs @@ -7,7 +7,7 @@ public static class ProjectPageDataService { - public static SGGLDB db = Funs.DB; + public static CNPCDB db = Funs.DB; /// ///鑾峰彇绉诲姩绔椤 @@ -24,7 +24,7 @@ /// public static void AddPageData(Wx_PageData PageData) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; Wx_PageData newPageData = new Wx_PageData { PageDataId = PageData.PageDataId, @@ -53,7 +53,7 @@ /// public static void UpdatePageData(Wx_PageData PageData) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; Wx_PageData newPageData = db.Wx_PageData.FirstOrDefault(e => e.PageDataId == PageData.PageDataId); if (newPageData != null) { diff --git a/SGGL/BLL/Person/PersonTotalService.cs b/SGGL/BLL/Person/PersonTotalService.cs index bda7de9..1eaddb4 100644 --- a/SGGL/BLL/Person/PersonTotalService.cs +++ b/SGGL/BLL/Person/PersonTotalService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class PersonTotalService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇浜哄憳淇℃伅 @@ -26,7 +26,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void AddPersonTotal(Model.PersonTotal total) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.PersonTotal newTotla = new Model.PersonTotal { PersonTotalId = total.PersonTotalId, @@ -47,7 +47,7 @@ namespace BLL /// 瀹炰綋 public static void UpdatePersonTotal(Model.PersonTotal total) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.PersonTotal newTotal = db.PersonTotal.FirstOrDefault(e => e.PersonTotalId == total.PersonTotalId); if (newTotal != null) { @@ -66,7 +66,7 @@ namespace BLL /// public static void DeletePersonTotal(string PersonTotalId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.PersonTotal user = db.PersonTotal.FirstOrDefault(e => e.PersonTotalId == PersonTotalId); if (user != null) { diff --git a/SGGL/BLL/Person/Person_DutyService.cs b/SGGL/BLL/Person/Person_DutyService.cs index 8938da7..8b6c594 100644 --- a/SGGL/BLL/Person/Person_DutyService.cs +++ b/SGGL/BLL/Person/Person_DutyService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_DutyService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇浜哄憳淇℃伅 /// @@ -25,7 +25,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void AddPersonDuty(Model.Person_Duty duty) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_Duty newDuty = new Model.Person_Duty { DutyId = duty.DutyId, @@ -46,7 +46,7 @@ namespace BLL /// 瀹炰綋 public static void UpdatePersonDuty(Model.Person_Duty duty) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_Duty newduty = db.Person_Duty.FirstOrDefault(e => e.DutyId == duty.DutyId); if (newduty != null) { @@ -65,7 +65,7 @@ namespace BLL /// public static void DeletePersonDuty(string DutyId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_Duty user = db.Person_Duty.FirstOrDefault(e => e.DutyId == DutyId); if (user != null) { diff --git a/SGGL/BLL/Person/Person_DutyTemplateService.cs b/SGGL/BLL/Person/Person_DutyTemplateService.cs index cb6d1a3..21e82c7 100644 --- a/SGGL/BLL/Person/Person_DutyTemplateService.cs +++ b/SGGL/BLL/Person/Person_DutyTemplateService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_DutyTemplateService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍛樺伐璐ｄ换涔︽ā鏉夸俊鎭 /// @@ -35,7 +35,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void AddPersondutyTemplate(Model.Person_DutyTemplate dutyTemplate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_DutyTemplate newdutyTemplate = new Model.Person_DutyTemplate { DutyTemplateId = dutyTemplate.DutyTemplateId, @@ -52,7 +52,7 @@ namespace BLL /// 瀹炰綋 public static void UpdatePersondutyTemplate(Model.Person_DutyTemplate dutyTemplate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_DutyTemplate newdutyTemplate = db.Person_DutyTemplate.FirstOrDefault(e => e.DutyTemplateId == dutyTemplate.DutyTemplateId); if (newdutyTemplate != null) { @@ -67,7 +67,7 @@ namespace BLL /// public static void DeletePersondutyTemplate(string dutyTemplateId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_DutyTemplate user = db.Person_DutyTemplate.FirstOrDefault(e => e.DutyTemplateId == dutyTemplateId); if (user != null) { diff --git a/SGGL/BLL/Person/Person_QuarterCheckApproveService.cs b/SGGL/BLL/Person/Person_QuarterCheckApproveService.cs index b94fc78..cfce5b5 100644 --- a/SGGL/BLL/Person/Person_QuarterCheckApproveService.cs +++ b/SGGL/BLL/Person/Person_QuarterCheckApproveService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_QuarterCheckApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇浜哄憳淇℃伅 @@ -35,7 +35,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void AddCheckApprove(Model.Person_QuarterCheckApprove contruct) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheckApprove newcontruct = new Model.Person_QuarterCheckApprove { ApproveId = contruct.ApproveId, @@ -51,7 +51,7 @@ namespace BLL /// 瀹炰綋 public static void UpdateCheckApprove(Model.Person_QuarterCheckApprove Approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheckApprove newApprove = db.Person_QuarterCheckApprove.FirstOrDefault(e => e.ApproveId == Approve.ApproveId); if (newApprove != null) { @@ -66,7 +66,7 @@ namespace BLL /// public static void DeleteCheckApprove(string ApproveId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheckApprove check = db.Person_QuarterCheckApprove.FirstOrDefault(e => e.ApproveId == ApproveId); if (check != null) { @@ -83,7 +83,7 @@ namespace BLL /// public static Model.Person_QuarterCheckApprove getCurrApproveForApi(string id, string userId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Person_QuarterCheckApprove newApprove = db.Person_QuarterCheckApprove.FirstOrDefault(e => e.QuarterCheckId == id && e.UserId == userId && e.ApproveDate == null); //if (newApprove != null) @@ -106,7 +106,7 @@ namespace BLL /// public static void UpdateApproveForApi(string approveId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Person_QuarterCheckApprove newApprove = db.Person_QuarterCheckApprove.FirstOrDefault(e => e.ApproveId == approveId); if (newApprove != null) diff --git a/SGGL/BLL/Person/Person_QuarterCheckItemService.cs b/SGGL/BLL/Person/Person_QuarterCheckItemService.cs index caabc45..fedf0de 100644 --- a/SGGL/BLL/Person/Person_QuarterCheckItemService.cs +++ b/SGGL/BLL/Person/Person_QuarterCheckItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_QuarterCheckItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇浜哄憳淇℃伅 @@ -35,7 +35,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void AddCheckItem(Model.Person_QuarterCheckItem contruct) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheckItem newcontruct = new Model.Person_QuarterCheckItem { QuarterCheckItemId = contruct.QuarterCheckItemId, @@ -57,7 +57,7 @@ namespace BLL /// 瀹炰綋 public static void UpdateCheckItem(Model.Person_QuarterCheckItem item) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheckItem newItem = db.Person_QuarterCheckItem.FirstOrDefault(e => e.QuarterCheckItemId == item.QuarterCheckItemId); if (newItem != null) { @@ -72,7 +72,7 @@ namespace BLL /// public static void DeleteCheckItem(string QuarterCheckItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheckItem check = db.Person_QuarterCheckItem.FirstOrDefault(e => e.QuarterCheckItemId == QuarterCheckItemId); if (check != null) { @@ -83,7 +83,7 @@ namespace BLL public static List GetListDataForApi(string id, string userId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Person_QuarterCheckItem; List ids = new List(); diff --git a/SGGL/BLL/Person/Person_QuarterCheckService.cs b/SGGL/BLL/Person/Person_QuarterCheckService.cs index 637056f..60a21fd 100644 --- a/SGGL/BLL/Person/Person_QuarterCheckService.cs +++ b/SGGL/BLL/Person/Person_QuarterCheckService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class Person_QuarterCheckService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇浜哄憳淇℃伅 @@ -31,7 +31,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void AddPerson_QuarterCheck(Model.Person_QuarterCheck check) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheck newcheck = new Model.Person_QuarterCheck { QuarterCheckId = check.QuarterCheckId, @@ -54,7 +54,7 @@ namespace BLL /// 瀹炰綋 public static void UpdatePerson_QuarterCheck(Model.Person_QuarterCheck total) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheck newTotal = db.Person_QuarterCheck.FirstOrDefault(e => e.QuarterCheckId == total.QuarterCheckId); if (newTotal != null) { @@ -68,7 +68,7 @@ namespace BLL /// public static void DeleteQuarterCheck(string QuarterCheckId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_QuarterCheck check = db.Person_QuarterCheck.FirstOrDefault(e => e.QuarterCheckId == QuarterCheckId); if (check != null) { @@ -100,7 +100,7 @@ namespace BLL public static List GetListDataForApi(string userId, int index, int page) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { IQueryable q = db.Person_QuarterCheck; List ids = new List(); @@ -155,7 +155,7 @@ namespace BLL public static Model.Person_QuarterCheck GetPersonCheckForApi(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Person_QuarterCheck x = db.Person_QuarterCheck.FirstOrDefault(e => e.QuarterCheckId == id); x.QuarterCheckId = x.QuarterCheckId; diff --git a/SGGL/BLL/Person/Person_ShuntApproveService.cs b/SGGL/BLL/Person/Person_ShuntApproveService.cs index 17be954..0a5adf3 100644 --- a/SGGL/BLL/Person/Person_ShuntApproveService.cs +++ b/SGGL/BLL/Person/Person_ShuntApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class Person_ShuntApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗘祦绠＄悊妯℃澘鍒楄〃 @@ -90,7 +90,7 @@ namespace BLL /// 鍒嗘祦绠＄悊瀹℃壒瀹炰綋 public static void AddShuntApprove(Model.Person_ShuntApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Person_ShuntApprove)); Model.Person_ShuntApprove newApprove = new Model.Person_ShuntApprove(); newApprove.ShuntApproveId = newKeyID; @@ -111,7 +111,7 @@ namespace BLL /// 鍒嗘祦绠＄悊瀹℃壒瀹炰綋 public static void UpdateShuntApprove(Model.Person_ShuntApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_ShuntApprove newApprove = db.Person_ShuntApprove.First(e => e.ShuntApproveId == approve.ShuntApproveId && e.ApproveDate == null); newApprove.ShuntId = approve.ShuntId; newApprove.ApproveMan = approve.ApproveMan; @@ -129,7 +129,7 @@ namespace BLL /// 鍒嗘祦绠＄悊缂栧彿 public static void DeleteShuntApprovesByShuntId(string ShuntId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Person_ShuntApprove where x.ShuntId == ShuntId select x).ToList(); db.Person_ShuntApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); diff --git a/SGGL/BLL/Person/Person_ShuntDetailService.cs b/SGGL/BLL/Person/Person_ShuntDetailService.cs index 02a278c..05d43a3 100644 --- a/SGGL/BLL/Person/Person_ShuntDetailService.cs +++ b/SGGL/BLL/Person/Person_ShuntDetailService.cs @@ -14,7 +14,7 @@ namespace BLL /// 鍒嗘祦绠＄悊鏄庣粏瀹炰綋 public static void AddShuntDetail(Model.Person_ShuntDetail a) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_ShuntDetail newShuntDetail = new Model.Person_ShuntDetail(); newShuntDetail.ShuntDetailId = a.ShuntDetailId; newShuntDetail.ShuntId = a.ShuntId; @@ -30,7 +30,7 @@ namespace BLL /// 鍒嗘祦绠＄悊鏄庣粏瀹炰綋 public static void UpdateShuntDetail(Model.Person_ShuntDetail a) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_ShuntDetail newShuntDetail = db.Person_ShuntDetail.First(e => e.ShuntDetailId == a.ShuntDetailId); newShuntDetail.ShuntId = a.ShuntId; newShuntDetail.UserId = a.UserId; @@ -57,7 +57,7 @@ namespace BLL public static List GetListsForApi(string shuntId) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Person_ShuntDetail where x.ShuntId == shuntId select x).ToList(); @@ -69,14 +69,14 @@ namespace BLL /// 鍒嗘祦绠＄悊鏄庣粏涓婚敭 public static void DeleteShuntDetailByShuntId(string ShuntId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Person_ShuntDetail where x.ShuntId == ShuntId select x).ToList(); db.Person_ShuntDetail.DeleteAllOnSubmit(q); db.SubmitChanges(); } public static void DeleteShuntDetailById(string id) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Person_ShuntDetail where x.ShuntDetailId == id select x).ToList(); db.Person_ShuntDetail.DeleteAllOnSubmit(q); diff --git a/SGGL/BLL/Person/Person_ShuntService.cs b/SGGL/BLL/Person/Person_ShuntService.cs index 084fd70..ab19f6c 100644 --- a/SGGL/BLL/Person/Person_ShuntService.cs +++ b/SGGL/BLL/Person/Person_ShuntService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static void AddShunt(Model.Person_Shunt Shunt) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_Shunt newShunt = new Model.Person_Shunt(); newShunt.ShuntId = Shunt.ShuntId; newShunt.Code = Shunt.Code; @@ -36,7 +36,7 @@ namespace BLL /// public static void UpdateShunt(Model.Person_Shunt Shunt) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_Shunt newShunt = db.Person_Shunt.First(e => e.ShuntId == Shunt.ShuntId); newShunt.Code = Shunt.Code; newShunt.ProjectId = Shunt.ProjectId; @@ -54,7 +54,7 @@ namespace BLL /// public static void DeleteShunt(string ShuntId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_Shunt Shunt = db.Person_Shunt.First(e => e.ShuntId == ShuntId); db.Person_Shunt.DeleteOnSubmit(Shunt); db.SubmitChanges(); diff --git a/SGGL/BLL/Person/Person_TrainingPlanService.cs b/SGGL/BLL/Person/Person_TrainingPlanService.cs index abc04e2..2d5896c 100644 --- a/SGGL/BLL/Person/Person_TrainingPlanService.cs +++ b/SGGL/BLL/Person/Person_TrainingPlanService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_TrainingPlanService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇浜哄憳淇℃伅 /// @@ -25,7 +25,7 @@ namespace BLL /// 浜哄憳瀹炰綋 public static void AddPersonTrainingPlan(Model.Person_TrainingPlan TrainingPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_TrainingPlan newTrainingPlan = new Model.Person_TrainingPlan { TrainingPlanId = TrainingPlan.TrainingPlanId, @@ -50,7 +50,7 @@ namespace BLL /// 瀹炰綋 public static void UpdatePersonTrainingPlan(Model.Person_TrainingPlan TrainingPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_TrainingPlan newTrainingPlan = db.Person_TrainingPlan.FirstOrDefault(e => e.TrainingPlanId == TrainingPlan.TrainingPlanId); if (newTrainingPlan != null) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeletePersonTrainingPlan(string TrainingPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_TrainingPlan plan = db.Person_TrainingPlan.FirstOrDefault(e => e.TrainingPlanId == TrainingPlanId); if (plan != null) { diff --git a/SGGL/BLL/PersonManage/Test/ServerTestPlanService.cs b/SGGL/BLL/PersonManage/Test/ServerTestPlanService.cs index 3810586..f595d36 100644 --- a/SGGL/BLL/PersonManage/Test/ServerTestPlanService.cs +++ b/SGGL/BLL/PersonManage/Test/ServerTestPlanService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class ServerTestPlanService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐭ヨ瘑绔炶禌璁″垝 @@ -27,7 +27,7 @@ namespace BLL /// public static void AddTestPlan(Model.Test_TestPlan TestPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Test_TestPlan newTestPlan = new Model.Test_TestPlan { TestPlanId = TestPlan.TestPlanId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateTestPlan(Model.Test_TestPlan TestPlan) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Test_TestPlan newTestPlan = db.Test_TestPlan.FirstOrDefault(e => e.TestPlanId == TestPlan.TestPlanId); if (newTestPlan != null) { @@ -86,7 +86,7 @@ namespace BLL /// public static void DeleteTestPlanById(string TestPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Test_TestPlan TestPlan = db.Test_TestPlan.FirstOrDefault(e => e.TestPlanId == TestPlanId); if (TestPlan != null) { @@ -107,7 +107,7 @@ namespace BLL /// public static string EndTestPlan(string testPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string info = string.Empty; var getTestPlans = from x in db.Test_TestPlan where x.States == Const.State_2 && x.TestEndTime.Value.AddMinutes(x.Duration.Value) < DateTime.Now diff --git a/SGGL/BLL/PersonManage/Test/ServerTestPlanTrainingService.cs b/SGGL/BLL/PersonManage/Test/ServerTestPlanTrainingService.cs index e8a91ac..f25f772 100644 --- a/SGGL/BLL/PersonManage/Test/ServerTestPlanTrainingService.cs +++ b/SGGL/BLL/PersonManage/Test/ServerTestPlanTrainingService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ServerTestPlanTrainingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐭ヨ瘑绔炶禌璁″垝 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddTestPlanTraining(Model.Test_TestPlanTraining TestPlanTraining) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Test_TestPlanTraining newTestPlanTraining = new Model.Test_TestPlanTraining { TestPlanTrainingId = TestPlanTraining.TestPlanTrainingId, @@ -49,7 +49,7 @@ namespace BLL /// public static void UpdateTestPlanTraining(Model.Test_TestPlanTraining TestPlanTraining) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Test_TestPlanTraining newTestPlanTraining = db.Test_TestPlanTraining.FirstOrDefault(e => e.TestPlanTrainingId == TestPlanTraining.TestPlanTrainingId); if (newTestPlanTraining != null) { @@ -68,7 +68,7 @@ namespace BLL /// public static void DeleteTestPlanTrainingById(string TestPlanTrainingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Test_TestPlanTraining TestPlanTraining = db.Test_TestPlanTraining.FirstOrDefault(e => e.TestPlanTrainingId == TestPlanTrainingId); if (TestPlanTraining != null) { @@ -83,7 +83,7 @@ namespace BLL /// public static void DeleteTestPlanTrainingByTestPlanId(string TestPlanId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var TestPlanTraining = from x in db.Test_TestPlanTraining where x.TestPlanId == TestPlanId select x; if (TestPlanTraining.Count() > 0) { diff --git a/SGGL/BLL/PersonManage/Test/ServerTestRecordService.cs b/SGGL/BLL/PersonManage/Test/ServerTestRecordService.cs index 343c352..af586cd 100644 --- a/SGGL/BLL/PersonManage/Test/ServerTestRecordService.cs +++ b/SGGL/BLL/PersonManage/Test/ServerTestRecordService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ServerTestRecordService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鑰冭瘯璁板綍 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddTestRecord(Model.Test_TestRecord testRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Test_TestRecord newTestRecord = new Model.Test_TestRecord { TestRecordId = testRecord.TestRecordId, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdateTestRecord(Model.Test_TestRecord testRecord) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Test_TestRecord newTestRecord = db.Test_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecord.TestRecordId); if (newTestRecord != null) { @@ -79,7 +79,7 @@ namespace BLL /// public static void DeleteTestRecordByTestRecordId(string testRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var testRecord = db.Test_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecordId); if (testRecord != null) @@ -103,7 +103,7 @@ namespace BLL public static int UpdateTestEndTimeNull(string testRecordId) { int icount = 0; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var testRecord = from x in db.Test_TestRecord where !x.TestEndTime.HasValue && x.TestStartTime.HasValue diff --git a/SGGL/BLL/ProjectData/MainItemService.cs b/SGGL/BLL/ProjectData/MainItemService.cs index 0e11253..65d1423 100644 --- a/SGGL/BLL/ProjectData/MainItemService.cs +++ b/SGGL/BLL/ProjectData/MainItemService.cs @@ -10,7 +10,7 @@ namespace BLL { public class MainItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 璁板綍鏁 @@ -71,7 +71,7 @@ namespace BLL /// 涓婚」鍜屽崟浣嶅伐绋嬪搴斿叧绯诲疄浣 public static void AddMainItem(Model.ProjectData_MainItem mainItemToUnitWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.ProjectData_MainItem)); Model.ProjectData_MainItem newMainItem = new Model.ProjectData_MainItem(); newMainItem.MainItemId = newKeyID; @@ -91,7 +91,7 @@ namespace BLL /// 涓婚」鍜屽崟浣嶅伐绋嬪搴斿叧绯诲疄浣 public static void UpdateMainItem(Model.ProjectData_MainItem mainItemToUnitWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_MainItem newMainItem = db.ProjectData_MainItem.First(e => e.MainItemId == mainItemToUnitWork.MainItemId); newMainItem.MainItemCode = mainItemToUnitWork.MainItemCode; newMainItem.MainItemName = mainItemToUnitWork.MainItemName; @@ -107,7 +107,7 @@ namespace BLL /// 涓婚」鍜屽崟浣嶅伐绋嬪搴斿叧绯籌d public static void DeleteMainItemByMainItemId(string mainItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_MainItem mainItemToUnitWork = db.ProjectData_MainItem.First(e => e.MainItemId == mainItemId); db.ProjectData_MainItem.DeleteOnSubmit(mainItemToUnitWork); diff --git a/SGGL/BLL/ProjectData/ProjectData_CodeTemplateRuleService.cs b/SGGL/BLL/ProjectData/ProjectData_CodeTemplateRuleService.cs index 4d47db1..3999268 100644 --- a/SGGL/BLL/ProjectData/ProjectData_CodeTemplateRuleService.cs +++ b/SGGL/BLL/ProjectData/ProjectData_CodeTemplateRuleService.cs @@ -24,7 +24,7 @@ /// public static void AddProjectData_CodeTemplateRule(Model.ProjectData_CodeTemplateRule codeTemplateRule) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_CodeTemplateRule newCodeTemplateRule = new Model.ProjectData_CodeTemplateRule { CodeTemplateRuleId = SQLHelper.GetNewID(typeof(Model.ProjectData_CodeTemplateRule)), @@ -52,7 +52,7 @@ /// public static void UpdateProjectData_CodeTemplateRule(Model.ProjectData_CodeTemplateRule codeTemplateRule) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_CodeTemplateRule updateCodeTemplateRule = db.ProjectData_CodeTemplateRule.FirstOrDefault(e => e.MenuId == codeTemplateRule.MenuId && e.ProjectId == codeTemplateRule.ProjectId); if (updateCodeTemplateRule != null) { diff --git a/SGGL/BLL/ProjectData/ProjectSateService.cs b/SGGL/BLL/ProjectData/ProjectSateService.cs index e9c1205..30a1d93 100644 --- a/SGGL/BLL/ProjectData/ProjectSateService.cs +++ b/SGGL/BLL/ProjectData/ProjectSateService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectSateService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇椤圭洰鐘舵佸強杞欢鍏抽棴淇℃伅 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddProjectSate(Model.Base_ProjectSate ProjectSate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ProjectSate newProjectSate = new Model.Base_ProjectSate { ProjectStateId = ProjectSate.ProjectStateId, @@ -50,7 +50,7 @@ namespace BLL /// public static void UpdateProjectSate(Model.Base_ProjectSate ProjectSate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ProjectSate newProjectSate = db.Base_ProjectSate.FirstOrDefault(e => e.ProjectStateId == ProjectSate.ProjectStateId); if (newProjectSate != null) { @@ -67,7 +67,7 @@ namespace BLL /// public static void DeleteProjectSateById(string projectStateId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_ProjectSate ProjectSate = db.Base_ProjectSate.FirstOrDefault(e => e.ProjectStateId == projectStateId); if (ProjectSate != null) { diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 3637354..9c45903 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -7,7 +7,7 @@ public static class ProjectService { - public static SGGLDB db = Funs.DB; + public static CNPCDB db = Funs.DB; /// ///鑾峰彇椤圭洰淇℃伅 @@ -89,7 +89,7 @@ /// public static void AddProject(Model.Base_Project project) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Project newProject = new Base_Project { ProjectId = project.ProjectId, @@ -136,7 +136,7 @@ /// public static void UpdateProject(Model.Base_Project project) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; Base_Project newProject = db.Base_Project.FirstOrDefault(e => e.ProjectId == project.ProjectId); if (newProject != null) { @@ -183,7 +183,7 @@ /// public static void DeleteProject(string projectId) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; Base_Project project = db.Base_Project.FirstOrDefault(e => e.ProjectId == projectId); if (project != null) { @@ -539,7 +539,7 @@ /// public static string GetProjectManagerName(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string name = string.Empty; if (projectId != null) @@ -561,7 +561,7 @@ /// public static string GetConstructionManagerName(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string name = string.Empty; if (projectId != null) @@ -583,7 +583,7 @@ /// public static string GetHSSEManagerName(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string name = string.Empty; if (projectId != null) diff --git a/SGGL/BLL/ProjectData/ProjectSetMapService.cs b/SGGL/BLL/ProjectData/ProjectSetMapService.cs index beafbd5..0f94c8d 100644 --- a/SGGL/BLL/ProjectData/ProjectSetMapService.cs +++ b/SGGL/BLL/ProjectData/ProjectSetMapService.cs @@ -6,7 +6,7 @@ public static class ProjectSetMapService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// ///鑾峰彇椤圭洰鍧愭爣鐐 @@ -53,7 +53,7 @@ /// public static void SaveProjectGpsPoint(string projectId, string projectPointResult) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; string strGpsAreId = SQLHelper.GetNewID(); var getGpsAre = db.WxProjectGpsAre.FirstOrDefault(x => x.ProjectId == projectId); if (getGpsAre != null) @@ -109,7 +109,7 @@ /// public static void SaveProjectGpsPoint(string projectId, string gpsAreId, string projectPointResult) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; var getPoints = db.WxProjectGpsPoint.Where(x => x.GpsAreId == gpsAreId); if (getPoints.Count() > 0) diff --git a/SGGL/BLL/ProjectData/ProjectUnitService.cs b/SGGL/BLL/ProjectData/ProjectUnitService.cs index 92b8526..37ac0f0 100644 --- a/SGGL/BLL/ProjectData/ProjectUnitService.cs +++ b/SGGL/BLL/ProjectData/ProjectUnitService.cs @@ -6,7 +6,7 @@ public static class ProjectUnitService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// ///鑾峰彇椤圭洰鍗曚綅淇℃伅 @@ -32,7 +32,7 @@ /// public static List GetProjectUnitListByProjectId(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Project_ProjectUnit join y in db.Base_Unit on x.UnitId equals y.UnitId @@ -49,7 +49,7 @@ /// public static List GetProjectUnitListByProjectIdUnitType(string projectId, string unitType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Project_ProjectUnit join y in db.Base_Unit on x.UnitId equals y.UnitId @@ -65,7 +65,7 @@ /// public static void AddProjectUnit(Project_ProjectUnit projectUnit) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; Project_ProjectUnit newProjectUnit = new Project_ProjectUnit { ProjectUnitId = SQLHelper.GetNewID(typeof(Model.Project_ProjectUnit)), @@ -90,7 +90,7 @@ /// public static void UpdateProjectUnit(Model.Project_ProjectUnit projectUnit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Project_ProjectUnit newProjectUnit = db.Project_ProjectUnit.FirstOrDefault(e => e.ProjectUnitId == projectUnit.ProjectUnitId); if (newProjectUnit != null) { @@ -112,7 +112,7 @@ /// public static void DeleteProjectProjectUnitById(string projectUnitId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Project_ProjectUnit delProjectUnit = db.Project_ProjectUnit.FirstOrDefault(e => e.ProjectUnitId == projectUnitId); if (delProjectUnit != null) { @@ -151,7 +151,7 @@ /// 鏄惁鏄剧ず璇烽夋嫨 public static void InitUnitDropDownList(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var pUnit = (from x in db.Project_ProjectUnit join y in db.Base_Unit on x.UnitId equals y.UnitId @@ -187,7 +187,7 @@ public static List GetProjectUnitListByProjectIdForApi(string projectId, string unitType, string name) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string[] types = unitType.Split(','); return (from x in db.Project_ProjectUnit join y in db.Base_Unit on x.UnitId equals y.UnitId diff --git a/SGGL/BLL/ProjectData/ProjectUserService.cs b/SGGL/BLL/ProjectData/ProjectUserService.cs index 880363c..474c977 100644 --- a/SGGL/BLL/ProjectData/ProjectUserService.cs +++ b/SGGL/BLL/ProjectData/ProjectUserService.cs @@ -6,7 +6,7 @@ public static class ProjectUserService { - public static SGGLDB db = Funs.DB; + public static CNPCDB db = Funs.DB; /// ///鑾峰彇椤圭洰鐢ㄦ埛淇℃伅 @@ -50,7 +50,7 @@ /// public static void AddProjectUser(Project_ProjectUser projectUser) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; Project_ProjectUser newProjectUser = new Project_ProjectUser { ProjectUserId = SQLHelper.GetNewID(typeof(Project_ProjectUser)), @@ -73,7 +73,7 @@ /// public static void UpdateProjectUser(Project_ProjectUser projectUser) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; Project_ProjectUser newProjectUser = db.Project_ProjectUser.FirstOrDefault(e => e.ProjectUserId == projectUser.ProjectUserId); if (newProjectUser != null) { @@ -96,7 +96,7 @@ /// public static void DeleteProjectUserById(string projectUserId) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; Project_ProjectUser delProjectUser = db.Project_ProjectUser.FirstOrDefault(e => e.ProjectUserId == projectUserId); if (delProjectUser != null) { @@ -111,7 +111,7 @@ /// public static void DeleteProjectUserByProjectIdUserId(string projectId, string userId) { - SGGLDB db = Funs.DB; + CNPCDB db = Funs.DB; var delProjectUser = from x in db.Project_ProjectUser where x.ProjectId == projectId && x.UserId == userId select x; if (delProjectUser.Count() > 0) { diff --git a/SGGL/BLL/ProjectData/Project_InstallationService.cs b/SGGL/BLL/ProjectData/Project_InstallationService.cs index 9463ba5..0c88921 100644 --- a/SGGL/BLL/ProjectData/Project_InstallationService.cs +++ b/SGGL/BLL/ProjectData/Project_InstallationService.cs @@ -87,7 +87,7 @@ namespace BLL /// public static void AddInstallation(Model.Project_Installation installation) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Project_Installation newIns = new Model.Project_Installation(); newIns.InstallationId = installation.InstallationId; newIns.ProjectId = installation.ProjectId; @@ -110,7 +110,7 @@ namespace BLL /// public static void UpdateInstallation(Model.Project_Installation installation) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Project_Installation newIns = db.Project_Installation.First(e => e.InstallationId == installation.InstallationId); newIns.InstallationCode = installation.InstallationCode; @@ -133,7 +133,7 @@ namespace BLL /// public static void DeleteInstallation(string InstallationId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Project_Installation installation = db.Project_Installation.FirstOrDefault(e => e.InstallationId.ToString() == InstallationId); if (installation != null) { @@ -1175,7 +1175,7 @@ namespace BLL /// public static List GetInstallationsByProjectId(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Project_Installation where x.ProjectId == projectId diff --git a/SGGL/BLL/ProjectData/Project_SysSetService.cs b/SGGL/BLL/ProjectData/Project_SysSetService.cs index 0659b32..4c3d789 100644 --- a/SGGL/BLL/ProjectData/Project_SysSetService.cs +++ b/SGGL/BLL/ProjectData/Project_SysSetService.cs @@ -33,7 +33,7 @@ namespace BLL /// 绯荤粺鍙橀噺 public static void AddSet(Model.Project_Sys_Set set) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Project_Sys_Set newSet = new Model.Project_Sys_Set(); newSet.SetId = set.SetId; newSet.ProjectId = set.ProjectId; @@ -51,7 +51,7 @@ namespace BLL /// 绯荤粺鍙橀噺 public static void UpdateSet(Model.Project_Sys_Set set) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var newSet = db.Project_Sys_Set.FirstOrDefault(e => e.SetId == set.SetId && e.ProjectId == set.ProjectId); if (newSet != null) { diff --git a/SGGL/BLL/ProjectData/TeamGroupService.cs b/SGGL/BLL/ProjectData/TeamGroupService.cs index 4686a00..4d70f40 100644 --- a/SGGL/BLL/ProjectData/TeamGroupService.cs +++ b/SGGL/BLL/ProjectData/TeamGroupService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TeamGroupService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐝粍淇℃伅 @@ -31,7 +31,7 @@ namespace BLL /// public static void AddTeamGroup(Model.ProjectData_TeamGroup teamGroup) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_TeamGroup newTeamGroup = new Model.ProjectData_TeamGroup { TeamGroupId = teamGroup.TeamGroupId, @@ -57,7 +57,7 @@ namespace BLL /// public static void UpdateTeamGroup(Model.ProjectData_TeamGroup teamGroup) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_TeamGroup newTeamGroup = db.ProjectData_TeamGroup.FirstOrDefault(e => e.TeamGroupId == teamGroup.TeamGroupId); if (newTeamGroup != null) { @@ -82,7 +82,7 @@ namespace BLL /// public static void DeleteTeamGroupById(string teamGroupId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_TeamGroup teamGroup = db.ProjectData_TeamGroup.FirstOrDefault(e => e.TeamGroupId == teamGroupId); if (teamGroup != null) { @@ -98,7 +98,7 @@ namespace BLL /// public static int getTeamGroupPersonNum(string teamGroupId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return (from x in Funs.DB.SitePerson_Person where x.TeamGroupId == teamGroupId && x.IsUsed == true && (!x.OutTime.HasValue || x.OutTime > DateTime.Now) select x).Count(); diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index 8df0e88..1f99d89 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -10,7 +10,7 @@ namespace BLL { public class UnitWorkService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; public static Model.WBS_UnitWork GetUnitWorkByUnitWorkName(string projectId, string unitWorkName) { return Funs.DB.WBS_UnitWork.FirstOrDefault(e => e.ProjectId == projectId && e.UnitWorkName == unitWorkName); @@ -21,7 +21,7 @@ namespace BLL /// public static void AddUnitWork(Model.WBS_UnitWork UnitWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_UnitWork newUnitWork = new Model.WBS_UnitWork(); newUnitWork.UnitWorkId = UnitWork.UnitWorkId; newUnitWork.UnitWorkCode = UnitWork.UnitWorkCode; @@ -48,7 +48,7 @@ namespace BLL /// public static void UpdateUnitWork(Model.WBS_UnitWork UnitWork) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_UnitWork newUnitWork = db.WBS_UnitWork.FirstOrDefault(e => e.UnitWorkId == UnitWork.UnitWorkId); if (newUnitWork != null) { @@ -77,7 +77,7 @@ namespace BLL private static void GetWeights(string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal totalCosts = 0; var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == projectId && x.Costs != null select x; foreach (var unitWork in unitWorks) @@ -104,7 +104,7 @@ namespace BLL /// private static void UpdateWBSCosts(string unitWorkId, decimal costs) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var workPackages = from x in db.WBS_WorkPackage where x.UnitWorkId == unitWorkId && x.SuperWorkPackageId == null && x.IsApprove == true select x; foreach (var item in workPackages) { @@ -119,7 +119,7 @@ namespace BLL private static void UpdateWorkPackageCosts(string workPackageId, decimal costs) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var childWorkPackages = from x in db.WBS_WorkPackage where x.SuperWorkPackageId == workPackageId && x.IsApprove == true select x; if (childWorkPackages.Count() > 0) //瀛樺湪瀛愮骇 { @@ -154,7 +154,7 @@ namespace BLL /// public static void DeleteUnitWorkById(string UnitWorkId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.WBS_UnitWork Unitwork = db.WBS_UnitWork.FirstOrDefault(e => e.UnitWorkId == UnitWorkId); if (Unitwork != null) { @@ -385,7 +385,7 @@ namespace BLL /// public static List GetUnitWorkListByPid(string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List q = (from x in db.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList(); return q; } @@ -569,7 +569,7 @@ namespace BLL public static string GetMainItemAndDesignProfessionalName(string str, string projectId) { string name = string.Empty; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var mainItems = from x in db.ProjectData_MainItem where x.ProjectId == projectId select x; var designProfessionals = from x in db.Base_DesignProfessional select x; if (!string.IsNullOrEmpty(str)) diff --git a/SGGL/BLL/ProjectData/WorkAreaService.cs b/SGGL/BLL/ProjectData/WorkAreaService.cs index 21d7617..98b8664 100644 --- a/SGGL/BLL/ProjectData/WorkAreaService.cs +++ b/SGGL/BLL/ProjectData/WorkAreaService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class WorkAreaService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鐝粍淇℃伅 @@ -28,7 +28,7 @@ namespace BLL /// public static void AddWorkArea(Model.ProjectData_WorkArea WorkArea) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_WorkArea newWorkArea = new Model.ProjectData_WorkArea { WorkAreaId = SQLHelper.GetNewID(), @@ -51,7 +51,7 @@ namespace BLL /// public static void UpdateWorkArea(Model.ProjectData_WorkArea WorkArea) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_WorkArea newWorkArea = db.ProjectData_WorkArea.FirstOrDefault(e => e.WorkAreaId == WorkArea.WorkAreaId); if (newWorkArea != null) { @@ -71,7 +71,7 @@ namespace BLL /// public static void DeleteWorkAreaById(string WorkAreaId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.ProjectData_WorkArea WorkArea = db.ProjectData_WorkArea.FirstOrDefault(e => e.WorkAreaId == WorkAreaId); if (WorkArea != null) { diff --git a/SGGL/BLL/SYHSE/SYHSEData_BaseService.cs b/SGGL/BLL/SYHSE/SYHSEData_BaseService.cs index 46a4d47..98df3c6 100644 --- a/SGGL/BLL/SYHSE/SYHSEData_BaseService.cs +++ b/SGGL/BLL/SYHSE/SYHSEData_BaseService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class SYHSEData_BaseService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃淇℃伅 /// @@ -80,7 +80,7 @@ namespace BLL /// public static void DeleteProjectById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = db.SYHSEData_Base.FirstOrDefault(e => e.Id == id); if (getData != null) diff --git a/SGGL/BLL/SYHSE/SYHSEData_EnvironmentProtectionService.cs b/SGGL/BLL/SYHSE/SYHSEData_EnvironmentProtectionService.cs index febb3f0..56767f0 100644 --- a/SGGL/BLL/SYHSE/SYHSEData_EnvironmentProtectionService.cs +++ b/SGGL/BLL/SYHSE/SYHSEData_EnvironmentProtectionService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class SYHSEData_EnvironmentProtectionService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃淇℃伅 /// @@ -95,7 +95,7 @@ namespace BLL /// public static void DeleteProjectById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = db.SYHSEData_EnvironmentProtection.FirstOrDefault(e => e.Id == id); if (getData != null) diff --git a/SGGL/BLL/SYHSE/SYHSEData_HiddenDangersService.cs b/SGGL/BLL/SYHSE/SYHSEData_HiddenDangersService.cs index 71a63d2..56cd968 100644 --- a/SGGL/BLL/SYHSE/SYHSEData_HiddenDangersService.cs +++ b/SGGL/BLL/SYHSE/SYHSEData_HiddenDangersService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class SYHSEData_HiddenDangersService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃淇℃伅 /// @@ -97,7 +97,7 @@ namespace BLL /// public static void DeleteProjectById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = db.SYHSEData_HiddenDangers.FirstOrDefault(e => e.Id == id); if (getData != null) diff --git a/SGGL/BLL/SYHSE/SYHSEData_LicenceService.cs b/SGGL/BLL/SYHSE/SYHSEData_LicenceService.cs index 37bc3c9..d464e41 100644 --- a/SGGL/BLL/SYHSE/SYHSEData_LicenceService.cs +++ b/SGGL/BLL/SYHSE/SYHSEData_LicenceService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class SYHSEData_LicenceService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃淇℃伅 /// @@ -82,7 +82,7 @@ namespace BLL /// public static void DeleteProjectById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = db.SYHSEData_Licence.FirstOrDefault(e => e.Id == id); if (getData != null) diff --git a/SGGL/BLL/SYHSE/SYHSEData_MajorHazardService.cs b/SGGL/BLL/SYHSE/SYHSEData_MajorHazardService.cs index ae2638c..7ed7cd2 100644 --- a/SGGL/BLL/SYHSE/SYHSEData_MajorHazardService.cs +++ b/SGGL/BLL/SYHSE/SYHSEData_MajorHazardService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class SYHSEData_MajorHazardService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃淇℃伅 /// @@ -88,7 +88,7 @@ namespace BLL /// public static void DeleteProjectById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = db.SYHSEData_MajorHazard.FirstOrDefault(e => e.Id == id); if (getData != null) diff --git a/SGGL/BLL/SYHSE/SYHSEData_PromiseService.cs b/SGGL/BLL/SYHSE/SYHSEData_PromiseService.cs index d6aec55..54a7b11 100644 --- a/SGGL/BLL/SYHSE/SYHSEData_PromiseService.cs +++ b/SGGL/BLL/SYHSE/SYHSEData_PromiseService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class SYHSEData_PromiseService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃淇℃伅 /// @@ -80,7 +80,7 @@ namespace BLL /// public static void DeleteProjectById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = db.SYHSEData_Promise.FirstOrDefault(e => e.PromiseId == id); if (getData != null) diff --git a/SGGL/BLL/SYHSE/SYHSEData_RiskService.cs b/SGGL/BLL/SYHSE/SYHSEData_RiskService.cs index 2b44b6a..a951001 100644 --- a/SGGL/BLL/SYHSE/SYHSEData_RiskService.cs +++ b/SGGL/BLL/SYHSE/SYHSEData_RiskService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class SYHSEData_RiskService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃淇℃伅 /// @@ -86,7 +86,7 @@ namespace BLL /// public static void DeleteProjectById(string id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = db.SYHSEData_Risk.FirstOrDefault(e => e.Id == id); if (getData != null) diff --git a/SGGL/BLL/SubPackManage/SubPackBlacklistService.cs b/SGGL/BLL/SubPackManage/SubPackBlacklistService.cs index a22a1a0..904f380 100644 --- a/SGGL/BLL/SubPackManage/SubPackBlacklistService.cs +++ b/SGGL/BLL/SubPackManage/SubPackBlacklistService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static void AddBackPersonnel(Model.SubPack_Blacklist subPackBlacklist) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_Blacklist.InsertOnSubmit(subPackBlacklist); var basePersonnel = db.SubPack_SubPackPersonnel.FirstOrDefault(p => p.SubPackPersonnelID == subPackBlacklist.BlackForeignKey && (p.State == null || p.State == string.Empty || p.State == "0")); if (basePersonnel != null) @@ -31,7 +31,7 @@ namespace BLL /// public static void AddBackPersonnel(List subPackBlacklists, List ids) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_Blacklist.InsertAllOnSubmit(subPackBlacklists); var basePersonnels = db.SubPack_SubPackPersonnel.Where(p => ids.Contains(p.SubPackPersonnelID) && (p.State == null || p.State == string.Empty || p.State == "0")).ToList(); foreach (var personnel in basePersonnels) { personnel.State = "1"; } @@ -43,7 +43,7 @@ namespace BLL /// public static void AddBackTeam(Model.SubPack_Blacklist subPackBlacklist) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_Blacklist.InsertOnSubmit(subPackBlacklist); var baseTeam = db.SubPack_BranchTeamListTeam.FirstOrDefault(p => p.BranchTeamListTeamId == subPackBlacklist.BlackForeignKey); if (baseTeam != null) @@ -58,7 +58,7 @@ namespace BLL /// public static void AddBackTeam(List subPackBlacklists, List ids) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_Blacklist.InsertAllOnSubmit(subPackBlacklists); var baseTeams = db.SubPack_BranchTeamListTeam.Where(p => ids.Contains(p.BranchTeamListTeamId)).ToList(); foreach (var baseTeam in baseTeams) @@ -73,7 +73,7 @@ namespace BLL /// public static void AddBackTeamList(Model.SubPack_Blacklist subPackBlacklist) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_Blacklist.InsertOnSubmit(subPackBlacklist); //鍔冲姟鍏徃鍚嶅崟鏄庣粏琛 @@ -96,7 +96,7 @@ namespace BLL /// public static void AddBackTeamList(List subPackBlacklists, List ids) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_Blacklist.InsertAllOnSubmit(subPackBlacklists); var baseTeamLists = db.SubPack_TeamListDetail.Where(p => ids.Contains(p.SubPackTeamListDetailID)); foreach (var baseTeamList in baseTeamLists) @@ -117,7 +117,7 @@ namespace BLL /// public static void DeleteBackTeamList(string id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //鍔冲姟鍏徃鍚嶅崟鏄庣粏琛 var teamListDetail = db.SubPack_TeamListDetail.FirstOrDefault(p => p.SubPackTeamListDetailID == id); @@ -142,7 +142,7 @@ namespace BLL /// public static void DeleteBackLaborTeam(string laborTeamId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var oneModelTeamListTeam = db.SubPack_LaborTeam.FirstOrDefault(p => p.LaborTeamId == laborTeamId); if (oneModelTeamListTeam != null) { @@ -159,7 +159,7 @@ namespace BLL /// public static void DeleteBackTeam(string branchTeamListTeamId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var oneModelTeamListTeam = db.SubPack_BranchTeamListTeam.FirstOrDefault(p => p.BranchTeamListTeamId == branchTeamListTeamId); if (oneModelTeamListTeam != null) { @@ -176,7 +176,7 @@ namespace BLL /// public static void DeleteBackPersonnel(string subPackPersonnelID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var oneModelPersonnel = db.SubPack_SubPackPersonnel.FirstOrDefault(p => p.SubPackPersonnelID == subPackPersonnelID); if (oneModelPersonnel != null) { diff --git a/SGGL/BLL/SubPackManage/SubPackBranchTeamListTeamService.cs b/SGGL/BLL/SubPackManage/SubPackBranchTeamListTeamService.cs index 6c03faa..48aaa4b 100644 --- a/SGGL/BLL/SubPackManage/SubPackBranchTeamListTeamService.cs +++ b/SGGL/BLL/SubPackManage/SubPackBranchTeamListTeamService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void DropSelectUnitWork(FineUIPro.DropDownList dropName, string projectid, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.Base_Unit join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId where y.UnitType == "2" && y.ProjectId == projectid @@ -39,7 +39,7 @@ namespace BLL /// 鍔冲姟鐝粍淇℃伅 public static void AddSubPackBranchTeamListTeam(Model.SubPack_BranchTeamListTeam subPackBranchTeamListTeam) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_BranchTeamListTeam.InsertOnSubmit(subPackBranchTeamListTeam); var v_subPackTeamList = db.View_SubPack_TeamList.FirstOrDefault(p => p.SubPackTeamListDetailID == subPackBranchTeamListTeam.BranchTeamListId); if (v_subPackTeamList != null) @@ -86,7 +86,7 @@ namespace BLL /// 鍔冲姟鐝粍淇℃伅鍒楄〃 public static void AddSubPackBranchTeamListTeam(List subPackBranchTeamListTeams) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_BranchTeamListTeam.InsertAllOnSubmit(subPackBranchTeamListTeams); foreach (var subPackBranchTeamListTeam in subPackBranchTeamListTeams) @@ -139,7 +139,7 @@ namespace BLL /// 鍔冲姟鐝粍淇℃伅 public static void UpdateSubPackBranchTeamListTeam(Model.SubPack_BranchTeamListTeam subPackBranchTeamListTeam) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_BranchTeamListTeam.FirstOrDefault(p => p.BranchTeamListTeamId == subPackBranchTeamListTeam.BranchTeamListTeamId); updateItem.UnitId = subPackBranchTeamListTeam.UnitId; updateItem.ProjectId = subPackBranchTeamListTeam.ProjectId; @@ -197,7 +197,7 @@ namespace BLL /// 涓昏〃涓婚敭 public static void DeleteSubPackBranchTeamListTeam(string branchTeamListTeamId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.SubPack_BranchTeamListTeam.FirstOrDefault(p => p.BranchTeamListTeamId == branchTeamListTeamId); string monitorIDCard = deleteItem.MonitorIDCard; //鍒犻櫎涓昏〃 diff --git a/SGGL/BLL/SubPackManage/SubPackChangeRequestApproveService.cs b/SGGL/BLL/SubPackManage/SubPackChangeRequestApproveService.cs index 4759bd2..2d39086 100644 --- a/SGGL/BLL/SubPackManage/SubPackChangeRequestApproveService.cs +++ b/SGGL/BLL/SubPackManage/SubPackChangeRequestApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class SubPackChangeRequestApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗗寘闃熶紞鍙樻洿鍗曞鏍稿垪琛 @@ -40,7 +40,7 @@ namespace BLL /// public static void DeleteSubPackChangeRequestApproveBySubPackChangeRequestID(string subPackChangeRequestID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.SubPack_ChangeRequestApprove where x.SubPackChangeRequestID == subPackChangeRequestID select x).ToList(); db.SubPack_ChangeRequestApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -52,7 +52,7 @@ namespace BLL /// 鍒嗗寘闃熶紞瀹℃壒瀹炰綋 public static void UpdateChangeRequestApprove(Model.SubPack_ChangeRequestApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SubPack_ChangeRequestApprove newApprove = db.SubPack_ChangeRequestApprove.First(e => e.SubPackChangeRequestApproveId == approve.SubPackChangeRequestApproveId && e.ApproveDate == null); newApprove.SubPackChangeRequestID = approve.SubPackChangeRequestID; newApprove.ApproveMan = approve.ApproveMan; @@ -70,7 +70,7 @@ namespace BLL /// 鍒嗗寘闃熶紞鍙樻洿鍗曞鎵瑰疄浣 public static void AddChangeRequestApprove(Model.SubPack_ChangeRequestApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.SubPack_ChangeRequestApprove)); Model.SubPack_ChangeRequestApprove newApprove = new Model.SubPack_ChangeRequestApprove(); newApprove.SubPackChangeRequestApproveId = newKeyID; diff --git a/SGGL/BLL/SubPackManage/SubPackChangeRequestService.cs b/SGGL/BLL/SubPackManage/SubPackChangeRequestService.cs index b34f30b..c8a8547 100644 --- a/SGGL/BLL/SubPackManage/SubPackChangeRequestService.cs +++ b/SGGL/BLL/SubPackManage/SubPackChangeRequestService.cs @@ -9,7 +9,7 @@ namespace BLL { public class SubPackChangeRequestService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 椤圭洰鍚嶇О 涓嬫媺妗嗙粦瀹 @@ -59,7 +59,7 @@ namespace BLL /// 鍒嗗寘闃熶紞鍗曞彉鏇存槑缁嗚〃淇℃伅 public static void AddSubPackChangeRequest(Model.SubPack_ChangeRequest subPackChangeRequest, List subPackChangeRequestDetails) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_ChangeRequest.InsertOnSubmit(subPackChangeRequest); List addBaseBranchTeamList = new List(); foreach (var oneDetail in subPackChangeRequestDetails) @@ -112,7 +112,7 @@ namespace BLL /// 涓昏〃淇℃伅 public static void UpdateSubPackChangeRequest(Model.SubPack_ChangeRequest subPackChangeRequest) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_ChangeRequest.FirstOrDefault(p => p.SubPackChangeRequestID == subPackChangeRequest.SubPackChangeRequestID); updateItem.ProjectId = subPackChangeRequest.ProjectId; updateItem.UnitWorkId = subPackChangeRequest.UnitWorkId; @@ -134,7 +134,7 @@ namespace BLL /// 鏄庣粏琛ㄤ俊鎭 public static void UpdateSubPackChangeRequest(Model.SubPack_ChangeRequest subPackChangeRequest, List subPackChangeRequestDetails) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_ChangeRequest.FirstOrDefault(p => p.SubPackChangeRequestID == subPackChangeRequest.SubPackChangeRequestID); updateItem.ProjectId = subPackChangeRequest.ProjectId; updateItem.UnitWorkId = subPackChangeRequest.UnitWorkId; @@ -196,7 +196,7 @@ namespace BLL /// 涓昏〃涓婚敭 public static void DeleteSubPackChangeRequest(string subPackChangeRequestID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.SubPack_ChangeRequest.FirstOrDefault(p => p.SubPackChangeRequestID == subPackChangeRequestID); //鍒犻櫎涓昏〃 db.SubPack_ChangeRequest.DeleteOnSubmit(deleteItem); diff --git a/SGGL/BLL/SubPackManage/SubPackLaborTeamService.cs b/SGGL/BLL/SubPackManage/SubPackLaborTeamService.cs index bcc7543..25483e1 100644 --- a/SGGL/BLL/SubPackManage/SubPackLaborTeamService.cs +++ b/SGGL/BLL/SubPackManage/SubPackLaborTeamService.cs @@ -15,7 +15,7 @@ namespace BLL /// public static void DropSelectUnitWork(FineUIPro.DropDownList dropName, string projectid, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.Base_Unit join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId where y.UnitType == "2" && y.ProjectId == projectid @@ -37,7 +37,7 @@ namespace BLL /// public static void DropSelectLaborTeam(FineUIPro.DropDownList dropName, string unitId, string BranchTeamListId, string projectId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.SubPack_LaborTeam where x.ProjectId == projectId && (x.BranchTeamListId == BranchTeamListId || BranchTeamListId == null) && (x.UnitId == unitId || unitId == null) && (x.State == null || x.State == "" || x.State == "0") select new @@ -58,7 +58,7 @@ namespace BLL /// public static void DropSelectLaborTeamUpdate(FineUIPro.DropDownList dropName, string unitId, string BranchTeamListId, string projectId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.SubPack_LaborTeam where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) && (x.BranchTeamListId == BranchTeamListId || BranchTeamListId == null) select new @@ -81,7 +81,7 @@ namespace BLL /// 鍔冲姟闃熶紞淇℃伅 public static void AddSubPackLaborTeam(Model.SubPack_LaborTeam subPackLaborTeam) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_LaborTeam.InsertOnSubmit(subPackLaborTeam); var v_subPackTeamList = db.View_SubPack_TeamList.FirstOrDefault(p => p.SubPackTeamListDetailID == subPackLaborTeam.BranchTeamListId); if (v_subPackTeamList != null) @@ -124,7 +124,7 @@ namespace BLL /// 鍔冲姟闃熶紞淇℃伅鍒楄〃 public static void AddSubPackLaborTeam(List subPackLaborTeams) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_LaborTeam.InsertAllOnSubmit(subPackLaborTeams); foreach (var subPackLaborTeam in subPackLaborTeams) { @@ -170,7 +170,7 @@ namespace BLL /// 鍔冲姟闃熶紞淇℃伅 public static void UpdateSubPackLaborTeam(Model.SubPack_LaborTeam subPackLaborTeam) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_LaborTeam.FirstOrDefault(p => p.LaborTeamId == subPackLaborTeam.LaborTeamId); if (updateItem != null) { @@ -226,7 +226,7 @@ namespace BLL /// 涓昏〃涓婚敭 public static void DeleteSubPackLaborTeam(string laborTeamId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.SubPack_LaborTeam.FirstOrDefault(p => p.LaborTeamId == laborTeamId); if (deleteItem != null) { diff --git a/SGGL/BLL/SubPackManage/SubPackSubPackPersonnelService.cs b/SGGL/BLL/SubPackManage/SubPackSubPackPersonnelService.cs index 8c01d6e..7690fd8 100644 --- a/SGGL/BLL/SubPackManage/SubPackSubPackPersonnelService.cs +++ b/SGGL/BLL/SubPackManage/SubPackSubPackPersonnelService.cs @@ -15,7 +15,7 @@ namespace BLL /// public static void DropSelectTeam(FineUIPro.DropDownList dropName, string unitId, string branchTeamListId, string laborTeamId, string projectId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.SubPack_BranchTeamListTeam where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) && (x.BranchTeamListId == branchTeamListId || branchTeamListId == null) && (x.LaborTeamId == laborTeamId || laborTeamId == null) && (x.State == null || x.State == "" || x.State == "0") select new @@ -35,7 +35,7 @@ namespace BLL /// public static void DropSelectTeamUpdate(FineUIPro.DropDownList dropName, string unitId, string branchTeamListId, string laborTeamId, string projectId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.SubPack_BranchTeamListTeam where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) && (x.BranchTeamListId == branchTeamListId || branchTeamListId == null) && (x.LaborTeamId == laborTeamId || laborTeamId == null) select new @@ -56,7 +56,7 @@ namespace BLL /// 鍔冲姟浜哄憳淇℃伅 public static void AddSubPackSubPackPersonnel(Model.SubPack_SubPackPersonnel subPackSubPackPersonnel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_SubPackPersonnel.InsertOnSubmit(subPackSubPackPersonnel); //寰鍏徃绾ase_SubPackPersonnel琛ㄥ啓鍏ユ暟鎹 @@ -117,7 +117,7 @@ namespace BLL /// 鍔冲姟浜哄憳淇℃伅鍒楄〃 public static void AddSubPackSubPackPersonnel(List subPackSubPackPersonnels) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_SubPackPersonnel.InsertAllOnSubmit(subPackSubPackPersonnels); List AddBaseSubPackPersonnelList = new List(); @@ -184,7 +184,7 @@ namespace BLL /// 鍔冲姟浜哄憳淇℃伅 public static void UpdateSubPackSubPackPersonnel(Model.SubPack_SubPackPersonnel subPackSubPackPersonnel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_SubPackPersonnel.FirstOrDefault(p => p.SubPackPersonnelID == subPackSubPackPersonnel.SubPackPersonnelID); updateItem.ProjectId = subPackSubPackPersonnel.ProjectId; updateItem.PersonName = subPackSubPackPersonnel.PersonName; @@ -255,7 +255,7 @@ namespace BLL /// 涓昏〃涓婚敭 public static void DeleteSubPackSubPackPersonnel(string subPackPersonnelID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.SubPack_SubPackPersonnel.FirstOrDefault(p => p.SubPackPersonnelID == subPackPersonnelID); string identityCard = deleteItem.IdentityCard; //鍒犻櫎涓昏〃 diff --git a/SGGL/BLL/SubPackManage/SubPackTeamEvaluationApproveService.cs b/SGGL/BLL/SubPackManage/SubPackTeamEvaluationApproveService.cs index 4950a91..d6a2436 100644 --- a/SGGL/BLL/SubPackManage/SubPackTeamEvaluationApproveService.cs +++ b/SGGL/BLL/SubPackManage/SubPackTeamEvaluationApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class SubPackTeamEvaluationApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗗寘闃熶紞鍗曞鏍稿垪琛 @@ -40,7 +40,7 @@ namespace BLL /// public static void DeleteSubPackTeamEvaluationApproveBySubPackTeamEvaluationID(string subPackTeamEvaluationID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.SubPack_TeamEvaluationApprove where x.SubPackTeamEvaluationID == subPackTeamEvaluationID select x).ToList(); db.SubPack_TeamEvaluationApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -52,7 +52,7 @@ namespace BLL /// 鍒嗗寘闃熶紞瀹℃壒瀹炰綋 public static void UpdateTeamEvaluationApprove(Model.SubPack_TeamEvaluationApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SubPack_TeamEvaluationApprove newApprove = db.SubPack_TeamEvaluationApprove.First(e => e.SubPackTeamEvaluationApproveId == approve.SubPackTeamEvaluationApproveId && e.ApproveDate == null); newApprove.SubPackTeamEvaluationID = approve.SubPackTeamEvaluationID; newApprove.ApproveMan = approve.ApproveMan; @@ -70,7 +70,7 @@ namespace BLL /// 鍒嗗寘闃熶紞瀹℃壒瀹炰綋 public static void AddTeamEvaluationApprove(Model.SubPack_TeamEvaluationApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.SubPack_TeamEvaluationApprove)); Model.SubPack_TeamEvaluationApprove newApprove = new Model.SubPack_TeamEvaluationApprove(); newApprove.SubPackTeamEvaluationApproveId = newKeyID; diff --git a/SGGL/BLL/SubPackManage/SubPackTeamEvaluationService.cs b/SGGL/BLL/SubPackManage/SubPackTeamEvaluationService.cs index bc55a5f..1e7604a 100644 --- a/SGGL/BLL/SubPackManage/SubPackTeamEvaluationService.cs +++ b/SGGL/BLL/SubPackManage/SubPackTeamEvaluationService.cs @@ -8,7 +8,7 @@ namespace BLL { public class SubPackTeamEvaluationService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 椤圭洰鍚嶇О 涓嬫媺妗嗙粦瀹 @@ -58,7 +58,7 @@ namespace BLL /// public static void AddSubPackTeamEvaluation(Model.SubPack_TeamEvaluation subPackTeamEvaluation, List subPackTeamEvaluationDetails) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_TeamEvaluation.InsertOnSubmit(subPackTeamEvaluation); foreach (var oneDetail in subPackTeamEvaluationDetails) { @@ -74,7 +74,7 @@ namespace BLL /// public static void UpdateSubPackTeamEvaluation(Model.SubPack_TeamEvaluation subPackTeamEvaluation) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_TeamEvaluation.FirstOrDefault(p => p.SubPackTeamEvaluationID == subPackTeamEvaluation.SubPackTeamEvaluationID); updateItem.ProjectId = subPackTeamEvaluation.ProjectId; updateItem.SubmitMan = subPackTeamEvaluation.SubmitMan; @@ -93,7 +93,7 @@ namespace BLL /// public static void UpdateSubPackTeamEvaluation(Model.SubPack_TeamEvaluation subPackTeamEvaluation, List subPackTeamEvaluationDetails) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_TeamEvaluation.FirstOrDefault(p => p.SubPackTeamEvaluationID == subPackTeamEvaluation.SubPackTeamEvaluationID); updateItem.ProjectId = subPackTeamEvaluation.ProjectId; updateItem.SubmitMan = subPackTeamEvaluation.SubmitMan; @@ -115,7 +115,7 @@ namespace BLL /// public static void DeleteSubPackTeamEvaluation(string subPackTeamEvaluationID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.SubPack_TeamEvaluation.FirstOrDefault(p => p.SubPackTeamEvaluationID == subPackTeamEvaluationID); //鍒犻櫎涓昏〃 db.SubPack_TeamEvaluation.DeleteOnSubmit(deleteItem); diff --git a/SGGL/BLL/SubPackManage/SubPackTeamListApproveService.cs b/SGGL/BLL/SubPackManage/SubPackTeamListApproveService.cs index bd2e929..fac3dc7 100644 --- a/SGGL/BLL/SubPackManage/SubPackTeamListApproveService.cs +++ b/SGGL/BLL/SubPackManage/SubPackTeamListApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class SubPackTeamListApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍒嗗寘闃熶紞鍗曞鏍稿垪琛 @@ -40,7 +40,7 @@ namespace BLL /// public static void DeleteSubPackTeamListApproveBySubPackTeamListID(string SubPackTeamListID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.SubPack_TeamListApprove where x.SubPackTeamListID == SubPackTeamListID select x).ToList(); db.SubPack_TeamListApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); @@ -52,7 +52,7 @@ namespace BLL /// 鍒嗗寘闃熶紞瀹℃壒瀹炰綋 public static void UpdateTeamListApprove(Model.SubPack_TeamListApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SubPack_TeamListApprove newApprove = db.SubPack_TeamListApprove.First(e => e.SubPackTeamListApproveId == approve.SubPackTeamListApproveId && e.ApproveDate == null); newApprove.SubPackTeamListID = approve.SubPackTeamListID; newApprove.ApproveMan = approve.ApproveMan; @@ -70,7 +70,7 @@ namespace BLL /// 鍒嗗寘闃熶紞瀹℃壒瀹炰綋 public static void AddTeamListApprove(Model.SubPack_TeamListApprove approve) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.SubPack_TeamListApprove)); Model.SubPack_TeamListApprove newApprove = new Model.SubPack_TeamListApprove(); newApprove.SubPackTeamListApproveId = newKeyID; diff --git a/SGGL/BLL/SubPackManage/SubPackTeamListService.cs b/SGGL/BLL/SubPackManage/SubPackTeamListService.cs index 1217a5f..bc07506 100644 --- a/SGGL/BLL/SubPackManage/SubPackTeamListService.cs +++ b/SGGL/BLL/SubPackManage/SubPackTeamListService.cs @@ -10,7 +10,7 @@ namespace BLL { public static class SubPackTeamListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 椤圭洰鍚嶇О 涓嬫媺妗嗙粦瀹 @@ -58,7 +58,7 @@ namespace BLL /// public static void DropSelectTeamWork(FineUIPro.DropDownList dropName, string unitId, string projectId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.View_SubPack_TeamList where x.ProjectId == projectId && x.State == Const.SubPackTeamList_AuditCompleted && (x.UnitWorkId == unitId || unitId == null) && ((x.OrderType == "1" && x.State == Const.SubPackTeamList_AuditCompleted) || (x.OrderType == "2" && x.State == Const.SubPackChangeRequest_AuditCompleted)) @@ -80,7 +80,7 @@ namespace BLL /// public static void DropSelectTeamWorkUpdate(FineUIPro.DropDownList dropName, string unitId, string projectId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.View_SubPack_TeamList where x.ProjectId == projectId && x.State == Const.SubPackTeamList_AuditCompleted && (x.UnitWorkId == unitId || unitId == null) && ((x.OrderType == "1" && x.State == Const.SubPackTeamList_AuditCompleted) || (x.OrderType == "2" && x.State == Const.SubPackChangeRequest_AuditCompleted)) @@ -105,7 +105,7 @@ namespace BLL /// public static void AddSubPackTeamList(Model.SubPack_TeamList subPackTeamList, List subPackTeamListDetails) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.SubPack_TeamList.InsertOnSubmit(subPackTeamList); List addBaseBranchTeamList = new List(); foreach (var oneDetail in subPackTeamListDetails) @@ -166,7 +166,7 @@ namespace BLL /// public static void UpdateSubPackTeamList(Model.SubPack_TeamList subPackTeamList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_TeamList.FirstOrDefault(p => p.SubPackTeamListID == subPackTeamList.SubPackTeamListID); updateItem.ProjectId = subPackTeamList.ProjectId; updateItem.UnitWorkId = subPackTeamList.UnitWorkId; @@ -187,7 +187,7 @@ namespace BLL /// public static void UpdateSubPackTeamList(Model.SubPack_TeamList subPackTeamList, List subPackTeamListDetails) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.SubPack_TeamList.FirstOrDefault(p => p.SubPackTeamListID == subPackTeamList.SubPackTeamListID); updateItem.ProjectId = subPackTeamList.ProjectId; updateItem.UnitWorkId = subPackTeamList.UnitWorkId; @@ -256,7 +256,7 @@ namespace BLL /// public static void DeleteSubPackTeamList(string subPackTeamListID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.SubPack_TeamList.FirstOrDefault(p => p.SubPackTeamListID == subPackTeamListID); //鍒犻櫎涓昏〃 db.SubPack_TeamList.DeleteOnSubmit(deleteItem); diff --git a/SGGL/BLL/SysManage/ButtonPowerService.cs b/SGGL/BLL/SysManage/ButtonPowerService.cs index 154950a..82a4c54 100644 --- a/SGGL/BLL/SysManage/ButtonPowerService.cs +++ b/SGGL/BLL/SysManage/ButtonPowerService.cs @@ -15,7 +15,7 @@ namespace BLL /// 鎸夐挳闆嗗悎 public static string[] GetButtonPowerList(string roleId, string menuId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Sys_ButtonPower where x.RoleId == roleId && x.MenuId == menuId select x; string[] button = new string[q.Count()]; if (q.Count() > 0) @@ -59,7 +59,7 @@ namespace BLL /// public static void DeleteButtonPower(string roleId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var bt = from x in db.Sys_ButtonPower where x.RoleId == roleId select x; if (bt.Count() > 0) { @@ -74,7 +74,7 @@ namespace BLL /// public static void DeleteButtonPowerByRoleIdMenuType(string roleId, string menuType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var bt = from x in db.Sys_ButtonPower join y in db.Sys_Menu on x.MenuId equals y.MenuId where x.RoleId == roleId && y.MenuType == menuType @@ -92,7 +92,7 @@ namespace BLL /// public static void DeleteButtonPowerByMenuId(string menuId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var bt = from x in db.Sys_ButtonPower where x.MenuId == menuId select x; if (bt.Count() > 0) { @@ -107,7 +107,7 @@ namespace BLL /// public static void SaveButtonPower(Model.Sys_ButtonPower btn) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Sys_ButtonPower)); Model.Sys_ButtonPower button = new Model.Sys_ButtonPower { diff --git a/SGGL/BLL/SysManage/DepartService.cs b/SGGL/BLL/SysManage/DepartService.cs index f0e4e08..aa36222 100644 --- a/SGGL/BLL/SysManage/DepartService.cs +++ b/SGGL/BLL/SysManage/DepartService.cs @@ -5,7 +5,7 @@ namespace BLL { public static class DepartService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇淇℃伅 @@ -23,7 +23,7 @@ namespace BLL /// public static void AddDepart(Model.Base_Depart depart) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Depart newDepart = new Model.Base_Depart { DepartId = depart.DepartId, @@ -42,7 +42,7 @@ namespace BLL /// public static void UpdateDepart(Model.Base_Depart depart) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Depart newDepart = db.Base_Depart.FirstOrDefault(e => e.DepartId == depart.DepartId); if (newDepart != null) { @@ -59,7 +59,7 @@ namespace BLL /// public static void DeleteDepartById(string departId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Depart depart = db.Base_Depart.FirstOrDefault(e => e.DepartId == departId); { db.Base_Depart.DeleteOnSubmit(depart); @@ -144,7 +144,7 @@ namespace BLL } public static string getDepartNamesByIdsForApi(object departIdsIds) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string departName = string.Empty; if (departIdsIds != null) diff --git a/SGGL/BLL/SysManage/LogService.cs b/SGGL/BLL/SysManage/LogService.cs index 008c895..d595578 100644 --- a/SGGL/BLL/SysManage/LogService.cs +++ b/SGGL/BLL/SysManage/LogService.cs @@ -7,7 +7,7 @@ namespace BLL public static class LogService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 添加操作日志 @@ -19,7 +19,7 @@ namespace BLL /// 操作名称 public static void AddSys_Log(Model.Sys_User CurrUser, string code, string dataId, string strMenuId, string strOperationName) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (CurrUser != null) { @@ -111,7 +111,7 @@ namespace BLL /// public static void DeleteLog(string projectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = (from x in db.Sys_Log where x.ProjectId == projectId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/SysManage/RoleItemService.cs b/SGGL/BLL/SysManage/RoleItemService.cs index 12b26f7..6b63140 100644 --- a/SGGL/BLL/SysManage/RoleItemService.cs +++ b/SGGL/BLL/SysManage/RoleItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class RoleItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇瑙掕壊鏄庣粏淇℃伅 @@ -65,7 +65,7 @@ namespace BLL /// 瀹炰綋 public static void AddRoleItem(Model.Sys_RoleItem newitem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Sys_RoleItem)); Model.Sys_RoleItem newUser = new Model.Sys_RoleItem { @@ -87,7 +87,7 @@ namespace BLL /// 瀹炰綋 public static void UpdateRoleItem(Model.Sys_RoleItem NewRole) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_RoleItem item = db.Sys_RoleItem.FirstOrDefault(e => e.RoleItemId == NewRole.RoleItemId); if (item != null) { @@ -106,7 +106,7 @@ namespace BLL /// public static void DeleteRoleItem(string roleItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_RoleItem roleItem = db.Sys_RoleItem.FirstOrDefault(e => e.RoleItemId == roleItemId); if (roleItem != null) { diff --git a/SGGL/BLL/SysManage/RolePowerService.cs b/SGGL/BLL/SysManage/RolePowerService.cs index 6e34664..569fca7 100644 --- a/SGGL/BLL/SysManage/RolePowerService.cs +++ b/SGGL/BLL/SysManage/RolePowerService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static void SaveRolePower(Model.Sys_RolePower power) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newRolePower = SQLHelper.GetNewID(); Model.Sys_RolePower newPower = new Model.Sys_RolePower { @@ -52,7 +52,7 @@ namespace BLL /// public static void DeleteRolePowerByRoleIdMenuType(string roleId, string menuType) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Sys_RolePower join y in db.Sys_Menu on x.MenuId equals y.MenuId where x.RoleId == roleId && y.MenuType == menuType diff --git a/SGGL/BLL/SysManage/RoleService.cs b/SGGL/BLL/SysManage/RoleService.cs index 6952a1a..f041744 100644 --- a/SGGL/BLL/SysManage/RoleService.cs +++ b/SGGL/BLL/SysManage/RoleService.cs @@ -7,7 +7,7 @@ public static class RoleService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇瑙掕壊淇℃伅 @@ -53,7 +53,7 @@ /// public static void AddRole(Model.Sys_Role role) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_Role newRole = new Model.Sys_Role { RoleId = role.RoleId, @@ -77,7 +77,7 @@ /// public static void UpdateRole(Model.Sys_Role role) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_Role updateRole = db.Sys_Role.FirstOrDefault(e => e.RoleId == role.RoleId); if (updateRole != null) { @@ -97,7 +97,7 @@ /// public static void DeleteRole(string roleId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_Role deleteRole = db.Sys_Role.FirstOrDefault(e => e.RoleId == roleId); if (deleteRole != null) { diff --git a/SGGL/BLL/SysManage/ScheduleService.cs b/SGGL/BLL/SysManage/ScheduleService.cs index e8fe2f6..8dc0e78 100644 --- a/SGGL/BLL/SysManage/ScheduleService.cs +++ b/SGGL/BLL/SysManage/ScheduleService.cs @@ -8,7 +8,7 @@ namespace BLL { public class ScheduleService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 娣诲姞 @@ -16,7 +16,7 @@ namespace BLL /// public static void Add(Model.Sys_Schedule model) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Sys_Schedule newModel = new Model.Sys_Schedule(); newModel.ScheduleId = model.ScheduleId; @@ -35,7 +35,7 @@ namespace BLL /// public static void Update(Model.Sys_Schedule model) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.Sys_Schedule newModel = db.Sys_Schedule.First(e => e.ScheduleId == model.ScheduleId); newModel.ScheduleName = model.ScheduleName; diff --git a/SGGL/BLL/SysManage/SysConstSetService.cs b/SGGL/BLL/SysManage/SysConstSetService.cs index e5fe8a1..d498391 100644 --- a/SGGL/BLL/SysManage/SysConstSetService.cs +++ b/SGGL/BLL/SysManage/SysConstSetService.cs @@ -184,7 +184,7 @@ /// public static void AddCodeTemplateRule(Model.Sys_CodeTemplateRule codeTemplateRule) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_CodeTemplateRule newCodeTemplateRule = new Model.Sys_CodeTemplateRule { CodeTemplateRuleId = SQLHelper.GetNewID(typeof(Model.Sys_CodeTemplateRule)), @@ -208,7 +208,7 @@ /// public static void UpdateCodeTemplateRule(Model.Sys_CodeTemplateRule codeTemplateRule) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_CodeTemplateRule updateCodeTemplateRule = db.Sys_CodeTemplateRule.FirstOrDefault(e => e.MenuId == codeTemplateRule.MenuId); if (updateCodeTemplateRule != null) { @@ -242,7 +242,7 @@ /// public static void AddMenuFlowOperate(Model.Sys_MenuFlowOperate MenuFlowOperate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_MenuFlowOperate newMenuFlowOperate = new Model.Sys_MenuFlowOperate { FlowOperateId = SQLHelper.GetNewID(typeof(Model.Sys_MenuFlowOperate)), @@ -262,7 +262,7 @@ /// public static void UpdateMenuFlowOperate(Model.Sys_MenuFlowOperate MenuFlowOperate) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_MenuFlowOperate updateMenuFlowOperate = db.Sys_MenuFlowOperate.FirstOrDefault(e => e.MenuId == MenuFlowOperate.MenuId); if (updateMenuFlowOperate != null) { diff --git a/SGGL/BLL/SysManage/SysHttplogService.cs b/SGGL/BLL/SysManage/SysHttplogService.cs index bec0505..69328a1 100644 --- a/SGGL/BLL/SysManage/SysHttplogService.cs +++ b/SGGL/BLL/SysManage/SysHttplogService.cs @@ -11,7 +11,7 @@ namespace BLL public static class SysHttplogService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/SysManage/SysMenuService.cs b/SGGL/BLL/SysManage/SysMenuService.cs index 4dd8d25..01a8d79 100644 --- a/SGGL/BLL/SysManage/SysMenuService.cs +++ b/SGGL/BLL/SysManage/SysMenuService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class SysMenuService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁MenuId鑾峰彇鑿滃崟鍚嶇О椤 diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs index 8adebc2..55ac4e0 100644 --- a/SGGL/BLL/SysManage/UnitService.cs +++ b/SGGL/BLL/SysManage/UnitService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class UnitService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鑾峰彇鍗曚綅淇℃伅 @@ -65,7 +65,7 @@ namespace BLL /// public static void AddUnit(Model.Base_Unit unit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Unit newUnit = new Model.Base_Unit { UnitId = unit.UnitId, @@ -102,7 +102,7 @@ namespace BLL /// public static void UpdateUnit(Model.Base_Unit unit) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Base_Unit newUnit = db.Base_Unit.FirstOrDefault(e => e.UnitId == unit.UnitId); if (newUnit != null) { @@ -137,7 +137,7 @@ namespace BLL /// public static void DeleteUnitById(string unitId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var delUnit = db.Base_Unit.FirstOrDefault(e => e.UnitId == unitId); if (delUnit != null) { @@ -229,7 +229,7 @@ namespace BLL /// public static List GetUnitListByProjectId(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List units = new List(); if (!string.IsNullOrEmpty(projectId)) @@ -257,7 +257,7 @@ namespace BLL /// public static List GetUnitByProjectIdList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Base_Unit join y in db.Project_ProjectUnit @@ -276,7 +276,7 @@ namespace BLL /// public static List GetUnitByProjectIdUnitTypeList(string projectId, string unitType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Base_Unit join y in db.Project_ProjectUnit @@ -295,7 +295,7 @@ namespace BLL /// public static List GetUnitByProjectIdUnitTypeList2(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Base_Unit join y in db.Project_ProjectUnit @@ -314,7 +314,7 @@ namespace BLL /// public static List GetUnitByProjectIdListNotContainOneUnit(string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Base_Unit join y in db.Project_ProjectUnit @@ -327,7 +327,7 @@ namespace BLL } public static List GetUnitByProjectIdListNotContainOneUnit(string projectId, string unitId, string key) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Base_Unit join y in db.Project_ProjectUnit @@ -525,7 +525,7 @@ namespace BLL /// public static List GetMainAndSubUnitByProjectIdList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Base_Unit join y in db.Project_ProjectUnit @@ -588,7 +588,7 @@ namespace BLL /// public static List GetAllNoSubUnitList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Base_Unit orderby x.UnitCode @@ -921,7 +921,7 @@ namespace BLL /// public static List GetNoThisAllUnitList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = (from x in db.Base_Unit where x.UnitId != BLL.Const.UnitId_TCC orderby x.UnitCode select x).ToList(); return q; diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index 9537028..7e87c27 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -8,7 +8,7 @@ namespace BLL public static class UserService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 获取用户信息 @@ -84,7 +84,7 @@ namespace BLL /// 用户信息 public static void UpdateLastUserInfo(string userId, string LastMenuType, bool LastIsOffice, string LastProjectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var uU = db.Sys_User.FirstOrDefault(e => e.UserId == userId); if (uU != null) @@ -187,7 +187,7 @@ namespace BLL /// public static void UpdatePassword(string userId, string password) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_User m = db.Sys_User.FirstOrDefault(e => e.UserId == userId); if (m != null) { @@ -198,7 +198,7 @@ namespace BLL } public static void UpdatePassword(string userId ) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_User m = db.Sys_User.FirstOrDefault(e => e.UserId == userId); if (m != null) { @@ -213,7 +213,7 @@ namespace BLL /// 人员实体 public static void AddUser(Model.Sys_User user) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.Sys_User)); Model.Sys_User newUser = new Model.Sys_User { @@ -264,7 +264,7 @@ namespace BLL { try { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_User newUser = db.Sys_User.FirstOrDefault(e => e.UserId == user.UserId); if (newUser != null) { @@ -303,7 +303,7 @@ namespace BLL /// 人员实体 public static void UpdateUser(Model.Sys_User user) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_User newUser = db.Sys_User.FirstOrDefault(e => e.UserId == user.UserId); if (newUser != null) { @@ -354,7 +354,7 @@ namespace BLL /// public static void DeleteUser(string userId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Sys_User user = db.Sys_User.FirstOrDefault(e => e.UserId == userId); if (user != null) { @@ -384,7 +384,7 @@ namespace BLL /// public static List GetProjectRoleUserListByProjectId(string projectId, string unitId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; IQueryable users = null; if (!string.IsNullOrEmpty(projectId)) { @@ -460,7 +460,7 @@ namespace BLL /// public static List GetUserListByProjectIdAndUnitId(string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List list = new List(); if (!string.IsNullOrEmpty(projectId)) @@ -502,7 +502,7 @@ namespace BLL /// public static List GetProjectUserListByProjectId(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var users = (from x in db.Sys_User where x.IsPost == true && x.UserId != Const.hfnbdId && x.UserId != Const.sedinId @@ -527,7 +527,7 @@ namespace BLL /// public static ListItem[] GetProjectUserListItemByProjectId(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var users = (from x in db.Sys_User where x.IsPost == true && x.UserId != Const.hfnbdId && x.UserId != Const.sedinId @@ -556,7 +556,7 @@ namespace BLL /// public static List GetUserListByProjectIdAndRoleId(string projectId, string roleIds) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List listRoles = Funs.GetStrListByStr(roleIds, ','); List list = new List(); @@ -604,7 +604,7 @@ namespace BLL /// public static List GetUserListByProjectIdUnitIdRoleId(string projectId,string unitId, string roleIds) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List listRoles = Funs.GetStrListByStr(roleIds, ','); List list = new List(); @@ -746,7 +746,7 @@ namespace BLL /// public static void DeleteUserRead(string dataId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var userRs = from x in Funs.DB.Sys_UserRead where x.DataId == dataId select x; if (userRs.Count() > 0) { @@ -761,7 +761,7 @@ namespace BLL /// public static List GetSeeUserList(string projectId, string subUnitId, string cNProfessionalCode, string unitWorkId, string subUserId, string mainUserId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List users = new List(); //分包用户 @@ -863,7 +863,7 @@ namespace BLL /// public static ListItem[] GetUserByUnitId(string projectId, string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var user = (from x in db.Sys_User where x.IsPost == true @@ -900,7 +900,7 @@ namespace BLL /// public static ListItem[] GetMainUserList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var user = (from x in db.Sys_User join y in db.Project_ProjectUser on x.UserId equals y.UserId @@ -947,7 +947,7 @@ namespace BLL /// public static List GetSeeUserList2(string projectId, string subUnitId, string cNProfessionalCode, string unitWorkId, string mainUserId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List users = new List(); //分包用户 @@ -1019,7 +1019,7 @@ namespace BLL /// public static List GetSeeUserList3(string projectId, string unitId1, string unitId2, string unitId3, string cNProfessionalCode, string unitWorkId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List users = new List(); var q1 = (from x in db.Project_ProjectUser @@ -1117,7 +1117,7 @@ namespace BLL /// public static ListItem[] GetUserByUnitIds(string projectId, string unitIds) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var user = (from x in db.Sys_User where x.IsPost == true @@ -1153,7 +1153,7 @@ namespace BLL /// public static List GetSeeUserListByRole(string projectId, string unitId, string role1, string role2, string role3, string role4) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Sys_User join z in db.Project_ProjectUser @@ -1173,7 +1173,7 @@ namespace BLL /// public static List GetSeeUserList4(string projectId, string unitId1, string unitId2, string unitId3) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List users = new List(); var q1 = (from x in db.Sys_User @@ -1232,7 +1232,7 @@ namespace BLL /// public static ListItem[] GetJLUserList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var user = (from x in db.Sys_User join y in db.Project_ProjectUser @@ -1276,7 +1276,7 @@ namespace BLL /// public static ListItem[] GetYZUserList(string projectId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var user = (from x in db.Sys_User join y in db.Project_ProjectUser @@ -1318,7 +1318,7 @@ namespace BLL /// public static List GetUserListByProjectIdAndUnitType(string projectId, string unitType) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List list = new List(); if (!string.IsNullOrEmpty(projectId)) @@ -1374,7 +1374,7 @@ namespace BLL /// public static List GetProjectUserListByProjectIdForApi(string projectId, string name) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var users = (from x in db.Sys_User where x.IsPost == true && x.UserId != BLL.Const.hfnbdId @@ -1404,7 +1404,7 @@ namespace BLL /// public static List GetProjectUserListByProjectIdForApi(string projectId, string unitId, string unitType, string name) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List list = new List(); if (!string.IsNullOrEmpty(projectId)) @@ -1453,7 +1453,7 @@ namespace BLL /// public static List GetUserListByUnitId(string unitId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List list = new List(); list = (from x in db.Sys_User @@ -1487,7 +1487,7 @@ namespace BLL /// public static List GetUserListByRole(string role) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Sys_User where x.RoleId == role @@ -1529,7 +1529,7 @@ namespace BLL /// public static List GetUserListByUnitIdDepartId(string unitId, string DepartId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List list = new List(); list = (from x in db.Sys_User @@ -1581,7 +1581,7 @@ namespace BLL /// public static ListItem[] GetSGBUserList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var user = (from x in db.Sys_User where x.IsPost == true && x.UnitId == Const.UnitId_TCC && x.DepartId == Const.Depart_constructionId @@ -1639,7 +1639,7 @@ namespace BLL /// public static List GetUserListByRoleId(string projectId, string unitId, string roleId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List list = new List(); if (!string.IsNullOrEmpty(projectId)) diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs b/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs index e940557..3b7b61e 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs @@ -6,7 +6,7 @@ namespace BLL public static class DataForJTApiService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 获取接口设置信息 @@ -24,7 +24,7 @@ namespace BLL /// 接口设置 public static void AddFaceSet(Model.InterFaceSet faceset) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.InterFaceSet)); Model.InterFaceSet newSet = new Model.InterFaceSet { @@ -48,7 +48,7 @@ namespace BLL /// 接口设置实体 public static void UpdateFaceSet(Model.InterFaceSet user) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InterFaceSet newSet = db.InterFaceSet.FirstOrDefault(e => e.InterFaceSetId == user.InterFaceSetId); if (newSet != null) { @@ -72,7 +72,7 @@ namespace BLL /// public static void DeleteFaceSet(string SetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.InterFaceSet FaceSet = db.InterFaceSet.FirstOrDefault(e => e.InterFaceSetId == SetId); if (FaceSet != null) { @@ -95,7 +95,7 @@ namespace BLL //{ // if (newItem.FaceLogDate.Count() == 0) // return "数据不可为空！"; - // using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + // using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) // { // List InterFaceLogIdList=new List (); // List logList = new List(); diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs index 073b293..cf66086 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs @@ -14,7 +14,7 @@ namespace BLL public static class InterFaceLogService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; public const string Type1 = "涓婃姤"; public const string Type2= "涓嬪彂"; diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs index ce3b8fe..40b28a4 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs @@ -15,7 +15,7 @@ namespace BLL public static class InterFaceTaskService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverConStudyService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverConStudyService.cs index d7a03c3..971cf98 100644 --- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverConStudyService.cs +++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverConStudyService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddDriverPrepareDriverPlan(Model.DriverPrepare_ConStudy DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_ConStudy newDriverData = new Model.DriverPrepare_ConStudy(); newDriverData.ConStudyId = DriverPrepareDriverPlan.ConStudyId; @@ -35,7 +35,7 @@ namespace BLL /// public static void UpdateDriverPrepareDriverPlan(Model.DriverPrepare_ConStudy DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_ConStudy newDriverData = db.DriverPrepare_ConStudy.FirstOrDefault(e => e.ConStudyId == DriverPrepareDriverPlan.ConStudyId); if (newDriverData != null) @@ -58,7 +58,7 @@ namespace BLL /// public static void DeleteDriverPlan(string ConStudyId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_ConStudy newDriverData = db.DriverPrepare_ConStudy.FirstOrDefault(e => e.ConStudyId == ConStudyId); if (newDriverData != null) diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataService.cs index e28a9e1..42cf71a 100644 --- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataService.cs +++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverDataService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddDriverPrepareDriverData(Model.DriverPrepare_DriverData DriverPrepareDriverData) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverData newDriverData = new Model.DriverPrepare_DriverData(); newDriverData.DriverDataId = DriverPrepareDriverData.DriverDataId; @@ -32,7 +32,7 @@ namespace BLL /// public static void UpdateDriverPrepareDriverData(Model.DriverPrepare_DriverData DriverPrepareDriverData) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverData newDriverData = db.DriverPrepare_DriverData.FirstOrDefault(e => e.DriverDataId == DriverPrepareDriverData.DriverDataId); if (newDriverData != null) @@ -52,7 +52,7 @@ namespace BLL /// public static void DeleteDriverData(string DriverDataId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverData newDriverData = db.DriverPrepare_DriverData.FirstOrDefault(e => e.DriverDataId == DriverDataId); if (newDriverData != null) diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverPersonPlanService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverPersonPlanService.cs index 921a1f2..9ba7583 100644 --- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverPersonPlanService.cs +++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverPersonPlanService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddDriverPrepareDriverPlan(Model.DriverPrepare_DriverPersonPlan DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverPersonPlan newDriverData = new Model.DriverPrepare_DriverPersonPlan(); newDriverData.DriverPersonPlanId = DriverPrepareDriverPlan.DriverPersonPlanId; @@ -38,7 +38,7 @@ namespace BLL /// public static void UpdateDriverPrepareDriverPlan(Model.DriverPrepare_DriverPersonPlan DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverPersonPlan newDriverData = db.DriverPrepare_DriverPersonPlan.FirstOrDefault(e => e.DriverPersonPlanId == DriverPrepareDriverPlan.DriverPersonPlanId); if (newDriverData != null) @@ -64,7 +64,7 @@ namespace BLL /// public static void DeleteDriverPlan(string DriverPersonPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverPersonPlan newDriverData = db.DriverPrepare_DriverPersonPlan.FirstOrDefault(e => e.DriverPersonPlanId == DriverPersonPlanId); if (newDriverData != null) diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverPlanService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverPlanService.cs index ba4f2b6..c33a611 100644 --- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverPlanService.cs +++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDriverPlanService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddDriverPrepareDriverPlan(Model.DriverPrepare_DriverPlan DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverPlan newDriverData = new Model.DriverPrepare_DriverPlan(); newDriverData.DriverPlanId = DriverPrepareDriverPlan.DriverPlanId; @@ -38,7 +38,7 @@ namespace BLL /// public static void UpdateDriverPrepareDriverPlan(Model.DriverPrepare_DriverPlan DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverPlan newDriverData = db.DriverPrepare_DriverPlan.FirstOrDefault(e => e.DriverPlanId == DriverPrepareDriverPlan.DriverPlanId); if (newDriverData != null) @@ -64,7 +64,7 @@ namespace BLL /// public static void DeleteDriverPlan(string DriverPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_DriverPlan newDriverData = db.DriverPrepare_DriverPlan.FirstOrDefault(e => e.DriverPlanId == DriverPlanId); if (newDriverData != null) diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyService.cs index 44711e6..05078e1 100644 --- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyService.cs +++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareDutyService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddDriverPrepareDriverPlan(Model.DriverPrepare_Duty DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_Duty newDriverData = new Model.DriverPrepare_Duty(); newDriverData.DutyId = DriverPrepareDriverPlan.DutyId; @@ -35,7 +35,7 @@ namespace BLL /// public static void UpdateDriverPrepareDriverPlan(Model.DriverPrepare_Duty DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_Duty newDriverData = db.DriverPrepare_Duty.FirstOrDefault(e => e.DutyId == DriverPrepareDriverPlan.DutyId); if (newDriverData != null) @@ -58,7 +58,7 @@ namespace BLL /// public static void DeleteDriverPlan(string DutyId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_Duty newDriverData = db.DriverPrepare_Duty.FirstOrDefault(e => e.DutyId == DutyId); if (newDriverData != null) diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanService.cs index 63bfcb3..1aa4934 100644 --- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanService.cs +++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddDriverPrepareDriverPlan(Model.DriverPrepare_SchemePlan DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_SchemePlan newDriverData = new Model.DriverPrepare_SchemePlan(); newDriverData.SchemePlanId = DriverPrepareDriverPlan.SchemePlanId; @@ -35,7 +35,7 @@ namespace BLL /// public static void UpdateDriverPrepareDriverPlan(Model.DriverPrepare_SchemePlan DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_SchemePlan newDriverData = db.DriverPrepare_SchemePlan.FirstOrDefault(e => e.SchemePlanId == DriverPrepareDriverPlan.SchemePlanId); if (newDriverData != null) @@ -58,7 +58,7 @@ namespace BLL /// public static void DeleteDriverPlan(string SchemePlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.DriverPrepare_SchemePlan newDriverData = db.DriverPrepare_SchemePlan.FirstOrDefault(e => e.SchemePlanId == SchemePlanId); if (newDriverData != null) diff --git a/SGGL/BLL/TestRun/PersonTrain/DriverPrepareTrainPlanService.cs b/SGGL/BLL/TestRun/PersonTrain/DriverPrepareTrainPlanService.cs index c180b45..beab946 100644 --- a/SGGL/BLL/TestRun/PersonTrain/DriverPrepareTrainPlanService.cs +++ b/SGGL/BLL/TestRun/PersonTrain/DriverPrepareTrainPlanService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void AddDriverPrepareDriverPlan(Model.PersonTrain_TrainPlan DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.PersonTrain_TrainPlan newDriverData = new Model.PersonTrain_TrainPlan(); newDriverData.TrainPlanId = DriverPrepareDriverPlan.TrainPlanId; @@ -36,7 +36,7 @@ namespace BLL /// public static void UpdateDriverPrepareDriverPlan(Model.PersonTrain_TrainPlan DriverPrepareDriverPlan) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.PersonTrain_TrainPlan newDriverData = db.PersonTrain_TrainPlan.FirstOrDefault(e => e.TrainPlanId == DriverPrepareDriverPlan.TrainPlanId); if (newDriverData != null) @@ -60,7 +60,7 @@ namespace BLL /// public static void DeleteDriverPlan(string TrainPlanId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.PersonTrain_TrainPlan newDriverData = db.PersonTrain_TrainPlan.FirstOrDefault(e => e.TrainPlanId == TrainPlanId); if (newDriverData != null) diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs index f3a2342..0d9838f 100644 --- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs @@ -19,7 +19,7 @@ public static string UpMillionsMonthlyReport(string millionsMonthlyReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -156,7 +156,7 @@ public static string UpAccidentCauseReport(string accidentCauseReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -301,7 +301,7 @@ public static string UpSafetyQuarterlyReport(string safetyQuarterlyReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -453,7 +453,7 @@ public static string UpDrillConductedQuarterlyReport(string drillConductedQuarterlyReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -556,7 +556,7 @@ public static string UpDrillPlanHalfYearReport(string drillPlanHalfYearReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -650,7 +650,7 @@ public static string UpChemicalReport(string chemicalReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -761,7 +761,7 @@ public static string UpOperationReport(string businessReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -837,7 +837,7 @@ public static string UpEnergyReport(string energyReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -945,7 +945,7 @@ public static string UpArchitectureReport(string chemicalReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1040,7 +1040,7 @@ public static string UpWorkSummaryReport(string workSummaryReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1132,7 +1132,7 @@ public static string UpQualityWorkSummaryReport(string qualityWorkSummaryReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1223,7 +1223,7 @@ public static string UpSafetyBriefing(string safetyBriefingId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1316,7 +1316,7 @@ public static string UpQuarterlyProjectQuality(string quarterlyProjectQualityId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1422,7 +1422,7 @@ public static string UpEPSummaryReport(string ePSummaryReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1509,7 +1509,7 @@ public static string UpCheckReport(string upCheckReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1601,7 +1601,7 @@ public static string UpCheck_CheckRectify(string checkRectifyId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1682,7 +1682,7 @@ public static string UpSupervise_SubUnitReportItem(string subUnitReportId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1740,7 +1740,7 @@ public static string UpActionWorkLedger(string actionWorkLedgerId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1833,7 +1833,7 @@ public static string UpSafetyProductionEvaluation(string safetyProductionEvaluationId, Model.Sys_User CurrUser) { string code = "0"; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { try { @@ -1929,7 +1929,7 @@ /// public static Model.ResponeData getInformation_UrgeReport() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -1986,7 +1986,7 @@ /// public static Model.ResponeData getCheck_CheckRectify() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2089,7 +2089,7 @@ /// public static Model.ResponeData getCheck_CheckInfo_Table8Item() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2224,7 +2224,7 @@ /// public static Model.ResponeData getSupervise_SubUnitReport() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2313,7 +2313,7 @@ /// public static Model.ResponeData getLaw_LawRegulationList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2389,7 +2389,7 @@ /// public static Model.ResponeData getLaw_HSSEStandardsList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2489,7 +2489,7 @@ /// public static Model.ResponeData getLaw_RulesRegulations() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2565,7 +2565,7 @@ /// public static Model.ResponeData getLaw_ManageRule() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2640,7 +2640,7 @@ /// public static Model.ResponeData getTechnique_HAZOP() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2700,7 +2700,7 @@ /// public static Model.ResponeData getTechnique_Appraise() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2763,7 +2763,7 @@ /// public static Model.ResponeData getTechnique_Emergency() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2838,7 +2838,7 @@ /// public static Model.ResponeData getTechnique_SpecialScheme() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -2912,7 +2912,7 @@ /// public static Model.ResponeData getTraining_TrainingList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -3007,7 +3007,7 @@ /// public static Model.ResponeData getTraining_TrainTestDBList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -3096,7 +3096,7 @@ /// public static Model.ResponeData getEduTrain_AccidentCaseList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -3183,7 +3183,7 @@ /// public static Model.ResponeData getTechnique_HazardList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try @@ -3277,7 +3277,7 @@ /// public static Model.ResponeData getTechnique_RectifyList() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var responeData = new Model.ResponeData(); try diff --git a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs index d37756d..714bf12 100644 --- a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs @@ -11,7 +11,7 @@ namespace BLL { public static class CQMSDataService { - public static SGGLDB db = Funs.DB; + public static CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs index 1ab237a..44be5bf 100644 --- a/SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs @@ -11,7 +11,7 @@ namespace BLL public static class HJGLData_DefectService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs b/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs index 658ee97..6708a07 100644 --- a/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs @@ -11,7 +11,7 @@ namespace BLL { public static class HJGLData_HJGLService { - public static SGGLDB db = Funs.DB; + public static CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs index 5d445c9..a267674 100644 --- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs @@ -10,11 +10,11 @@ namespace BLL { public static class HSSEData_HSSEService { - public static SGGLDB Db = Funs.DB; + public static CNPCDB Db = Funs.DB; public static void AddHSSEData_HSSE(HSSEData_HSSE newtable) { - using (var db = new SGGLDB(Funs.ConnString)) + using (var db = new CNPCDB(Funs.ConnString)) { var table = new HSSEData_HSSE { @@ -104,7 +104,7 @@ namespace BLL public static void DeleteHSSEData_HSSEById(string id) { - using (var db = new SGGLDB(Funs.ConnString)) + using (var db = new CNPCDB(Funs.ConnString)) { var table = db.HSSEData_HSSE.FirstOrDefault(x => x.Id == id); if (table != null) @@ -117,7 +117,7 @@ namespace BLL public static HSSEData_HSSE GetHSSEData_HSSEById(string id) { - using (var db = new SGGLDB(Funs.ConnString)) + using (var db = new CNPCDB(Funs.ConnString)) { return db.HSSEData_HSSE.FirstOrDefault(x => x.Id == id); } @@ -510,7 +510,7 @@ namespace BLL public static void UpdateHSSEData_HSSE(HSSEData_HSSE newtable) { - using (var db = new SGGLDB(Funs.ConnString)) + using (var db = new CNPCDB(Funs.ConnString)) { var table = db.HSSEData_HSSE.FirstOrDefault(x => x.Id == newtable.Id); if (table != null) diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs index 850bf62..e69ddb7 100644 --- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs @@ -11,7 +11,7 @@ namespace BLL public static class HSSEData_HiddenDangerDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs b/SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs index ba6f0ca..50ff0ef 100644 --- a/SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs +++ b/SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs @@ -11,7 +11,7 @@ namespace BLL public static class HazardRealtimedeviceService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs index 010f5df..18e2ed6 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs @@ -13,7 +13,7 @@ namespace BLL public static class Project_CQMSDataService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// CQMS鏁版嵁绫诲瀷 /// diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs index 5cee8ac..a44de35 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs @@ -11,7 +11,7 @@ namespace BLL { public static class Project_HJGLData_DefectService { - public static SGGLDB db = Funs.DB; + public static CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs index 862989e..be86056 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs @@ -14,7 +14,7 @@ namespace BLL public static class Project_HJGLData_HJGLService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// HJGL鏁版嵁绫诲瀷 /// diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs index cb477b3..1a49b37 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs @@ -100,7 +100,7 @@ namespace BLL DangerousProject } - public static SGGLDB db = Funs.DB; + public static CNPCDB db = Funs.DB; /// /// 鏂板瀹炰綋 @@ -108,7 +108,7 @@ namespace BLL /// public static void AddProject_HSSEData_HSSE(Project_HSSEData_HSSE newtable) { - using (var db = new SGGLDB(Funs.ConnString)) + using (var db = new CNPCDB(Funs.ConnString)) { var table = new Project_HSSEData_HSSE { @@ -200,7 +200,7 @@ namespace BLL /// public static void DeleteProject_HSSEData_HSSEById(string Id) { - using (var db = new SGGLDB(Funs.ConnString)) + using (var db = new CNPCDB(Funs.ConnString)) { var table = db.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == Id); if (table != null) @@ -223,7 +223,7 @@ namespace BLL public static List GetProject_HSSEData_HSSEByProjectid(string Projectid) { - using (var db = new SGGLDB(Funs.ConnString)) + using (var db = new CNPCDB(Funs.ConnString)) { var q = (from x in db.Project_HSSEData_HSSE where x.ProjectId == Projectid @@ -234,7 +234,7 @@ namespace BLL public static void UpdateProject_HSSEData_HSSE(Project_HSSEData_HSSE newtable) { - using (var db = new SGGLDB(Funs.ConnString)) + using (var db = new CNPCDB(Funs.ConnString)) { var table = db.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == newtable.Id); if (table != null) @@ -524,7 +524,7 @@ namespace BLL } var base_Unit = BLL.UnitService.GetUnitByUnitId(thisUnitId1); DateTime date = DateTime.Now; - Model.SGGLDB db1 = Funs.DB; + Model.CNPCDB db1 = Funs.DB; var list = from x in db1.HSSE_Hazard_HazardRegister select x; var types = (from x in db1.HSSE_Hazard_HazardRegisterTypes @@ -1224,7 +1224,7 @@ namespace BLL /// public static int GetLicensesNum(string projectid) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var result = (from x in db.License_FireWork where x.ProjectId == projectid @@ -1283,7 +1283,7 @@ namespace BLL /// public static int GetLicensesCloseNum(string projectid) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var result = (from x in db.License_FireWork where x.ProjectId == projectid && x.States== Const.State_3 diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs index 679e20d..4c0d2aa 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs @@ -12,7 +12,7 @@ namespace BLL public static class Project_HSSEData_HiddenDangerDetailService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 @@ -83,7 +83,7 @@ namespace BLL /// public static List GetProject_HSSEData_HiddenDangerDetailByDate(DateTime? reportDate, string projectid) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var q = from x in db.Project_HSSEData_HiddenDangerDetail where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid @@ -93,7 +93,7 @@ namespace BLL } public static void AddProject_HSSEData_HiddenDangerDetail(Model.Project_HSSEData_HiddenDangerDetail newtable) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Project_HSSEData_HiddenDangerDetail table = new Model.Project_HSSEData_HiddenDangerDetail { @@ -117,7 +117,7 @@ namespace BLL } public static void AddBulkProject_HSSEData_HiddenDangerDetails(List newtables) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { db.Project_HSSEData_HiddenDangerDetail.InsertAllOnSubmit(newtables); db.SubmitChanges(); @@ -125,7 +125,7 @@ namespace BLL } public static void UpdateProject_HSSEData_HiddenDangerDetail(Model.Project_HSSEData_HiddenDangerDetail newtable) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Project_HSSEData_HiddenDangerDetail table = db.Project_HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == newtable.Id); @@ -147,7 +147,7 @@ namespace BLL } public static void DeleteProject_HSSEData_HiddenDangerDetailById(string Id) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Project_HSSEData_HiddenDangerDetail table = db.Project_HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == Id); if (table != null) @@ -164,7 +164,7 @@ namespace BLL /// public static void DeleteProject_HSSEData_HiddenDangerDetailByDate(DateTime? reportDate, string projectid) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var table = db.Project_HSSEData_HiddenDangerDetail.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid); @@ -175,7 +175,7 @@ namespace BLL public static void DeleteProject_HSSEData_HiddenDangerDetailByDate(DateTime? reportDate) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var table = db.Project_HSSEData_HiddenDangerDetail.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0); diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs index 189d7ba..e46f3bd 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs @@ -13,7 +13,7 @@ namespace BLL public static class Project_SYHSEData_SYHSEService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 瀹炰笟鏁版嵁绫诲瀷 /// diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs index ad280ff..77f0bfd 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs @@ -13,7 +13,7 @@ namespace BLL public static class SYHSEData_DataService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs index 1c17e77..2de03b4 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs @@ -11,7 +11,7 @@ namespace BLL public static class SyhsedataHiddendangercheckService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs index cf013d6..86e9f9c 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs @@ -11,7 +11,7 @@ namespace BLL public static class SyhsedataRiskcontrolService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs index 31f91a7..06b1705 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs @@ -10,7 +10,7 @@ namespace BLL { public static class SYHSEData_SYHSEService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 @@ -87,7 +87,7 @@ namespace BLL public static List GetSYHSEData_SYHSEByModle(Model.SYHSEData_SYHSE table) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.SYHSEData_SYHSE where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -104,7 +104,7 @@ namespace BLL public static void AddSYHSEData_SYHSE(Model.SYHSEData_SYHSE newtable) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SYHSEData_SYHSE table = new Model.SYHSEData_SYHSE { Id = newtable.Id, @@ -156,7 +156,7 @@ namespace BLL public static void DeleteSYHSEData_SYHSEById(string Id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SYHSEData_SYHSE table = db.SYHSEData_SYHSE.FirstOrDefault(x => x.Id == Id); if (table != null) { @@ -273,7 +273,7 @@ namespace BLL public static Model.SYHSEData_SYHSE GetSYHSEData_SYHSEById(string Id) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.SYHSEData_SYHSE.FirstOrDefault(x => x.Id == Id); } @@ -424,7 +424,7 @@ namespace BLL } public static void UpdateSYHSEData_SYHSE(Model.SYHSEData_SYHSE newtable) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SYHSEData_SYHSE table = db.SYHSEData_SYHSE.FirstOrDefault(x => x.Id == newtable.Id); if (table != null) { diff --git a/SGGL/BLL/ZHGL/Emergency/UnitDrillRecordListService.cs b/SGGL/BLL/ZHGL/Emergency/UnitDrillRecordListService.cs index 47545cb..fec5a28 100644 --- a/SGGL/BLL/ZHGL/Emergency/UnitDrillRecordListService.cs +++ b/SGGL/BLL/ZHGL/Emergency/UnitDrillRecordListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class UnitDrillRecordListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ユ紨缁 @@ -75,7 +75,7 @@ namespace BLL /// public static void AddDrillRecordList(Model.Emergency_DrillRecordList_Unit DrillRecordList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_DrillRecordList_Unit newDrillRecordList = new Model.Emergency_DrillRecordList_Unit { DrillRecordListId = DrillRecordList.DrillRecordListId, @@ -108,7 +108,7 @@ namespace BLL /// public static void UpdateDrillRecordList(Model.Emergency_DrillRecordList_Unit DrillRecordList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_DrillRecordList_Unit newDrillRecordList = db.Emergency_DrillRecordList_Unit.FirstOrDefault(e => e.DrillRecordListId == DrillRecordList.DrillRecordListId); if (newDrillRecordList != null) { @@ -137,7 +137,7 @@ namespace BLL /// public static void DeleteDrillRecordListById(string DrillRecordListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_DrillRecordList_Unit DrillRecordList = db.Emergency_DrillRecordList_Unit.FirstOrDefault(e => e.DrillRecordListId == DrillRecordListId); if (DrillRecordList != null) { diff --git a/SGGL/BLL/ZHGL/Emergency/UnitEmergencyListService.cs b/SGGL/BLL/ZHGL/Emergency/UnitEmergencyListService.cs index 955669a..bd615ac 100644 --- a/SGGL/BLL/ZHGL/Emergency/UnitEmergencyListService.cs +++ b/SGGL/BLL/ZHGL/Emergency/UnitEmergencyListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class UnitEmergencyListService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇搴旀ラ妗堢鐞 @@ -42,7 +42,7 @@ namespace BLL /// 搴旀ラ妗堝疄浣撻泦鍚 public static List GetEmergencyListsByEmergencyType(string emergencyType, string projectId, DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Emergency_EmergencyList_Unit join y in db.Base_EmergencyType @@ -60,7 +60,7 @@ namespace BLL /// 鍏朵粬搴旀ラ妗堝疄浣撻泦鍚 public static List GetOtherEmergencyListsByEmergencyType(string emergencyType, string projectId, DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { return (from x in db.Emergency_EmergencyList_Unit join y in db.Base_EmergencyType @@ -76,7 +76,7 @@ namespace BLL /// public static void AddEmergencyList(Model.Emergency_EmergencyList_Unit EmergencyList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyList_Unit newEmergencyList = new Model.Emergency_EmergencyList_Unit { EmergencyListId = EmergencyList.EmergencyListId, @@ -106,7 +106,7 @@ namespace BLL /// public static void UpdateEmergencyList(Model.Emergency_EmergencyList_Unit EmergencyList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyList_Unit newEmergencyList = db.Emergency_EmergencyList_Unit.FirstOrDefault(e => e.EmergencyListId == EmergencyList.EmergencyListId); if (newEmergencyList != null) { @@ -132,7 +132,7 @@ namespace BLL /// public static void DeleteEmergencyListById(string EmergencyListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Emergency_EmergencyList_Unit EmergencyList = db.Emergency_EmergencyList_Unit.FirstOrDefault(e => e.EmergencyListId == EmergencyListId); if (EmergencyList != null) { diff --git a/SGGL/BLL/ZHGL/Environmental/EnergyReportService.cs b/SGGL/BLL/ZHGL/Environmental/EnergyReportService.cs index 24554f6..efac431 100644 --- a/SGGL/BLL/ZHGL/Environmental/EnergyReportService.cs +++ b/SGGL/BLL/ZHGL/Environmental/EnergyReportService.cs @@ -11,7 +11,7 @@ namespace BLL public static class EnergyReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 @@ -142,7 +142,7 @@ namespace BLL } public static void DeleteEnvironmental_EnergyReportById(string EnergyReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Environmental_EnergyReport table = db.Environmental_EnergyReport.FirstOrDefault(x => x.EnergyReportId == EnergyReportId); if (table != null) { diff --git a/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs b/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs index faf399b..8410b9b 100644 --- a/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs +++ b/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs @@ -11,7 +11,7 @@ namespace BLL public static class EnergyreportItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 @@ -269,7 +269,7 @@ namespace BLL } public static void DeleteEnergyReportItemByChemicalReportId(string EnergyReportId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in Funs.DB.Environmental_EnergyReportItem where x.EnergyReportId == EnergyReportId select x; if (q != null) { diff --git a/SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs b/SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs index 2c423ba..e8f2d5a 100644 --- a/SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs +++ b/SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs @@ -12,7 +12,7 @@ namespace BLL public static class ProjectEnergyReportService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs b/SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs index 4fa85ed..5be2312 100644 --- a/SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs +++ b/SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs @@ -11,7 +11,7 @@ namespace BLL public static class ProjectEnergyreportItemService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/Information/Information_EnvironmentaldataService.cs b/SGGL/BLL/ZHGL/Information/Information_EnvironmentaldataService.cs index 872055c..ebe6e87 100644 --- a/SGGL/BLL/ZHGL/Information/Information_EnvironmentaldataService.cs +++ b/SGGL/BLL/ZHGL/Information/Information_EnvironmentaldataService.cs @@ -11,7 +11,7 @@ namespace BLL public static class Information_EnvironmentalDataService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/Meeting/CompanySafetyMeetingService.cs b/SGGL/BLL/ZHGL/Meeting/CompanySafetyMeetingService.cs index 002877c..6977730 100644 --- a/SGGL/BLL/ZHGL/Meeting/CompanySafetyMeetingService.cs +++ b/SGGL/BLL/ZHGL/Meeting/CompanySafetyMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class CompanySafetyMeetingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浼佷笟瀹夊浼 @@ -68,7 +68,7 @@ namespace BLL /// public static void AddCompanySafetyMeeting(Model.Meeting_CompanySafetyMeeting CompanySafetyMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_CompanySafetyMeeting newCompanySafetyMeeting = new Model.Meeting_CompanySafetyMeeting { CompanySafetyMeetingId = CompanySafetyMeeting.CompanySafetyMeetingId, @@ -99,7 +99,7 @@ namespace BLL /// public static void UpdateCompanySafetyMeeting(Model.Meeting_CompanySafetyMeeting CompanySafetyMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_CompanySafetyMeeting newCompanySafetyMeeting = db.Meeting_CompanySafetyMeeting.FirstOrDefault(e => e.CompanySafetyMeetingId == CompanySafetyMeeting.CompanySafetyMeetingId); if (newCompanySafetyMeeting != null) { @@ -127,7 +127,7 @@ namespace BLL /// public static void DeleteCompanySafetyMeetingById(string CompanySafetyMeetingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_CompanySafetyMeeting CompanySafetyMeeting = db.Meeting_CompanySafetyMeeting.FirstOrDefault(e => e.CompanySafetyMeetingId == CompanySafetyMeetingId); if (CompanySafetyMeeting != null) { diff --git a/SGGL/BLL/ZHGL/Meeting/CompanySpecialMeetingService.cs b/SGGL/BLL/ZHGL/Meeting/CompanySpecialMeetingService.cs index 1e8886e..7949e79 100644 --- a/SGGL/BLL/ZHGL/Meeting/CompanySpecialMeetingService.cs +++ b/SGGL/BLL/ZHGL/Meeting/CompanySpecialMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class CompanySpecialMeetingService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇浼佷笟涓撻浼 @@ -68,7 +68,7 @@ namespace BLL /// public static void AddCompanySpecialMeeting(Model.Meeting_CompanySpecialMeeting CompanySpecialMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_CompanySpecialMeeting newCompanySpecialMeeting = new Model.Meeting_CompanySpecialMeeting { CompanySpecialMeetingId = CompanySpecialMeeting.CompanySpecialMeetingId, @@ -99,7 +99,7 @@ namespace BLL /// public static void UpdateCompanySpecialMeeting(Model.Meeting_CompanySpecialMeeting CompanySpecialMeeting) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_CompanySpecialMeeting newCompanySpecialMeeting = db.Meeting_CompanySpecialMeeting.FirstOrDefault(e => e.CompanySpecialMeetingId == CompanySpecialMeeting.CompanySpecialMeetingId); if (newCompanySpecialMeeting != null) { @@ -127,7 +127,7 @@ namespace BLL /// public static void DeleteCompanySpecialMeetingById(string CompanySpecialMeetingId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Meeting_CompanySpecialMeeting CompanySpecialMeeting = db.Meeting_CompanySpecialMeeting.FirstOrDefault(e => e.CompanySpecialMeetingId == CompanySpecialMeetingId); if (CompanySpecialMeeting != null) { diff --git a/SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs b/SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs index 06b326b..c707098 100644 --- a/SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs +++ b/SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class CompanyBranchPersonService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍏徃鍒嗘敮鏈烘瀯浜哄憳 @@ -40,7 +40,7 @@ namespace BLL /// public static void AddCompanyBranchPerson(Model.Person_CompanyBranchPerson CompanyBranchPerson) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_CompanyBranchPerson newCompanyBranchPerson = new Model.Person_CompanyBranchPerson { CompanyBranchPersonId = CompanyBranchPerson.CompanyBranchPersonId, @@ -64,7 +64,7 @@ namespace BLL /// public static void UpdateCompanyBranchPerson(Model.Person_CompanyBranchPerson CompanyBranchPerson) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_CompanyBranchPerson newCompanyBranchPerson = db.Person_CompanyBranchPerson.FirstOrDefault(e => e.CompanyBranchPersonId == CompanyBranchPerson.CompanyBranchPersonId); if (newCompanyBranchPerson != null) { @@ -87,7 +87,7 @@ namespace BLL /// public static void DeleteCompanyBranchPersonById(string CompanyBranchPersonId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Person_CompanyBranchPerson CompanyBranchPerson = db.Person_CompanyBranchPerson.FirstOrDefault(e => e.CompanyBranchPersonId == CompanyBranchPersonId); if (CompanyBranchPerson != null) { diff --git a/SGGL/BLL/ZHGL/Question/QuestionService.cs b/SGGL/BLL/ZHGL/Question/QuestionService.cs index e1984a7..6b5c2b7 100644 --- a/SGGL/BLL/ZHGL/Question/QuestionService.cs +++ b/SGGL/BLL/ZHGL/Question/QuestionService.cs @@ -11,13 +11,13 @@ namespace BLL.ZHGL.Question public static Model.Question_QuestionDB getQuestionDBById(string questionDBId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.Question_QuestionDB.FirstOrDefault(e => e.QuestionDBId == questionDBId); } public static void AddQuestionDB(Model.Question_QuestionDB TestTraining) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Question_QuestionDB newTestTraining = new Model.Question_QuestionDB { QuestionDBId = TestTraining.QuestionDBId, @@ -31,7 +31,7 @@ namespace BLL.ZHGL.Question } public static void UpdateQuestionDB(Model.Question_QuestionDB TestTraining) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Question_QuestionDB newTestTraining = db.Question_QuestionDB.FirstOrDefault(e => e.QuestionDBId == TestTraining.QuestionDBId); if (newTestTraining != null) { @@ -45,14 +45,14 @@ namespace BLL.ZHGL.Question } public static Model.Question_QuestionDBItem getQuestionDBItemById(string questionItemDBId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; return db.Question_QuestionDBItem.FirstOrDefault(e => e.QuestionDBItemId == questionItemDBId); } public static void AddQuestionDBItem(Model.Question_QuestionDBItem TestTrainingItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Question_QuestionDBItem newTestTrainingItem = new Model.Question_QuestionDBItem { QuestionDBItemId = TestTrainingItem.QuestionDBItemId, @@ -75,7 +75,7 @@ namespace BLL.ZHGL.Question } public static void UpdateQuestionDBItem(Model.Question_QuestionDBItem TestTrainingItem) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Question_QuestionDBItem newTestTrainingItem = db.Question_QuestionDBItem.FirstOrDefault(e => e.QuestionDBItemId == TestTrainingItem.QuestionDBItemId); if (newTestTrainingItem != null) { @@ -100,7 +100,7 @@ namespace BLL.ZHGL.Question /// public static void DeleteQuestionDBById(string questionDBId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Question_QuestionDB questionDB = db.Question_QuestionDB.FirstOrDefault(e => e.QuestionDBId == questionDBId); if (questionDB != null) { @@ -116,7 +116,7 @@ namespace BLL.ZHGL.Question } public static void DeleteQuestionDBItemById(string questionDBItemId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.Question_QuestionDBItem QuestionDBItem = db.Question_QuestionDBItem.FirstOrDefault(e => e.QuestionDBItemId == questionDBItemId); if (QuestionDBItem != null) { diff --git a/SGGL/BLL/ZHGL/RealName/BasicDataService.cs b/SGGL/BLL/ZHGL/RealName/BasicDataService.cs index 5d18f0b..6d279d0 100644 --- a/SGGL/BLL/ZHGL/RealName/BasicDataService.cs +++ b/SGGL/BLL/ZHGL/RealName/BasicDataService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class BasicDataService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇瀛楀吀淇℃伅 @@ -27,7 +27,7 @@ namespace BLL /// public static void AddBasicData(Model.RealName_BasicData basicData) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.RealName_BasicData newBasicData = new Model.RealName_BasicData { BasicDataId = basicData.BasicDataId, @@ -45,7 +45,7 @@ namespace BLL /// public static void UpdateBasicData(Model.RealName_BasicData basicData) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.RealName_BasicData newBasicData = db.RealName_BasicData.FirstOrDefault(e => e.BasicDataId == basicData.BasicDataId); if (newBasicData != null) { @@ -62,7 +62,7 @@ namespace BLL /// public static void DeleteBasicDataById(string basicDataId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.RealName_BasicData basicData = db.RealName_BasicData.FirstOrDefault(e => e.BasicDataId == basicDataId); if (basicData != null) { diff --git a/SGGL/BLL/ZHGL/RealName/CityService.cs b/SGGL/BLL/ZHGL/RealName/CityService.cs index b23696f..86fc8b5 100644 --- a/SGGL/BLL/ZHGL/RealName/CityService.cs +++ b/SGGL/BLL/ZHGL/RealName/CityService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class CityService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍥藉淇℃伅 @@ -26,7 +26,7 @@ namespace BLL /// public static void AddCity(Model.RealName_City city) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.RealName_City newCity = new Model.RealName_City { ID = city.ID, @@ -47,7 +47,7 @@ namespace BLL /// public static void UpdateCity(Model.RealName_City city) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.RealName_City newCity = db.RealName_City.FirstOrDefault(e => e.ID == city.ID); if (newCity != null) { @@ -67,7 +67,7 @@ namespace BLL /// public static void DeleteCityById(string cityId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.RealName_City city = db.RealName_City.FirstOrDefault(e => e.ID == cityId); if (city != null) { diff --git a/SGGL/BLL/ZHGL/RealName/CountryService.cs b/SGGL/BLL/ZHGL/RealName/CountryService.cs index 06b3f01..c9fe017 100644 --- a/SGGL/BLL/ZHGL/RealName/CountryService.cs +++ b/SGGL/BLL/ZHGL/RealName/CountryService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class CountryService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// 鏍规嵁涓婚敭鑾峰彇鍥藉淇℃伅 diff --git a/SGGL/BLL/ZHGL/RealName/OnPostService.cs b/SGGL/BLL/ZHGL/RealName/OnPostService.cs index 97c46c5..75b62e7 100644 --- a/SGGL/BLL/ZHGL/RealName/OnPostService.cs +++ b/SGGL/BLL/ZHGL/RealName/OnPostService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class OnPostService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; #region 鑾峰彇鍒楄〃 /// diff --git a/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs b/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs index 6e5e350..332f9a6 100644 --- a/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs +++ b/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class RealName_ProjectService { - public static Model.SGGLDB db = Funs.DB; + public static Model.CNPCDB db = Funs.DB; /// /// diff --git a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs index e443ebe..1d113e7 100644 --- a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs +++ b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs @@ -84,7 +84,7 @@ namespace BLL /// public static void SaveSynchroSet(Model.RealName_SynchroSet SynchroSet) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getSynchroSet = db.RealName_SynchroSet.FirstOrDefault(e => e.UnitId == SynchroSet.UnitId && e.ProCode == SynchroSet.ProCode); if (getSynchroSet != null) @@ -118,7 +118,7 @@ namespace BLL /// public static void DeleteSynchroSetById(string SynchroSetId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.RealName_SynchroSet SynchroSet = db.RealName_SynchroSet.FirstOrDefault(e => e.SynchroSetId == SynchroSetId); if (SynchroSet != null) { @@ -133,7 +133,7 @@ namespace BLL /// public static void DeleteSynchroSetByUnitId(string unitId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.RealName_SynchroSet SynchroSet = db.RealName_SynchroSet.FirstOrDefault(e => e.UnitId == unitId); if (SynchroSet != null) { @@ -247,7 +247,7 @@ namespace BLL /// public static void InsertRealNamePushLog(string ProjectId, string JTProjectCode, string PushType, string Success, string Code, string Message, string ReturnData, string PushContent) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.RealName_PushLog newLog = new Model.RealName_PushLog { @@ -278,7 +278,7 @@ namespace BLL { try { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string mess = string.Empty; string sucess = string.Empty; string code = string.Empty; @@ -371,7 +371,7 @@ namespace BLL /// public static string getCountry() { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string mess = string.Empty; string sucess = string.Empty; string code = string.Empty; @@ -438,7 +438,7 @@ namespace BLL /// public static string getCity(string countryId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string mess = string.Empty; string sucess = string.Empty; string code = string.Empty; @@ -612,7 +612,7 @@ namespace BLL sucess = obj["success"].ToString(); if (Convert.ToBoolean(obj["success"].ToString())) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { data = obj["data"].ToString(); JArray arr = JArray.Parse(data); @@ -694,7 +694,7 @@ namespace BLL /// public static string PushCollCompany() { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string mess = string.Empty; string sucess = string.Empty; string code = string.Empty; @@ -753,7 +753,7 @@ namespace BLL /// public static string PushProCollCompany(string proCode) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string mess = string.Empty; string sucess = string.Empty; string code = string.Empty; @@ -845,7 +845,7 @@ namespace BLL /// public static void PushCollCompany(List unitIdLists, Hashtable newToken) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; string mess = string.Empty; string sucess = string.Empty; string code = string.Empty; @@ -949,7 +949,7 @@ namespace BLL data = obj["data"].ToString(); if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in getCollTeam) { @@ -1078,7 +1078,7 @@ namespace BLL data = obj["data"].ToString(); if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in getData) { @@ -1209,7 +1209,7 @@ namespace BLL data = obj["data"].ToString(); if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in getData) { @@ -1241,7 +1241,7 @@ namespace BLL InsertRealNamePushLog(null, proCode, "鎺ㄩ佷汉鍛樻暟鎹", sucess, code, mess, data, pushContent); if (data.Contains("宸插瓨鍦") || mess.Contains("宸插瓨鍦")) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in getData) { @@ -1348,7 +1348,7 @@ namespace BLL data = obj["data"].ToString(); if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { foreach (var item in getData) { @@ -1377,7 +1377,7 @@ namespace BLL { if (data.Contains(item.idcardNumber) || mess.Contains(item.idcardNumber)) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPersonInOutNow = db.RealName_PersonInOutNow.FirstOrDefault(x => x.IdcardNumber == item.idcardNumber); if (getPersonInOutNow != null) @@ -1422,7 +1422,7 @@ namespace BLL JObject obj = JObject.Parse(returndata); if (Convert.ToBoolean(obj["success"].ToString())) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { JArray arr = JArray.Parse(obj["data"].ToString()); foreach (var item in arr) @@ -1508,7 +1508,7 @@ namespace BLL /// public static void addPerson(List personList, Hashtable newToken) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getData = (from x in db.SitePerson_Person join y in db.Base_Project on x.ProjectId equals y.ProjectId diff --git a/SGGL/BLL/ZHGL/SubPackManage/BaseBranchTeamListService.cs b/SGGL/BLL/ZHGL/SubPackManage/BaseBranchTeamListService.cs index 7ba9e29..2dd441f 100644 --- a/SGGL/BLL/ZHGL/SubPackManage/BaseBranchTeamListService.cs +++ b/SGGL/BLL/ZHGL/SubPackManage/BaseBranchTeamListService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void DropSelectUnitWork(FineUIPro.DropDownList dropName, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.Base_Unit select new { @@ -35,7 +35,7 @@ namespace BLL /// 涓嬪睘鍔冲姟闃熶紞淇℃伅 public static void AddBaseBranchTeamList(Model.Base_BranchTeamList baseBranchTeamList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.Base_BranchTeamList.InsertOnSubmit(baseBranchTeamList); db.SubmitChanges(); } @@ -46,7 +46,7 @@ namespace BLL /// 涓嬪睘鍔冲姟闃熶紞淇℃伅鍒楄〃 public static void AddBaseBranchTeamList(List baseBranchTeamLists) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.Base_BranchTeamList.InsertAllOnSubmit(baseBranchTeamLists); db.SubmitChanges(); } @@ -57,7 +57,7 @@ namespace BLL /// 鍔冲姟鐝粍淇℃伅 public static void UpdateBaseBranchTeamList(Model.Base_BranchTeamList baseBranchTeamList) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.Base_BranchTeamList.FirstOrDefault(p => p.BranchTeamListId == baseBranchTeamList.BranchTeamListId); updateItem.UnitId = baseBranchTeamList.UnitId; updateItem.BranchTeamListId = baseBranchTeamList.BranchTeamListId; @@ -81,7 +81,7 @@ namespace BLL /// 涓昏〃涓婚敭 public static void DeleteBaseBranchList(string branchTeamListId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.Base_BranchTeamList.FirstOrDefault(p => p.BranchTeamListId == branchTeamListId); //鍒犻櫎涓昏〃 db.Base_BranchTeamList.DeleteOnSubmit(deleteItem); diff --git a/SGGL/BLL/ZHGL/SubPackManage/BaseBranchTeamListTeamService.cs b/SGGL/BLL/ZHGL/SubPackManage/BaseBranchTeamListTeamService.cs index 790a9a3..2c339a0 100644 --- a/SGGL/BLL/ZHGL/SubPackManage/BaseBranchTeamListTeamService.cs +++ b/SGGL/BLL/ZHGL/SubPackManage/BaseBranchTeamListTeamService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static void DropSelectUnitWork(FineUIPro.DropDownList dropName, string projectid, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.Base_Unit join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId where y.UnitType == "2" && y.ProjectId == projectid @@ -34,7 +34,7 @@ namespace BLL /// public static void DropSelectTeamWork(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.Base_BranchTeamList where (x.UnitId == unitId || unitId == null) && (x.State == null || x.State == "" || x.State == "0") select new @@ -55,7 +55,7 @@ namespace BLL /// public static void DropSelectTeamWorkUpdate(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.Base_BranchTeamList where (x.UnitId == unitId || unitId == null) select new @@ -79,7 +79,7 @@ namespace BLL /// 鍔冲姟鐝粍淇℃伅 public static void AddBaseBranchTeamListTeam(Model.Base_BranchTeamListTeam baseBranchTeamListTeam) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.Base_BranchTeamListTeam.InsertOnSubmit(baseBranchTeamListTeam); db.SubmitChanges(); } @@ -90,7 +90,7 @@ namespace BLL /// 鍔冲姟鐝粍淇℃伅鍒楄〃 public static void AddBaseBranchTeamListTeam(List baseBranchTeamListTeams) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.Base_BranchTeamListTeam.InsertAllOnSubmit(baseBranchTeamListTeams); db.SubmitChanges(); } @@ -101,7 +101,7 @@ namespace BLL /// 鍔冲姟鐝粍淇℃伅 public static void UpdateBaseBranchTeamListTeam(Model.Base_BranchTeamListTeam baseBranchTeamListTeam) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.Base_BranchTeamListTeam.FirstOrDefault(p => p.BranchTeamListTeamId == baseBranchTeamListTeam.BranchTeamListTeamId); updateItem.UnitId = baseBranchTeamListTeam.UnitId; updateItem.BranchTeamListId = baseBranchTeamListTeam.BranchTeamListId; @@ -117,7 +117,7 @@ namespace BLL /// 涓昏〃涓婚敭 public static void DeleteBaseBranchTeamListTeam(string branchTeamListTeamId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.Base_BranchTeamListTeam.FirstOrDefault(p => p.BranchTeamListTeamId == branchTeamListTeamId); //鍒犻櫎涓昏〃 db.Base_BranchTeamListTeam.DeleteOnSubmit(deleteItem); diff --git a/SGGL/BLL/ZHGL/SubPackManage/BaseSubPackPersonnelService.cs b/SGGL/BLL/ZHGL/SubPackManage/BaseSubPackPersonnelService.cs index 6ccf394..d3c8ecf 100644 --- a/SGGL/BLL/ZHGL/SubPackManage/BaseSubPackPersonnelService.cs +++ b/SGGL/BLL/ZHGL/SubPackManage/BaseSubPackPersonnelService.cs @@ -14,7 +14,7 @@ namespace BLL /// public static void DropSelectTeam(FineUIPro.DropDownList dropName, string unitId, string branchTeamListId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.Base_BranchTeamListTeam where (x.UnitId == unitId || unitId == null) && (x.BranchTeamListId == branchTeamListId || branchTeamListId == null) && (x.State == null || x.State == "" || x.State == "0") select new @@ -34,7 +34,7 @@ namespace BLL /// public static void DropSelectTeamUpdate(FineUIPro.DropDownList dropName, string unitId, string branchTeamListId, bool isShowPlease) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var unitWorkList = (from x in db.Base_BranchTeamListTeam where (x.UnitId == unitId || unitId == null) && (x.BranchTeamListId == branchTeamListId || branchTeamListId == null) select new @@ -55,7 +55,7 @@ namespace BLL /// 鍔冲姟浜哄憳淇℃伅 public static void AddBaseSubPackPersonnel(Model.Base_SubPackPersonnel baseSubPackPersonnel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.Base_SubPackPersonnel.InsertOnSubmit(baseSubPackPersonnel); db.SubmitChanges(); } @@ -66,7 +66,7 @@ namespace BLL /// 鍔冲姟浜哄憳淇℃伅鍒楄〃 public static void AddBaseSubPackPersonnel(List baseSubPackPersonnels) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; db.Base_SubPackPersonnel.InsertAllOnSubmit(baseSubPackPersonnels); db.SubmitChanges(); } @@ -77,7 +77,7 @@ namespace BLL /// 鍔冲姟浜哄憳淇℃伅 public static void UpdateBaseSubPackPersonnel(Model.Base_SubPackPersonnel baseSubPackPersonnel) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var updateItem = db.Base_SubPackPersonnel.FirstOrDefault(p => p.SubPackPersonnelID == baseSubPackPersonnel.SubPackPersonnelID); updateItem.PersonName = baseSubPackPersonnel.PersonName; updateItem.IdentityCard = baseSubPackPersonnel.IdentityCard; @@ -97,7 +97,7 @@ namespace BLL /// 涓昏〃涓婚敭 public static void DeleteBaseSubPackPersonnel(string subPackPersonnelID) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var deleteItem = db.Base_SubPackPersonnel.FirstOrDefault(p => p.SubPackPersonnelID == subPackPersonnelID); //鍒犻櫎涓昏〃 db.Base_SubPackPersonnel.DeleteOnSubmit(deleteItem); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs index adf4645..af160dc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs @@ -1092,7 +1092,7 @@ namespace FineUIPro.Web.CQMS.Check drpHandleMan.Items.Clear(); if (!string.IsNullOrEmpty(drpHandleType.SelectedText)) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; if (drpHandleType.SelectedText.Contains("鎬诲寘")) { UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, string.Empty); diff --git a/SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs index 7ce096b..812e608 100644 --- a/SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs @@ -343,7 +343,7 @@ namespace FineUIPro.Web.CQMS.ConstructionLog { workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); } - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var projects = from x in db.Base_Project select x; var lists = from x in db.CQMS_ConstructionLogItem where x.ConstructionLogId == constructionLogId select x; // 鍒涘缓鍗曞厓鏍兼牱寮 diff --git a/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs index 3d0b943..c8cacc2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs @@ -1096,7 +1096,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trOne.Nodes.Add(rootNode); trOne.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1127,7 +1127,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trTwo.Nodes.Add(rootNode); trTwo.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1178,7 +1178,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trThree.Nodes.Add(rootNode); trThree.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1208,7 +1208,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trFour.Nodes.Add(rootNode); trFour.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1239,7 +1239,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trFive.Nodes.Add(rootNode); trFive.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1270,7 +1270,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trSixe.Nodes.Add(rootNode); trSixe.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1300,7 +1300,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trSeven.Nodes.Add(rootNode); trSeven.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1330,7 +1330,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trEight.Nodes.Add(rootNode); trEight.EnableCheckBox = true; - //using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + //using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) //{ // var userList = from x in db.Sys_User // join y in db.Project_ProjectUnit diff --git a/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationView.aspx.cs index bc20f22..0864a95 100644 --- a/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationView.aspx.cs @@ -284,7 +284,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trOne.Nodes.Add(rootNode); trOne.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -315,7 +315,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trTwo.Nodes.Add(rootNode); trTwo.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -366,7 +366,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trThree.Nodes.Add(rootNode); trThree.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -396,7 +396,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trFour.Nodes.Add(rootNode); trFour.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -427,7 +427,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trFive.Nodes.Add(rootNode); trFive.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -458,7 +458,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trSixe.Nodes.Add(rootNode); trSixe.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -488,7 +488,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trSeven.Nodes.Add(rootNode); trSeven.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -518,7 +518,7 @@ namespace FineUIPro.Web.CQMS.Information rootNode.EnableCheckEvent = true; trEight.Nodes.Add(rootNode); trEight.EnableCheckBox = true; - //using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + //using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) //{ // var userList = from x in db.Sys_User // join y in db.Project_ProjectUnit diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs index ef5b84d..d68cf61 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs @@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trOne.Nodes.Add(rootNode); trOne.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -201,7 +201,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trTwo.Nodes.Add(rootNode); trTwo.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -252,7 +252,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trThree.Nodes.Add(rootNode); trThree.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -282,7 +282,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trFour.Nodes.Add(rootNode); trFour.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -313,7 +313,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trFive.Nodes.Add(rootNode); trFive.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -344,7 +344,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trSixe.Nodes.Add(rootNode); trSixe.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs index 5a2de70..97acd7d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs @@ -1082,7 +1082,7 @@ namespace FineUIPro.Web.CQMS.Solution private void initDropSameGroup(DropDownList drop , string type) { List users = new List(); - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { switch (type) { @@ -1177,7 +1177,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trOne.Nodes.Add(rootNode); trOne.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1208,7 +1208,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trTwo.Nodes.Add(rootNode); trTwo.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1259,7 +1259,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trThree.Nodes.Add(rootNode); trThree.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1289,7 +1289,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trFour.Nodes.Add(rootNode); trFour.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1320,7 +1320,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trFive.Nodes.Add(rootNode); trFive.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1351,7 +1351,7 @@ namespace FineUIPro.Web.CQMS.Solution rootNode.EnableCheckEvent = true; trSixe.Nodes.Add(rootNode); trSixe.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs index 47ca9c5..bf12c32 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs @@ -70,7 +70,7 @@ namespace FineUIPro.Web.CQMS.WBS /// protected void btnOut_Click(object sender, EventArgs e) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var cNProfessionals = from x in db.Base_CNProfessional select x; var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; var divisionProjects = (from x in db.WBS_DivisionProject where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); @@ -519,7 +519,7 @@ namespace FineUIPro.Web.CQMS.WBS ir = pds.Rows.Count; if (pds != null && ir > 0) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var oldViewInfos = from x in db.WBS_BreakdownProject where x.ProjectId == this.CurrUser.LoginProjectId select x; diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 8d7f62e..d7d6bec 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -301,6 +301,7 @@ + @@ -8023,6 +8024,13 @@ mainMenu_HJGL2.aspx + + mainMenu_Staff.aspx + ASPXCodeBehind + + + mainMenu_Staff.aspx + mainMenu_HSSE2.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/Global.asax.cs b/SGGL/FineUIPro.Web/Global.asax.cs index 2638b1d..645f97b 100644 --- a/SGGL/FineUIPro.Web/Global.asax.cs +++ b/SGGL/FineUIPro.Web/Global.asax.cs @@ -96,7 +96,7 @@ { StringBuilder errLog = null; Exception ex = null; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Sys_ErrLogInfo newErr = new Sys_ErrLogInfo { diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegist.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegist.aspx.cs index e7abfb8..82e7dce 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegist.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegist.aspx.cs @@ -144,7 +144,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage foreach (int rowIndex in Grid1.SelectedRowIndexArray) { string EMaterialRegistId = Grid1.DataKeys[rowIndex][0].ToString(); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_EMaterialRegist eMaterialRegist = db.HJGL_EMaterialRegist.First(e => e.EMaterialRegistId == EMaterialRegistId); //BLL.HJGL_EMaterialRegistService.DeleteEMaterialRegistItem(this.CurrUser.LoginProjectId, eMaterialRegist.Unit, EMaterialRegistId); BLL.HJGL_EMInventoryRecordsService.UpdateEMInventoryRecords(this.CurrUser.LoginProjectId, eMaterialRegist.Unit, eMaterialRegist.WMT_ID, "", "", -decimal.Parse(eMaterialRegist.Amount)); diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialStatic.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialStatic.aspx.cs index bca674d..10b318e 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialStatic.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialStatic.aspx.cs @@ -139,7 +139,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage { string EMaterialRegistId = Grid1.DataKeys[rowIndex][0].ToString(); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_EMaterialRegist eMaterialRegist = db.HJGL_EMaterialRegist.First(e => e.EMaterialRegistId == EMaterialRegistId); diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs index 24ab25f..d01b148 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs @@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage foreach (int rowIndex in Grid1.SelectedRowIndexArray) { string ElectrodeRecoveryId = Grid1.DataKeys[rowIndex][0].ToString(); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.HJGL_ElectrodeRecovery electrodeRecovery = db.HJGL_ElectrodeRecovery.First(e => e.ElectrodeRecoveryId == ElectrodeRecoveryId); BLL.HJGL_ElectrodeRecoveryService.DeleteElectrodeRecoveryItem(this.CurrUser.LoginProjectId, electrodeRecovery.UnitId, ElectrodeRecoveryId); db.HJGL_ElectrodeRecovery.DeleteOnSubmit(electrodeRecovery); diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/ShowJointInfoView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/ShowJointInfoView.aspx.cs index 8345d87..072bc63 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/ShowJointInfoView.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/ShowJointInfoView.aspx.cs @@ -101,7 +101,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage string date = string.Empty; if (JOT_ID != null) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var ProessDate = (from x in db.HJGL_HotProess_Report where x.WeldJointId == JOT_ID.ToString() && x.ProessDate != null select x.ProessDate).FirstOrDefault(); if (ProessDate != null) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs index 6f0a1e4..3e8fa04 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs @@ -1958,7 +1958,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage bool b = true; if (ISO_ID != null) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var jointIds = (from x in db.PW_JointInfo where x.ISO_ID == ISO_ID.ToString() && x.IS_Proess == "1" select x.JOT_ID).ToList(); var notCompletedviews = from x in db.View_HJGL_HotProess_TrustItem where x.ProjectId == this.CurrUser.LoginProjectId && jointIds.Contains(x.WeldJointId) && x.IsCompleted != "瀹屾垚" select x; if (notCompletedviews.Count() > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanView.aspx.cs index 9d9df07..8fb247f 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanView.aspx.cs @@ -14,7 +14,7 @@ namespace FineUIPro.Web.HSSE.EduTrain /// protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestPlanView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestPlanView.aspx.cs index e78baaa..475c41a 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestPlanView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestPlanView.aspx.cs @@ -15,7 +15,7 @@ namespace FineUIPro.Web.EduTrain /// protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs index 263c460..5d6bf83 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs @@ -43,7 +43,7 @@ namespace FineUIPro.Web.HSSE.EduTrain protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { diff --git a/SGGL/FineUIPro.Web/HSSE/Epidemic/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Epidemic/PersonList.aspx.cs index e615662..735c4be 100644 --- a/SGGL/FineUIPro.Web/HSSE/Epidemic/PersonList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Epidemic/PersonList.aspx.cs @@ -165,7 +165,7 @@ namespace FineUIPro.Web.HSSE.Epidemic /// private void BindGrid() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (this.tvProjectAndUnit != null && !string.IsNullOrEmpty(this.tvProjectAndUnit.SelectedNodeID)) { diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx.cs index 03432c7..f5ff3bc 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx.cs @@ -85,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard /// protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionView.aspx.cs index f7bccfa..76a509d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionView.aspx.cs @@ -85,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard /// protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs index 99f7c7b..123a80b 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs @@ -75,7 +75,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection /// protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { @@ -219,7 +219,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection /// protected void drpUnit_OnSelectedIndexChanged(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { this.drpWorkArea.Items.Clear(); this.drpResponsibleMan.Items.Clear(); diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs index dabcc9d..fc21ced 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs @@ -710,7 +710,7 @@ namespace FineUIPro.Web.HSSE.InformationProject /// private void GetData(DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { //姝讳骸浜嬫晠 var accidentReports1 = BLL.AccidentReportService.GetAccidentReportsByAccidentTypeAndTime(startTime, endTime, this.ProjectId, "1"); diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs index 5aba2d0..0652923 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs @@ -471,7 +471,7 @@ namespace FineUIPro.Web.InformationProject /// private void GetData(DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int? sumTotalPanhours = 0; diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs index 5ae8ff8..6ea7225 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs @@ -545,7 +545,7 @@ namespace FineUIPro.Web.HSSE.InformationProject /// private void GetData(DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { decimal sumPersonWorkTimeTotal = 0; //鑾峰彇褰撴湡浜哄伐鏃舵棩鎶 diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs index c269fbd..f728c72 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs @@ -53,7 +53,7 @@ namespace FineUIPro.Web.HSSE.Manager { this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Manager_PersonSortC where x.MonthReportId == MonthReportId select x; diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs index 829eb18..44c1e25 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs @@ -163,7 +163,7 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; this.txtMainActivitiesDef.Text = monthReport.MainActivitiesDef; //鍗遍櫓婧愭儏鍐 hazardSorts = (from x in db.Manager_HazardSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs index a60bb17..8bb8009 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs @@ -96,7 +96,7 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //5.1.2 鏈湀鏂囦欢銆佹柟妗堜慨缂栨儏鍐佃鏄 plans = (from x in db.Manager_Month_PlanC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); if (plans.Count > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs index 0de99f4..c45d726 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs @@ -90,7 +90,7 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; this.nbMainCost1.Text = (monthReport.MainCost1 ?? 0).ToString(); this.nbMainProjectCost1.Text = (monthReport.MainProjectCost1 ?? 0).ToString(); this.nbSubCost1.Text = (monthReport.SubCost1 ?? 0).ToString(); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs index 0c692eb..b470eff 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs @@ -90,7 +90,7 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //7.1 绠＄悊缁╂晥鏁版嵁缁熻(琛ㄤ竴) accidentDesciptions = (from x in db.Manager_Month_AccidentDesciptionC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); if (accidentDesciptions.Count > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs index a910095..dc0ab9c 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs @@ -139,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Manager this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); this.txtNextEmergencyResponse.Text = monthReport.NextEmergencyResponse; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //9.1 鍗遍櫓婧愬姩鎬佽瘑鍒強鎺у埗 hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); if (hazards.Count > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs index c3448c2..584a277 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs @@ -99,7 +99,7 @@ namespace FineUIPro.Web.HSSE.Manager { this.lblEndDate.Text = string.Format("{0:yyyy-MM-dd}", project.EndDate); } - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Manager_PersonSortC where x.MonthReportId == MonthReportId select x; diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs index 689c5f8..0a47b64 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs @@ -55,7 +55,7 @@ namespace FineUIPro.Web.HSSE.Manager { this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.Manager_PersonSortC where x.MonthReportId == MonthReportId select x; diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView4.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView4.aspx.cs index 077560c..c34ad7f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView4.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView4.aspx.cs @@ -162,7 +162,7 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; this.txtMainActivitiesDef.Text = monthReport.MainActivitiesDef; //鍗遍櫓婧愭儏鍐 hazardSorts = (from x in db.Manager_HazardSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView5.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView5.aspx.cs index 764496e..a51b30a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView5.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView5.aspx.cs @@ -95,7 +95,7 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //5.1.2 鏈湀鏂囦欢銆佹柟妗堜慨缂栨儏鍐佃鏄 plans = (from x in db.Manager_Month_PlanC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); if (plans.Count > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView6.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView6.aspx.cs index 79d3f3d..cddd071 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView6.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView6.aspx.cs @@ -89,7 +89,7 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; this.nbMainCost1.Text = (monthReport.MainCost1 ?? 0).ToString(); this.nbMainProjectCost1.Text = (monthReport.MainProjectCost1 ?? 0).ToString(); this.nbSubCost1.Text = (monthReport.SubCost1 ?? 0).ToString(); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView7.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView7.aspx.cs index 8cca888..8ccd627 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView7.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView7.aspx.cs @@ -89,7 +89,7 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //7.1 绠＄悊缁╂晥鏁版嵁缁熻(琛ㄤ竴) accidentDesciptions = (from x in db.Manager_Month_AccidentDesciptionC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); if (accidentDesciptions.Count > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs index 9f3ee8e..d3de396 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs @@ -128,7 +128,7 @@ namespace FineUIPro.Web.HSSE.Manager this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); this.txtNextEmergencyResponse.Text = monthReport.NextEmergencyResponse; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //9.1 鍗遍櫓婧愬姩鎬佽瘑鍒強鎺у埗 hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); if (hazards.Count > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.cs index 450884c..d81a45c 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.cs @@ -229,7 +229,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { if (compileDate != null) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; DateTime date = Convert.ToDateTime(compileDate); var q = from y in db.SitePerson_DayReportDetail where @@ -255,7 +255,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { if (compileDate != null) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; DateTime date = Convert.ToDateTime(compileDate); var q = from y in db.SitePerson_DayReportDetail where (from z in db.SitePerson_DayReport where z.CompileDate <= date && z.ProjectId == this.CurrUser.LoginProjectId select z.DayReportId).Contains(y.DayReportId) select y; if (q.Count() > 0) diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportEdit.aspx.cs index c5a916c..fdc2665 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportEdit.aspx.cs @@ -76,7 +76,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// private void BindGrid() { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var q = from x in db.SitePerson_DayReportDetail join a in db.SitePerson_DayReport on x.DayReportId equals a.DayReportId diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportView.aspx.cs index a849637..c0a8ed4 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportView.aspx.cs @@ -134,7 +134,7 @@ namespace FineUIPro.Web.SitePerson /// private void BindGrid() { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; if (this.nowData == "-1") { var q = (from x in db.SitePerson_DayReportDetail diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/MonthReportEdit.aspx.cs index 66ad05a..e6263a1 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/MonthReportEdit.aspx.cs @@ -77,7 +77,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// private void BindGrid() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!string.IsNullOrWhiteSpace(this.MonthReportId)) diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs index d515661..7a79848 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs @@ -58,7 +58,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// private void BindGrid() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string unitId = string.Empty; string projectId = string.Empty; diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs index a5fbe9e..7bd6e7c 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs @@ -394,7 +394,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected void btnSave_Click(object sender, EventArgs e) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var allPersons = from x in db.SitePerson_Person select x; //var persons = db.SitePerson_Person // .GroupBy(x => x.IdentityCard) diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs index f899eea..2ea7a0f 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs @@ -217,7 +217,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// private void BindGrid() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (this.tvProjectAndUnit != null && !string.IsNullOrEmpty(this.tvProjectAndUnit.SelectedNodeID)) { diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListAll.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListAll.aspx.cs index d2cb9c7..bf418b7 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListAll.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListAll.aspx.cs @@ -154,7 +154,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// private void BindGrid() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string strSql = "select b.ProjectName , a.* from View_SitePerson_PersonList a left join Base_Project b on a.ProjectId = b.ProjectId Where "; diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs index a068afa..2e5ebeb 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs @@ -241,7 +241,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected string ConvertTrainResult(object PersonId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { string result = string.Empty; if (PersonId != null) diff --git a/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolutionView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolutionView.aspx.cs index c4fc576..872bc7c 100644 --- a/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolutionView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolutionView.aspx.cs @@ -170,7 +170,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trOne.Nodes.Add(rootNode); trOne.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -201,7 +201,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trTwo.Nodes.Add(rootNode); trTwo.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -252,7 +252,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trThree.Nodes.Add(rootNode); trThree.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -282,7 +282,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trFour.Nodes.Add(rootNode); trFour.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -313,7 +313,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trFive.Nodes.Add(rootNode); trFive.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -344,7 +344,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trSixe.Nodes.Add(rootNode); trSixe.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit diff --git a/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs index 263af71..e8849fe 100644 --- a/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs @@ -1083,7 +1083,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew private void initDropSameGroup(DropDownList drop , string type) { List users = new List(); - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { switch (type) { @@ -1178,7 +1178,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trOne.Nodes.Add(rootNode); trOne.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1209,7 +1209,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trTwo.Nodes.Add(rootNode); trTwo.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1260,7 +1260,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trThree.Nodes.Add(rootNode); trThree.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1290,7 +1290,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trFour.Nodes.Add(rootNode); trFour.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1321,7 +1321,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trFive.Nodes.Add(rootNode); trFive.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit @@ -1352,7 +1352,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew rootNode.EnableCheckEvent = true; trSixe.Nodes.Add(rootNode); trSixe.EnableCheckBox = true; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var userList = from x in db.Sys_User join y in db.Project_ProjectUnit diff --git a/SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanAudit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanAudit.aspx.cs index 4c2a895..d19b8c4 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanAudit.aspx.cs @@ -1732,7 +1732,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan /// private void MergeWbsSetDetail(string cnProfessionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; // 鍒嗛儴鍒嗛」 var wbsSetList4 = from x in db.WbsDetail join y in db.Wbs_WbsSet on x.ToWbs equals y.WbsSetId @@ -1895,7 +1895,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan /// private void MergeWbsSetDetail2(string unitProjectId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; // 鍒嗛儴鍒嗛」 var wbsSetList4 = from x in db.WbsDetail join y in db.Wbs_WbsSet on x.ToWbs equals y.WbsSetId @@ -2031,7 +2031,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan private void AddWbsSetDetail(string toWbs, DateTime months, decimal planValue, decimal completeValue, decimal realValue, int toFlag) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal? weight = null; if (toFlag == 4) { diff --git a/SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanSet.aspx.cs index ebe60b8..701f479 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanSet.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanSet.aspx.cs @@ -1987,7 +1987,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan /// private void MergeWbsSetDetail(string cnProfessionId) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; // 鍒嗛儴鍒嗛」 var wbsSetList4 = from x in db.WbsDetail join y in db.Wbs_WbsSet on x.ToWbs equals y.WbsSetId @@ -2148,7 +2148,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan private void AddWbsSetDetail(string toWbs, DateTime months, decimal planValue, decimal completeValue, decimal realValue, int toFlag) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; decimal? weight = null; if (toFlag == 4) { diff --git a/SGGL/FineUIPro.Web/Login.aspx.cs b/SGGL/FineUIPro.Web/Login.aspx.cs index 90efc3e..4279da7 100644 --- a/SGGL/FineUIPro.Web/Login.aspx.cs +++ b/SGGL/FineUIPro.Web/Login.aspx.cs @@ -305,7 +305,7 @@ namespace FineUIPro.Web sysUser.RawPassword = "XJYJ." + idcard.Substring(idcard.Length - 4, 4); sysUser.Password = Funs.EncryptionPassword(sysUser.RawPassword); Funs.DB.SubmitChanges(); - return "閲嶇疆鎴愬姛锛岄粯璁ゅ瘑鐮佹槸 XJYJ+'.'+韬唤璇佸彿鐮佸悗鍥涗綅,璇风櫥褰"; + return "閲嶇疆鎴愬姛锛岄粯璁ゅ瘑鐮佹槸锛歑JYJ+'.'+韬唤璇佸彿鐮佸悗鍥涗綅锛岃鐧诲綍"; } } } diff --git a/SGGL/FineUIPro.Web/Person/EduTrain/PlanView.aspx.cs b/SGGL/FineUIPro.Web/Person/EduTrain/PlanView.aspx.cs index 7a8c212..3a9e6c8 100644 --- a/SGGL/FineUIPro.Web/Person/EduTrain/PlanView.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/EduTrain/PlanView.aspx.cs @@ -14,7 +14,7 @@ namespace FineUIPro.Web.Person.EduTrain /// protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { diff --git a/SGGL/FineUIPro.Web/Person/EduTrain/TestPlanView.aspx.cs b/SGGL/FineUIPro.Web/Person/EduTrain/TestPlanView.aspx.cs index 37efb63..10c0b2c 100644 --- a/SGGL/FineUIPro.Web/Person/EduTrain/TestPlanView.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/EduTrain/TestPlanView.aspx.cs @@ -15,7 +15,7 @@ namespace FineUIPro.Web.Person.EduTrain /// protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { diff --git a/SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs b/SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs index 23e25bf..fdad42b 100644 --- a/SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs @@ -43,7 +43,7 @@ namespace FineUIPro.Web.Person.EduTrain protected void Page_Load(object sender, EventArgs e) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (!IsPostBack) { diff --git a/SGGL/FineUIPro.Web/ProjectData/ShowMainItem.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ShowMainItem.aspx.cs index d45c5fc..1f391b0 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ShowMainItem.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ShowMainItem.aspx.cs @@ -26,7 +26,7 @@ namespace FineUIPro.Web.ProjectData private void InitTree(string id, string unitWorkId) { this.tvMenu.Nodes.Clear(); - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var mainItems = from x in db.ProjectData_MainItem where x.ProjectId == this.CurrUser.LoginProjectId select x; string otherIds = string.Empty; diff --git a/SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs index 82ed8d3..8da78cd 100644 --- a/SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs @@ -101,7 +101,7 @@ namespace FineUIPro.Web.ProjectData BLL.DivisionProjectService.DeleteDivisionProjectByUnitWorkId(rowID); BLL.UnitWorkService.DeleteUnitWorkById(rowID); - //Model.SGGLDB db = Funs.DB; + //Model.CNPCDB db = Funs.DB; //var q1 = from x in db.WBS_BreakdownProject where x.UnitWorkId == rowID select x; //db.WBS_BreakdownProject.DeleteAllOnSubmit(q1); //var q2 = from x in db.WBS_DivisionProject where x.UnitWorkId == rowID select x; diff --git a/SGGL/FineUIPro.Web/SubPackManage/SubPackBlackRemark.aspx.cs b/SGGL/FineUIPro.Web/SubPackManage/SubPackBlackRemark.aspx.cs index 3bc6c40..b4e4d3d 100644 --- a/SGGL/FineUIPro.Web/SubPackManage/SubPackBlackRemark.aspx.cs +++ b/SGGL/FineUIPro.Web/SubPackManage/SubPackBlackRemark.aspx.cs @@ -108,7 +108,7 @@ namespace FineUIPro.Web.SubPackManage Alert.Show("榛戝悕鍗曚繚瀛樼己灏戝繀瑕佹暟鎹紝鏃犳硶淇濆瓨", MessageBoxIcon.Warning); return; } - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.SubPack_Blacklist newBlack = new Model.SubPack_Blacklist(); var blackList = db.SubPack_Blacklist.FirstOrDefault(p => p.BlackForeignKey == this.BlackForeignKey && p.BlackType == this.BlackType && p.IDCard == this.IDCard && p.ProjectID == this.ProjectID); if (blackList == null) diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs index 7629437..a7a88e0 100644 --- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs @@ -396,7 +396,7 @@ namespace FineUIPro.Web.SysManage /// protected void btnSave_Click(object sender, EventArgs e) { - var db = new Model.SGGLDB(Funs.ConnString); + var db = new Model.CNPCDB(Funs.ConnString); //var sysSet = BLL.ConstValue.drpConstItemList(BLL.ConstValue.Group_Synchronization).FirstOrDefault(); //if (sysSet != null) //{ diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx b/SGGL/FineUIPro.Web/SysManage/UserList.aspx index 362b213..1f13dbb 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx +++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx @@ -48,8 +48,8 @@ OnClick="btnImport_Click"> - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs index d188000..eec6c86 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs @@ -320,8 +320,14 @@ { PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("UserIn.aspx", "瀵煎叆 - "))); } - #endregion - protected void btnImport1_Click(object sender, EventArgs e) + #endregion + + /// + /// 浠庝富鏁版嵁骞冲彴鍚屾 + /// + /// + /// + protected void btnImport1_Click(object sender, EventArgs e) { //鍚屾椤圭洰 int total = 10; @@ -403,6 +409,7 @@ BindGrid(); } + /// /// 鍏抽棴瀵煎叆寮瑰嚭绐楀彛 /// diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs index 699183e..0de87aa 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs @@ -11,196 +11,187 @@ namespace FineUIPro.Web.SysManage { - public partial class UserList - { + public partial class UserList + { - /// - /// form1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; - /// - /// PageManager1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.PageManager PageManager1; + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; - /// - /// Panel1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Panel Panel1; + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; - /// - /// Grid1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Grid Grid1; + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; - /// - /// Toolbar2 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Toolbar Toolbar2; + /// + /// Toolbar2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar2; - /// - /// txtUserName 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.TextBox txtUserName; + /// + /// txtUserName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtUserName; - /// - /// drpUnit 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.DropDownList drpUnit; + /// + /// drpUnit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpUnit; - /// - /// drpDepart 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.DropDownList drpDepart; + /// + /// drpDepart 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpDepart; - /// - /// drpRole 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.DropDownList drpRole; + /// + /// drpRole 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpRole; - /// - /// btnNew 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Button btnNew; + /// + /// btnNew 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnNew; - /// - /// btnImport 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Button btnImport; + /// + /// btnImport 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnImport; - /// - /// Button1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Button Button1; + /// + /// lbtnPro 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.LinkButton lbtnPro; - /// - /// lbtnPro 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::System.Web.UI.WebControls.LinkButton lbtnPro; + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - /// - /// ToolbarSeparator1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; - /// - /// ToolbarText1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.ToolbarText ToolbarText1; + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; - /// - /// ddlPageSize 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.DropDownList ddlPageSize; + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; - /// - /// Window1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Window Window1; + /// + /// Window2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window2; - /// - /// Window2 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Window Window2; + /// + /// Menu1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Menu Menu1; - /// - /// Menu1 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.Menu Menu1; + /// + /// btnMenuEdit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; - /// - /// btnMenuEdit 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.MenuButton btnMenuEdit; - - /// - /// btnMenuDelete 鎺т欢銆 - /// - /// - /// 鑷姩鐢熸垚鐨勫瓧娈点 - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 - /// - protected global::FineUIPro.MenuButton btnMenuDelete; - } + /// + /// btnMenuDelete 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } } diff --git a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx.cs b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx.cs index 4ed0113..0d93021 100644 --- a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx.cs +++ b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx.cs @@ -110,7 +110,7 @@ } protected void btnStart_Click(object sender, EventArgs e) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List FaceList = db.InterFaceSet.Where(p=>p.IsOpen==true).ToList(); foreach(var item in FaceList) { @@ -121,7 +121,7 @@ protected void btnFor_Click(object sender, EventArgs e) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; List FaceList = db.InterFaceSet.Where(p => p.IsOpen == true).ToList(); foreach (var item in FaceList) { diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectOperationReportEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectOperationReportEdit.aspx.cs index 0ba9cbb..61f6d06 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectOperationReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectOperationReportEdit.aspx.cs @@ -252,7 +252,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// private void GetData(DateTime startTime, DateTime endTime) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { } diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs index 965e7d1..11955c8 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs @@ -438,7 +438,7 @@ namespace FineUIPro.Web.ZHGL.Information JArray getData = JArray.Parse(obj["data"].ToString()); if (getData.Count() > 0) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int i = 0; string actionWorkLedgerId = SQLHelper.GetNewID(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs index 2bdce1b..0b7e107 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs @@ -438,7 +438,7 @@ namespace FineUIPro.Web.ZHGL.Information JArray getData = JArray.Parse(obj["data"].ToString()); if (getData.Count() > 0) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int i = 0; string SafetyProductionEvaluationId = SQLHelper.GetNewID(); diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs index 05e8915..e4aa148 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs @@ -545,7 +545,7 @@ namespace FineUIPro.Web.ZHGL.RealName sucess = obj["success"].ToString(); if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString())) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPersonInOutNow = db.RealName_PersonInOutNow.FirstOrDefault(x => x.PersonInOutId == item.PersonInOutId); if (getPersonInOutNow != null) diff --git a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs index a8703e2..acdbfeb 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs @@ -413,7 +413,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck JArray getData = JArray.Parse(obj["data"].ToString()); if (getData.Count() > 0) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { List ids = new List(); foreach (var item in getData) diff --git a/SGGL/FineUIPro.Web/common/main0.aspx.cs b/SGGL/FineUIPro.Web/common/main0.aspx.cs index 3cb90a8..21930b7 100644 --- a/SGGL/FineUIPro.Web/common/main0.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main0.aspx.cs @@ -312,7 +312,7 @@ namespace FineUIPro.Web.common List listdata = new List(); //List listdata2 = new List(); double result = 0; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; foreach (var project in projects) { listCategories.Add(project.ShortName); diff --git a/SGGL/FineUIPro.Web/common/main3.aspx.cs b/SGGL/FineUIPro.Web/common/main3.aspx.cs index 04b8025..bc63b08 100644 --- a/SGGL/FineUIPro.Web/common/main3.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main3.aspx.cs @@ -33,7 +33,7 @@ namespace FineUIPro.Web.common { if (!IsPostBack) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; this.divMajorProjectsUnderConstructionNum.InnerHtml = (from x in db.Solution_LargerHazard where x.States == "2" && x.RecordTime > Const.DtmarkTime select x).Count().ToString(); @@ -82,7 +82,7 @@ namespace FineUIPro.Web.common /// /// 椤圭洰淇℃伅 /// - private List getProjectInfo(Model.SGGLDB db) + private List getProjectInfo(Model.CNPCDB db) { ProjectInfo = "[]"; var getProjects = db.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && (x.IsDelete == null || x.IsDelete == false)); @@ -201,7 +201,7 @@ namespace FineUIPro.Web.common /// /// 鑾峰彇瀹夊叏浜哄伐鏃 /// - private void getPersonWorkTime(Model.SGGLDB db) + private void getPersonWorkTime(Model.CNPCDB db) { int wHours = 0; var getMax = from x in db.SitePerson_DayReportDetail @@ -221,7 +221,7 @@ namespace FineUIPro.Web.common /// /// 鍔冲姟缁熻 /// - private void getSitePerson(Model.SGGLDB db) + private void getSitePerson(Model.CNPCDB db) { int AllCount = 0; int MCount = 0; @@ -261,7 +261,7 @@ namespace FineUIPro.Web.common /// /// 鑾峰彇璐ㄩ噺闂 /// - private void getCQMSProblem(Model.SGGLDB db) + private void getCQMSProblem(Model.CNPCDB db) { CQualifiedRate = 0; diff --git a/SGGL/FineUIPro.Web/common/mainI.aspx.cs b/SGGL/FineUIPro.Web/common/mainI.aspx.cs index 39c56ed..dc985d1 100644 --- a/SGGL/FineUIPro.Web/common/mainI.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainI.aspx.cs @@ -316,7 +316,7 @@ namespace FineUIPro.Web.common List listdata = new List(); //List listdata2 = new List(); double result = 0; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; foreach (var project in projects) { listCategories.Add(project.ProjectCode); diff --git a/SGGL/FineUIPro.Web/common/mainIII.aspx.cs b/SGGL/FineUIPro.Web/common/mainIII.aspx.cs index 8512350..dd2dfaf 100644 --- a/SGGL/FineUIPro.Web/common/mainIII.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainIII.aspx.cs @@ -596,7 +596,7 @@ namespace FineUIPro.Web.common Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listdata = new List(); double result = 0; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //涓娆℃娴嬪悎鏍肩剨鍙ｆ暟 int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId @@ -634,7 +634,7 @@ namespace FineUIPro.Web.common Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listdata = new List(); double result = 0; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //椤圭洰鐒婂彛鏁 int allJotNum = (from x in db.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId diff --git a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs index 12d1834..3ce75e8 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs @@ -15,7 +15,7 @@ namespace FineUIPro.Web { if (!IsPostBack) { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; this.divPersonTrainNum.InnerText = (from x in db.Comprehensive_InspectionPerson where x.ProjectId == this.CurrUser.LoginProjectId && x.IsTrain == true select x).Count().ToString(); diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs index 8b836ea..511ba4f 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs @@ -96,7 +96,7 @@ namespace FineUIPro.Web { get { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); List series = new List(); @@ -230,7 +230,7 @@ namespace FineUIPro.Web { get { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); List series = new List(); @@ -266,7 +266,7 @@ namespace FineUIPro.Web { get { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); List series = new List(); diff --git a/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx b/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx new file mode 100644 index 0000000..59f293d --- /dev/null +++ b/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx @@ -0,0 +1,932 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="mainMenu_Staff.aspx.cs" Inherits="FineUIPro.Web.mainMenu_Staff" %> + + + + + + 棣栭〉 + + + + + + +
+
+
+
+
+
+
+
+
褰撳墠鐜板満鎬讳汉鏁
+
+
0
+
0
+
0
+
0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
110
+
鎶ヨ
+
+
+
119
+
娑堥槻
+
+
+
120
+
鎬ユ晳
+
+
+
+
椤圭洰閮
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
鏂藉伐鍒嗗寘鍟
+
+
闂绫诲埆
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx.cs new file mode 100644 index 0000000..1935ef4 --- /dev/null +++ b/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx.cs @@ -0,0 +1,392 @@ +锘縰sing BLL; +using FineUIPro.Web.HSSE.License; +using Newtonsoft.Json; +using System; +using System.CodeDom; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web +{ + public partial class mainMenu_Staff : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + getHazardRegisterLists = HSSE_Hazard_HazardRegisterService.GetHazardRegisterListByProjectId(this.CurrUser.LoginProjectId); + ///褰撳墠鐜板満鎬讳汉鏁 + getSitePerson(); + var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + if (project != null && project.Telephone != null) + { + this.xmb.InnerHtml = project.Telephone; + } + + getDayReportDetails = (from x in Funs.DB.SitePerson_DayReportDetail + join y in Funs.DB.SitePerson_DayReport on x.DayReportId equals y.DayReportId + where y.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + getProjectUnits = (from x in Funs.DB.Project_ProjectUnit + where x.ProjectId == this.CurrUser.LoginProjectId + select x).ToList(); + } + } + + private static List getDayReportDetails; + + private static List getProjectUnits; + + #region 褰撳墠鐜板満鎬讳汉鏁 + /// + /// 褰撳墠鐜板満鎬讳汉鏁 + /// + private void getSitePerson() + { + int AllCount = 0; + //var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1)); + DateTime dateValue = DateTime.Now.AddDays(-1); + List getallin = new List(); + var getInMaxs = from x in Funs.DB.SitePerson_Person + join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId + where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true + select new Model.PageDataPersonInOutItem + { + PersonId = x.PersonId, + PostType = y.PostType, + WorkPostId = x.WorkPostId, + }; + if (getInMaxs.Count() > 0) + { + getallin = getInMaxs.Distinct().ToList(); + } + //AllCount = getallin.Count(); + var getEmployInOutRecords = (from x in Funs.DB.T_d_EmployInOutRecord + join y in Funs.DB.SitePerson_Person on new { ss1 = x.ProjectId, ss = x.IDCardNo } equals new { ss1 = y.ProjectId, ss = y.IdentityCard } + where y.ProjectId == this.CurrUser.LoginProjectId && y.IsUsed == true && x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date + select x.IDCardNo).Distinct(); + + //if (AllCount > 0) + //{ + // ////鎬讳汉鏁 + // this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString(); + // this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString(); + // this.person01.InnerHtml = ((AllCount % 100) / 10).ToString(); + // this.person02.InnerHtml = (AllCount % 10).ToString(); + //} + + + AllCount = getEmployInOutRecords.Count(); + if (AllCount > 0) + { + ////鎬讳汉鏁 + this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString(); + this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString(); + this.person01.InnerHtml = ((AllCount % 100) / 10).ToString(); + this.person02.InnerHtml = (AllCount % 10).ToString(); + } + } + #endregion + + #region 椤圭洰瀹夊叏浜哄伐鏃 + /// + /// 椤圭洰瀹夊叏浜哄伐鏃 + /// + protected string Two + { + get + { + Model.CNPCDB db = Funs.DB; + Model.BusinessColumn businessColumn = new Model.BusinessColumn(); + List listCategories = new List(); + List series = new List(); + Model.SingleSerie s = new Model.SingleSerie(); + List listdata = new List(); + foreach (var item in getProjectUnits) + { + listCategories.Add(UnitService.GetShortUnitNameByUnitId(item.UnitId)); + decimal total = getDayReportDetails.Where(x => x.UnitId == item.UnitId).Sum(x => x.PersonWorkTime ?? 0); + listdata.Add(Convert.ToDouble(total)); + } + s.data = listdata; + series.Add(s); + + businessColumn.categories = listCategories; + businessColumn.series = series; + return JsonConvert.SerializeObject(businessColumn); + } + } + #endregion + + #region 浣滀笟璁稿彲鏁伴噺缁熻 + /// + /// 浣滀笟璁稿彲鏁伴噺缁熻 + /// + protected string Three + { + get + { + List series = new List(); + Model.BusinessColumn businessColumn = new Model.BusinessColumn(); + List listCategories = new List(); + businessColumn.title = "浣滀笟璁稿彲鏁伴噺缁熻"; + Model.SingleSerie s = new Model.SingleSerie(); + List listdata = new List(); + + var qLicenseManager = ( from x in Funs.DB.License_LicenseManager.Where(xx=>xx.ProjectId==CurrUser.LoginProjectId) + join y in Funs.DB.Base_LicenseType + on x.LicenseTypeId equals y.LicenseTypeId into z + from zz in z + select new + { + x.LicenseTypeId,zz.LicenseTypeCode + + }).ToList(); + int FireWork = Funs.DB.License_FireWork.Where(x=>x.ProjectId==this.CurrUser.LoginProjectId && x.States== Const.State_3).Count(); + int HeightWork = Funs.DB.License_HeightWork.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count(); + int LimitedSpace = Funs.DB.License_LimitedSpace.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count(); + int RadialWork = Funs.DB.License_RadialWork.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count(); + int OpenCircuit = Funs.DB.License_OpenCircuit.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count(); + int BreakGround = Funs.DB.License_BreakGround.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count(); + int NightWork = Funs.DB.License_NightWork.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count(); + int LiftingWork = Funs.DB.License_LiftingWork.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count(); + + foreach(var item in qLicenseManager) + { + switch (item.LicenseTypeCode) + { + case "01": + case "4"://鍔ㄧ伀 + FireWork++; + break; + case "06": + case "18": + case "2"://楂樺 + HeightWork++; + break; + case "03": + case "7"://鍙楅檺 + LimitedSpace++; + break; + case "14": + case "04"://灏勭嚎 + RadialWork++; + break; + case "09": + case "5"://鏂矾 + OpenCircuit++; + break; + case "02": + case "8"://鍔ㄥ湡 + BreakGround++; + break; + case ""://澶滈棿 + NightWork++; + break; + case "19": + case "05": + case "3"://鍚婅 + LiftingWork++; + break; + } + } + + listCategories.Add("鍔ㄧ伀"); + listdata.Add(FireWork); + listCategories.Add("楂樺"); + listdata.Add(HeightWork); + listCategories.Add("鍙楅檺"); + listdata.Add(LimitedSpace); + listCategories.Add("灏勭嚎"); + listdata.Add(RadialWork); + listCategories.Add("鏂矾"); + listdata.Add(OpenCircuit); + listCategories.Add("鍔ㄥ湡"); + listdata.Add(BreakGround); + listCategories.Add("澶滈棿"); + listdata.Add(NightWork); + listCategories.Add("鍚婅"); + listdata.Add(LiftingWork); + + s.data = listdata; + series.Add(s); + businessColumn.categories = listCategories; + businessColumn.series = series; + return JsonConvert.SerializeObject(businessColumn); + } + } + #endregion + + #region 瀹夊叏妫鏌ラ棶棰樼粺璁 + /// + /// + /// + public static List getHazardRegisterLists; + + /// + /// 鎸夊崟浣嶇粺璁 + /// + protected string Four1 + { + get + { + Model.CNPCDB db = Funs.DB; + Model.BusinessColumn businessColumn = new Model.BusinessColumn(); + List listCategories = new List(); + List series = new List(); + Model.SingleSerie s = new Model.SingleSerie(); + List listdata = new List(); + List listdata2 = new List(); + var hazardRegisters = from x in db.View_Hazard_HazardRegister where x.ProjectId == this.CurrUser.LoginProjectId select x; + if (hazardRegisters.Count() > 0) + { + var units = hazardRegisters.Select(x => x.ResponsibleUnit).Distinct().ToList(); + foreach (var unit in units) + { + listCategories.Add(UnitService.GetShortUnitNameByUnitId(unit)); + int state1 = hazardRegisters.Count(x => x.ResponsibleUnit == unit && x.States == "1"); + int state2 = hazardRegisters.Count(x => x.ResponsibleUnit == unit); + listdata.Add(Convert.ToDouble(state1)); + listdata2.Add(Convert.ToDouble(state2)); + } + s.data = listdata; + s.data2 = listdata2; + series.Add(s); + } + businessColumn.categories = listCategories; + businessColumn.series = series; + return JsonConvert.SerializeObject(businessColumn); + } + } + + /// + /// 鎸夌被鍨嬬粺璁 + /// + protected string Four2 + { + get + { + Model.CNPCDB db = Funs.DB; + Model.BusinessColumn businessColumn = new Model.BusinessColumn(); + List listCategories = new List(); + List series = new List(); + Model.SingleSerie s = new Model.SingleSerie(); + List listdata = new List(); + List listdata2 = new List(); + var hazardRegisters = from x in db.View_Hazard_HazardRegister where x.ProjectId == this.CurrUser.LoginProjectId select x; + if (hazardRegisters.Count() > 0) + { + var types = hazardRegisters.Select(x => x.RegisterTypesName).Distinct().ToList(); + foreach (var type in types) + { + listCategories.Add(type); + int state1 = hazardRegisters.Count(x => x.RegisterTypesName == type && x.States == "1"); + int state2 = hazardRegisters.Count(x => x.RegisterTypesName == type); + listdata.Add(Convert.ToDouble(state1)); + listdata2.Add(Convert.ToDouble(state2)); + } + s.data = listdata; + s.data2 = listdata2; + series.Add(s); + } + businessColumn.categories = listCategories; + businessColumn.series = series; + return JsonConvert.SerializeObject(businessColumn); + } + } + #endregion + + #region 鍏ュ満瀹夊叏鍩硅 + /// + /// 鍏ュ満瀹夊叏鍩硅 + /// + protected string Five + { + get + { + List series = new List(); + Model.BusinessColumn businessColumn = new Model.BusinessColumn(); + List listCategories = new List(); + businessColumn.title = "鍏ュ満鍩硅"; + Model.SingleSerie s = new Model.SingleSerie(); + Model.SingleSerie s2 = new Model.SingleSerie(); + //// 姣忔湀鍩硅鏁伴噺 + List listdata = new List(); + List listdata2 = new List(); + var getTrainRecord = from x in Funs.DB.EduTrain_TrainRecord + where x.ProjectId == this.CurrUser.LoginProjectId && x.TrainTypeId == Const.EntryTrainTypeId + select x; + var getTrainRecordDetail = from x in Funs.DB.EduTrain_TrainRecordDetail + join y in getTrainRecord on x.TrainingId equals y.TrainingId + select x; + DateTime startTime = DateTime.Now; + DateTime endTime = DateTime.Now; + var getProject = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + if (getProject != null && getProject.StartDate.HasValue) + { + startTime = getProject.StartDate.Value; + if (getProject.EndDate.HasValue && getProject.EndDate < DateTime.Now) + { + endTime = getProject.EndDate.Value; + } + } + int totalCout = 0; + for (int i = 0; startTime.AddMonths(i) <= endTime; i++) + { + listCategories.Add(string.Format("{0:yyyy-MM}", startTime.AddMonths(i))); + + var getMontDetail = from x in getTrainRecordDetail + join y in getTrainRecord on x.TrainingId equals y.TrainingId + where y.TrainStartDate.Value.Year == startTime.AddMonths(i).Year && y.TrainStartDate.Value.Month == startTime.AddMonths(i).Month + select x; + listdata.Add(getMontDetail.Count()); + totalCout = totalCout + getMontDetail.Count(); + listdata2.Add(totalCout); + } + + s.data = listdata; + s2.data = listdata2; + series.Add(s); + series.Add(s2); + businessColumn.categories = listCategories; + businessColumn.series = series; + return JsonConvert.SerializeObject(businessColumn); + } + } + #endregion + + # region 浜嬫晠缁熻 + /// + /// 浜嬫晠缁熻 + /// + protected string Six + { + get + { + List series = new List(); + Model.BusinessColumn businessColumn = new Model.BusinessColumn(); + + Model.SingleSerie s = new Model.SingleSerie(); + List listdata = new List(); + + businessColumn.title = "浜嬫晠缁熻"; + var getAccident = from x in Funs.DB.Accident_AccidentReport + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + + listdata.Add(getAccident.Where(x => x.AccidentTypeId == "1" || x.AccidentTypeId == "2" || x.AccidentTypeId == "3" || x.AccidentTypeId == "4").Count()); + listdata.Add(getAccident.Where(x => x.AccidentTypeId == "5").Count()); + listdata.Add(getAccident.Where(x => x.AccidentTypeId == "6" || x.AccidentTypeId == "7").Count()); + listdata.Add(getAccident.Where(x => x.AccidentTypeId == "8" || x.AccidentTypeId == "9").Count()); + listdata.Add(getAccident.Where(x => x.AccidentTypeId == "10").Count()); + listdata.Add(getAccident.Where(x => x.AccidentTypeId == "11").Count()); + + s.data = listdata; + series.Add(s); + businessColumn.series = series; + return JsonConvert.SerializeObject(businessColumn); + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx.designer.cs new file mode 100644 index 0000000..87fdfa9 --- /dev/null +++ b/SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx.designer.cs @@ -0,0 +1,71 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web +{ + + + public partial class mainMenu_Staff + { + + /// + /// Head1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlHead Head1; + + /// + /// divperson 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divperson; + + /// + /// person00 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl person00; + + /// + /// person01 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl person01; + + /// + /// person02 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl person02; + + /// + /// xmb 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl xmb; + } +} diff --git a/SGGL/FineUIPro.Web/common/mainProject0.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject0.aspx.cs index 30633d1..50c414d 100644 --- a/SGGL/FineUIPro.Web/common/mainProject0.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject0.aspx.cs @@ -245,7 +245,7 @@ namespace FineUIPro.Web.common Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listdata = new List(); double result = 0; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //涓娆℃娴嬪悎鏍肩剨鍙ｆ暟 int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId @@ -283,7 +283,7 @@ namespace FineUIPro.Web.common Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listdata = new List(); double result = 0; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //椤圭洰鐒婂彛鏁 int allJotNum = (from x in db.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId diff --git a/SGGL/FineUIPro.Web/common/mainProjectNew.aspx.cs b/SGGL/FineUIPro.Web/common/mainProjectNew.aspx.cs index a4f94e6..a587836 100644 --- a/SGGL/FineUIPro.Web/common/mainProjectNew.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProjectNew.aspx.cs @@ -35,7 +35,7 @@ namespace FineUIPro.Web.common if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; //鍔犺浇鐪嬫澘鏁版嵁 loadData(); diff --git a/SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs b/SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs index 9e89989..cce1851 100644 --- a/SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs @@ -139,7 +139,7 @@ namespace FineUIPro.Web.common { get { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); List series = new List(); @@ -198,7 +198,7 @@ namespace FineUIPro.Web.common { get { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; var personQualitys = from x in db.SitePerson_Person join y in db.QualityAudit_PersonQuality on x.PersonId equals y.PersonId join z in db.Base_WorkPost on x.WorkPostId equals z.WorkPostId @@ -362,7 +362,7 @@ namespace FineUIPro.Web.common { get { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); List series = new List(); @@ -395,7 +395,7 @@ namespace FineUIPro.Web.common { get { - Model.SGGLDB db = Funs.DB; + Model.CNPCDB db = Funs.DB; Model.BusinessColumn businessColumn = new Model.BusinessColumn(); List listCategories = new List(); List series = new List(); diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index 2cc0403..26393c5 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -280,8 +280,8 @@ <%--
--%> -
+
<%--
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index 7bf8d1c..e2fbc35 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -677,6 +677,10 @@ namespace FineUIPro.Web this.MenuSwitchMethod(Const.Menu_ProjectSet); } + protected void btnStaff_Click(object sender, EventArgs e) + { + this.MenuSwitchMethod(Const.Menu_Staff); + } protected void btnHSSE_Click(object sender, EventArgs e) { this.MenuSwitchMethod(Const.Menu_HSSE); diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs index 825c33a..75dbd27 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs @@ -60,13 +60,13 @@ namespace FineUIPro.Web protected global::FineUIPro.ContentPanel ContentPanel1; /// - /// btnHSSE 鎺т欢銆 + /// btnStaff 鎺т欢銆 /// /// /// 鑷姩鐢熸垚鐨勫瓧娈点 /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// - protected global::FineUIPro.Button btnHSSE; + protected global::FineUIPro.Button btnStaff; /// /// btnHome 鎺т欢銆 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 78ed285..8692c2f 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -22,7 +22,7 @@ namespace Model using System; - public partial class SGGLDB : System.Data.Linq.DataContext + public partial class CNPCDB : System.Data.Linq.DataContext { private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource(); @@ -2360,6 +2360,12 @@ namespace Model partial void InsertSys_Menu(Sys_Menu instance); partial void UpdateSys_Menu(Sys_Menu instance); partial void DeleteSys_Menu(Sys_Menu instance); + partial void InsertSys_Menu_0501(Sys_Menu_0501 instance); + partial void UpdateSys_Menu_0501(Sys_Menu_0501 instance); + partial void DeleteSys_Menu_0501(Sys_Menu_0501 instance); + partial void InsertSys_Menu_0501t(Sys_Menu_0501t instance); + partial void UpdateSys_Menu_0501t(Sys_Menu_0501t instance); + partial void DeleteSys_Menu_0501t(Sys_Menu_0501t instance); partial void InsertSys_MenuFlowOperate(Sys_MenuFlowOperate instance); partial void UpdateSys_MenuFlowOperate(Sys_MenuFlowOperate instance); partial void DeleteSys_MenuFlowOperate(Sys_MenuFlowOperate instance); @@ -2701,25 +2707,25 @@ namespace Model partial void DeleteZHGL_WorkHandoverDetail(ZHGL_WorkHandoverDetail instance); #endregion - public SGGLDB(string connection) : + public CNPCDB(string connection) : base(connection, mappingSource) { OnCreated(); } - public SGGLDB(System.Data.IDbConnection connection) : + public CNPCDB(System.Data.IDbConnection connection) : base(connection, mappingSource) { OnCreated(); } - public SGGLDB(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) : + public CNPCDB(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) : base(connection, mappingSource) { OnCreated(); } - public SGGLDB(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) : + public CNPCDB(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) : base(connection, mappingSource) { OnCreated(); @@ -8973,6 +8979,22 @@ namespace Model } } + public System.Data.Linq.Table Sys_Menu_0501 + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table Sys_Menu_0501t + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Sys_MenuFlowOperate { get @@ -28599,6 +28621,14 @@ namespace Model private EntitySet _TP_TestPackage; + private EntitySet _Training_Plan; + + private EntitySet _Training_Task; + + private EntitySet _Training_TestPlan; + + private EntitySet _Training_TestRecord; + private EntitySet _Unqualified_WorkContact; private EntitySet _WBS_BreakdownProject; @@ -28994,6 +29024,10 @@ namespace Model this._Sys_UserRead = new EntitySet(new Action(this.attach_Sys_UserRead), new Action(this.detach_Sys_UserRead)); this._TC_CostStatistic = new EntitySet(new Action(this.attach_TC_CostStatistic), new Action(this.detach_TC_CostStatistic)); this._TP_TestPackage = new EntitySet(new Action(this.attach_TP_TestPackage), new Action(this.detach_TP_TestPackage)); + this._Training_Plan = new EntitySet(new Action(this.attach_Training_Plan), new Action(this.detach_Training_Plan)); + this._Training_Task = new EntitySet(new Action(this.attach_Training_Task), new Action(this.detach_Training_Task)); + this._Training_TestPlan = new EntitySet(new Action(this.attach_Training_TestPlan), new Action(this.detach_Training_TestPlan)); + this._Training_TestRecord = new EntitySet(new Action(this.attach_Training_TestRecord), new Action(this.detach_Training_TestRecord)); this._Unqualified_WorkContact = new EntitySet(new Action(this.attach_Unqualified_WorkContact), new Action(this.detach_Unqualified_WorkContact)); this._WBS_BreakdownProject = new EntitySet(new Action(this.attach_WBS_BreakdownProject), new Action(this.detach_WBS_BreakdownProject)); this._WBS_DivisionProject = new EntitySet(new Action(this.attach_WBS_DivisionProject), new Action(this.detach_WBS_DivisionProject)); @@ -33462,6 +33496,58 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_Plan_Base_Project", Storage="_Training_Plan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Training_Plan + { + get + { + return this._Training_Plan; + } + set + { + this._Training_Plan.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_Task_Base_Project", Storage="_Training_Task", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Training_Task + { + get + { + return this._Training_Task; + } + set + { + this._Training_Task.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestPlan_Base_Project", Storage="_Training_TestPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Training_TestPlan + { + get + { + return this._Training_TestPlan; + } + set + { + this._Training_TestPlan.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestRecord_Base_Project", Storage="_Training_TestRecord", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Training_TestRecord + { + get + { + return this._Training_TestRecord; + } + set + { + this._Training_TestRecord.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Unqualified_WorkContact_Base_Project", Storage="_Unqualified_WorkContact", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Unqualified_WorkContact { @@ -37062,6 +37148,54 @@ namespace Model entity.Base_Project = null; } + private void attach_Training_Plan(Training_Plan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Training_Plan(Training_Plan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + + private void attach_Training_Task(Training_Task entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Training_Task(Training_Task entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + + private void attach_Training_TestPlan(Training_TestPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Training_TestPlan(Training_TestPlan entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + + private void attach_Training_TestRecord(Training_TestRecord entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Training_TestRecord(Training_TestRecord entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_Unqualified_WorkContact(Unqualified_WorkContact entity) { this.SendPropertyChanging(); @@ -286607,8 +286741,6 @@ namespace Model private EntitySet _PostTraining_Course; - private EntitySet _PostTraining_Record; - #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -286631,7 +286763,6 @@ namespace Model { this._Sys_User = default(EntityRef); this._PostTraining_Course = new EntitySet(new Action(this.attach_PostTraining_Course), new Action(this.detach_PostTraining_Course)); - this._PostTraining_Record = new EntitySet(new Action(this.attach_PostTraining_Record), new Action(this.detach_PostTraining_Record)); OnCreated(); } @@ -286806,19 +286937,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_PostTraining_Category", Storage="_PostTraining_Record", ThisKey="Id", OtherKey="CategoryId", DeleteRule="NO ACTION")] - public EntitySet PostTraining_Record - { - get - { - return this._PostTraining_Record; - } - set - { - this._PostTraining_Record.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -286850,18 +286968,6 @@ namespace Model this.SendPropertyChanging(); entity.PostTraining_Category = null; } - - private void attach_PostTraining_Record(PostTraining_Record entity) - { - this.SendPropertyChanging(); - entity.PostTraining_Category = this; - } - - private void detach_PostTraining_Record(PostTraining_Record entity) - { - this.SendPropertyChanging(); - entity.PostTraining_Category = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Course")] @@ -286898,10 +287004,6 @@ namespace Model private EntityRef _Sys_User; - private EntitySet _PostTraining_Record; - - private EntitySet _PostTraining_Standard; - #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -286936,8 +287038,6 @@ namespace Model { this._PostTraining_Category = default(EntityRef); this._Sys_User = default(EntityRef); - this._PostTraining_Record = new EntitySet(new Action(this.attach_PostTraining_Record), new Action(this.detach_PostTraining_Record)); - this._PostTraining_Standard = new EntitySet(new Action(this.attach_PostTraining_Standard), new Action(this.detach_PostTraining_Standard)); OnCreated(); } @@ -287257,32 +287357,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_PostTraining_Course", Storage="_PostTraining_Record", ThisKey="Id", OtherKey="CourseId", DeleteRule="NO ACTION")] - public EntitySet PostTraining_Record - { - get - { - return this._PostTraining_Record; - } - set - { - this._PostTraining_Record.Assign(value); - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Standard_PostTraining_Course", Storage="_PostTraining_Standard", ThisKey="Id", OtherKey="CourseId", DeleteRule="NO ACTION")] - public EntitySet PostTraining_Standard - { - get - { - return this._PostTraining_Standard; - } - set - { - this._PostTraining_Standard.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -287302,30 +287376,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_PostTraining_Record(PostTraining_Record entity) - { - this.SendPropertyChanging(); - entity.PostTraining_Course = this; - } - - private void detach_PostTraining_Record(PostTraining_Record entity) - { - this.SendPropertyChanging(); - entity.PostTraining_Course = null; - } - - private void attach_PostTraining_Standard(PostTraining_Standard entity) - { - this.SendPropertyChanging(); - entity.PostTraining_Course = this; - } - - private void detach_PostTraining_Standard(PostTraining_Standard entity) - { - this.SendPropertyChanging(); - entity.PostTraining_Course = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Method")] @@ -287601,12 +287651,6 @@ namespace Model private EntitySet _PostTraining_Record_Detail; - private EntityRef _PostTraining_Category; - - private EntityRef _PostTraining_Course; - - private EntityRef _Sys_User; - #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -287657,9 +287701,6 @@ namespace Model { this._Base_Project = default(EntityRef); this._PostTraining_Record_Detail = new EntitySet(new Action(this.attach_PostTraining_Record_Detail), new Action(this.detach_PostTraining_Record_Detail)); - this._PostTraining_Category = default(EntityRef); - this._PostTraining_Course = default(EntityRef); - this._Sys_User = default(EntityRef); OnCreated(); } @@ -287778,10 +287819,6 @@ namespace Model { if ((this._CategoryId != value)) { - if (this._PostTraining_Category.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCategoryIdChanging(value); this.SendPropertyChanging(); this._CategoryId = value; @@ -287822,10 +287859,6 @@ namespace Model { if ((this._CourseId != value)) { - if (this._PostTraining_Course.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCourseIdChanging(value); this.SendPropertyChanging(); this._CourseId = value; @@ -288066,10 +288099,6 @@ namespace Model { if ((this._CompileMan != value)) { - if (this._Sys_User.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCompileManChanging(value); this.SendPropertyChanging(); this._CompileMan = value; @@ -288126,108 +288155,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_PostTraining_Category", Storage="_PostTraining_Category", ThisKey="CategoryId", OtherKey="Id", IsForeignKey=true)] - public PostTraining_Category PostTraining_Category - { - get - { - return this._PostTraining_Category.Entity; - } - set - { - PostTraining_Category previousValue = this._PostTraining_Category.Entity; - if (((previousValue != value) - || (this._PostTraining_Category.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._PostTraining_Category.Entity = null; - previousValue.PostTraining_Record.Remove(this); - } - this._PostTraining_Category.Entity = value; - if ((value != null)) - { - value.PostTraining_Record.Add(this); - this._CategoryId = value.Id; - } - else - { - this._CategoryId = default(string); - } - this.SendPropertyChanged("PostTraining_Category"); - } - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_PostTraining_Course", Storage="_PostTraining_Course", ThisKey="CourseId", OtherKey="Id", IsForeignKey=true)] - public PostTraining_Course PostTraining_Course - { - get - { - return this._PostTraining_Course.Entity; - } - set - { - PostTraining_Course previousValue = this._PostTraining_Course.Entity; - if (((previousValue != value) - || (this._PostTraining_Course.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._PostTraining_Course.Entity = null; - previousValue.PostTraining_Record.Remove(this); - } - this._PostTraining_Course.Entity = value; - if ((value != null)) - { - value.PostTraining_Record.Add(this); - this._CourseId = value.Id; - } - else - { - this._CourseId = default(string); - } - this.SendPropertyChanged("PostTraining_Course"); - } - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] - public Sys_User Sys_User - { - get - { - return this._Sys_User.Entity; - } - set - { - Sys_User previousValue = this._Sys_User.Entity; - if (((previousValue != value) - || (this._Sys_User.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Sys_User.Entity = null; - previousValue.PostTraining_Record.Remove(this); - } - this._Sys_User.Entity = value; - if ((value != null)) - { - value.PostTraining_Record.Add(this); - this._CompileMan = value.UserId; - } - else - { - this._CompileMan = default(string); - } - this.SendPropertyChanged("Sys_User"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -288665,10 +288592,6 @@ namespace Model private string _CompileMan; - private EntityRef _PostTraining_Course; - - private EntityRef _Sys_User; - #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -288701,8 +288624,6 @@ namespace Model public PostTraining_Standard() { - this._PostTraining_Course = default(EntityRef); - this._Sys_User = default(EntityRef); OnCreated(); } @@ -288777,10 +288698,6 @@ namespace Model { if ((this._CourseId != value)) { - if (this._PostTraining_Course.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCourseIdChanging(value); this.SendPropertyChanging(); this._CourseId = value; @@ -288941,10 +288858,6 @@ namespace Model { if ((this._CompileMan != value)) { - if (this._Sys_User.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCompileManChanging(value); this.SendPropertyChanging(); this._CompileMan = value; @@ -288954,74 +288867,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Standard_PostTraining_Course", Storage="_PostTraining_Course", ThisKey="CourseId", OtherKey="Id", IsForeignKey=true)] - public PostTraining_Course PostTraining_Course - { - get - { - return this._PostTraining_Course.Entity; - } - set - { - PostTraining_Course previousValue = this._PostTraining_Course.Entity; - if (((previousValue != value) - || (this._PostTraining_Course.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._PostTraining_Course.Entity = null; - previousValue.PostTraining_Standard.Remove(this); - } - this._PostTraining_Course.Entity = value; - if ((value != null)) - { - value.PostTraining_Standard.Add(this); - this._CourseId = value.Id; - } - else - { - this._CourseId = default(string); - } - this.SendPropertyChanged("PostTraining_Course"); - } - } - } - - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Standard_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] - public Sys_User Sys_User - { - get - { - return this._Sys_User.Entity; - } - set - { - Sys_User previousValue = this._Sys_User.Entity; - if (((previousValue != value) - || (this._Sys_User.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Sys_User.Entity = null; - previousValue.PostTraining_Standard.Remove(this); - } - this._Sys_User.Entity = value; - if ((value != null)) - { - value.PostTraining_Standard.Add(this); - this._CompileMan = value.UserId; - } - else - { - this._CompileMan = default(string); - } - this.SendPropertyChanged("Sys_User"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -289977,7 +289822,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(500)")] public string AcceptanceSite { get @@ -343517,6 +343362,12 @@ namespace Model private EntitySet _SitePerson_PersonInOut; + private EntitySet _Training_Task; + + private EntitySet _Training_TaskItem; + + private EntitySet _Training_TestRecord; + private EntitySet _Welder_WelderQualify; #region 鍙墿灞曟ф柟娉曞畾涔 @@ -343682,6 +343533,9 @@ namespace Model this._ProjectData_TeamGroup = default(EntityRef); this._Sys_User = default(EntityRef); this._SitePerson_PersonInOut = new EntitySet(new Action(this.attach_SitePerson_PersonInOut), new Action(this.detach_SitePerson_PersonInOut)); + this._Training_Task = new EntitySet(new Action(this.attach_Training_Task), new Action(this.detach_Training_Task)); + this._Training_TaskItem = new EntitySet(new Action(this.attach_Training_TaskItem), new Action(this.detach_Training_TaskItem)); + this._Training_TestRecord = new EntitySet(new Action(this.attach_Training_TestRecord), new Action(this.detach_Training_TestRecord)); this._Welder_WelderQualify = new EntitySet(new Action(this.attach_Welder_WelderQualify), new Action(this.detach_Welder_WelderQualify)); OnCreated(); } @@ -345511,6 +345365,45 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_Task_SitePerson_Person", Storage="_Training_Task", ThisKey="PersonId", OtherKey="UserId", DeleteRule="NO ACTION")] + public EntitySet Training_Task + { + get + { + return this._Training_Task; + } + set + { + this._Training_Task.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TaskItem_SitePerson_Person", Storage="_Training_TaskItem", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")] + public EntitySet Training_TaskItem + { + get + { + return this._Training_TaskItem; + } + set + { + this._Training_TaskItem.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestRecord_SitePerson_Person", Storage="_Training_TestRecord", ThisKey="PersonId", OtherKey="TestManId", DeleteRule="NO ACTION")] + public EntitySet Training_TestRecord + { + get + { + return this._Training_TestRecord; + } + set + { + this._Training_TestRecord.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Welder_WelderQualify_SitePerson_Person", Storage="_Welder_WelderQualify", ThisKey="PersonId", OtherKey="WelderId", DeleteRule="NO ACTION")] public EntitySet Welder_WelderQualify { @@ -345748,6 +345641,42 @@ namespace Model entity.SitePerson_Person = null; } + private void attach_Training_Task(Training_Task entity) + { + this.SendPropertyChanging(); + entity.SitePerson_Person = this; + } + + private void detach_Training_Task(Training_Task entity) + { + this.SendPropertyChanging(); + entity.SitePerson_Person = null; + } + + private void attach_Training_TaskItem(Training_TaskItem entity) + { + this.SendPropertyChanging(); + entity.SitePerson_Person = this; + } + + private void detach_Training_TaskItem(Training_TaskItem entity) + { + this.SendPropertyChanging(); + entity.SitePerson_Person = null; + } + + private void attach_Training_TestRecord(Training_TestRecord entity) + { + this.SendPropertyChanging(); + entity.SitePerson_Person = this; + } + + private void detach_Training_TestRecord(Training_TestRecord entity) + { + this.SendPropertyChanging(); + entity.SitePerson_Person = null; + } + private void attach_Welder_WelderQualify(Welder_WelderQualify entity) { this.SendPropertyChanging(); @@ -369928,6 +369857,562 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_Menu_0501")] + public partial class Sys_Menu_0501 : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MenuId; + + private string _MenuName; + + private string _Icon; + + private string _Url; + + private System.Nullable _SortIndex; + + private string _SuperMenu; + + private string _MenuType; + + private System.Nullable _IsOffice; + + private System.Nullable _IsEnd; + + private System.Nullable _IsUsed; + + #region 鍙墿灞曟ф柟娉曞畾涔 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMenuIdChanging(string value); + partial void OnMenuIdChanged(); + partial void OnMenuNameChanging(string value); + partial void OnMenuNameChanged(); + partial void OnIconChanging(string value); + partial void OnIconChanged(); + partial void OnUrlChanging(string value); + partial void OnUrlChanged(); + partial void OnSortIndexChanging(System.Nullable value); + partial void OnSortIndexChanged(); + partial void OnSuperMenuChanging(string value); + partial void OnSuperMenuChanged(); + partial void OnMenuTypeChanging(string value); + partial void OnMenuTypeChanged(); + partial void OnIsOfficeChanging(System.Nullable value); + partial void OnIsOfficeChanged(); + partial void OnIsEndChanging(System.Nullable value); + partial void OnIsEndChanged(); + partial void OnIsUsedChanging(System.Nullable value); + partial void OnIsUsedChanged(); + #endregion + + public Sys_Menu_0501() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MenuId + { + get + { + return this._MenuId; + } + set + { + if ((this._MenuId != value)) + { + this.OnMenuIdChanging(value); + this.SendPropertyChanging(); + this._MenuId = value; + this.SendPropertyChanged("MenuId"); + this.OnMenuIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(50)")] + public string MenuName + { + get + { + return this._MenuName; + } + set + { + if ((this._MenuName != value)) + { + this.OnMenuNameChanging(value); + this.SendPropertyChanging(); + this._MenuName = value; + this.SendPropertyChanged("MenuName"); + this.OnMenuNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Icon", DbType="NVarChar(50)")] + public string Icon + { + get + { + return this._Icon; + } + set + { + if ((this._Icon != value)) + { + this.OnIconChanging(value); + this.SendPropertyChanging(); + this._Icon = value; + this.SendPropertyChanged("Icon"); + this.OnIconChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(200)")] + public string Url + { + get + { + return this._Url; + } + set + { + if ((this._Url != value)) + { + this.OnUrlChanging(value); + this.SendPropertyChanging(); + this._Url = value; + this.SendPropertyChanged("Url"); + this.OnUrlChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] + public System.Nullable SortIndex + { + get + { + return this._SortIndex; + } + set + { + if ((this._SortIndex != value)) + { + this.OnSortIndexChanging(value); + this.SendPropertyChanging(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperMenu", DbType="NVarChar(50)")] + public string SuperMenu + { + get + { + return this._SuperMenu; + } + set + { + if ((this._SuperMenu != value)) + { + this.OnSuperMenuChanging(value); + this.SendPropertyChanging(); + this._SuperMenu = value; + this.SendPropertyChanged("SuperMenu"); + this.OnSuperMenuChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuType", DbType="NVarChar(50)")] + public string MenuType + { + get + { + return this._MenuType; + } + set + { + if ((this._MenuType != value)) + { + this.OnMenuTypeChanging(value); + this.SendPropertyChanging(); + this._MenuType = value; + this.SendPropertyChanged("MenuType"); + this.OnMenuTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOffice", DbType="Bit")] + public System.Nullable IsOffice + { + get + { + return this._IsOffice; + } + set + { + if ((this._IsOffice != value)) + { + this.OnIsOfficeChanging(value); + this.SendPropertyChanging(); + this._IsOffice = value; + this.SendPropertyChanged("IsOffice"); + this.OnIsOfficeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsEnd", DbType="Bit")] + public System.Nullable IsEnd + { + get + { + return this._IsEnd; + } + set + { + if ((this._IsEnd != value)) + { + this.OnIsEndChanging(value); + this.SendPropertyChanging(); + this._IsEnd = value; + this.SendPropertyChanged("IsEnd"); + this.OnIsEndChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUsed", DbType="Bit")] + public System.Nullable IsUsed + { + get + { + return this._IsUsed; + } + set + { + if ((this._IsUsed != value)) + { + this.OnIsUsedChanging(value); + this.SendPropertyChanging(); + this._IsUsed = value; + this.SendPropertyChanged("IsUsed"); + this.OnIsUsedChanged(); + } + } + } + + 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.Sys_Menu_0501t")] + public partial class Sys_Menu_0501t : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MenuId; + + private string _MenuName; + + private string _Icon; + + private string _Url; + + private System.Nullable _SortIndex; + + private string _SuperMenu; + + private string _MenuType; + + private System.Nullable _IsOffice; + + private System.Nullable _IsEnd; + + private System.Nullable _IsUsed; + + #region 鍙墿灞曟ф柟娉曞畾涔 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMenuIdChanging(string value); + partial void OnMenuIdChanged(); + partial void OnMenuNameChanging(string value); + partial void OnMenuNameChanged(); + partial void OnIconChanging(string value); + partial void OnIconChanged(); + partial void OnUrlChanging(string value); + partial void OnUrlChanged(); + partial void OnSortIndexChanging(System.Nullable value); + partial void OnSortIndexChanged(); + partial void OnSuperMenuChanging(string value); + partial void OnSuperMenuChanged(); + partial void OnMenuTypeChanging(string value); + partial void OnMenuTypeChanged(); + partial void OnIsOfficeChanging(System.Nullable value); + partial void OnIsOfficeChanged(); + partial void OnIsEndChanging(System.Nullable value); + partial void OnIsEndChanged(); + partial void OnIsUsedChanging(System.Nullable value); + partial void OnIsUsedChanged(); + #endregion + + public Sys_Menu_0501t() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MenuId + { + get + { + return this._MenuId; + } + set + { + if ((this._MenuId != value)) + { + this.OnMenuIdChanging(value); + this.SendPropertyChanging(); + this._MenuId = value; + this.SendPropertyChanged("MenuId"); + this.OnMenuIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(50)")] + public string MenuName + { + get + { + return this._MenuName; + } + set + { + if ((this._MenuName != value)) + { + this.OnMenuNameChanging(value); + this.SendPropertyChanging(); + this._MenuName = value; + this.SendPropertyChanged("MenuName"); + this.OnMenuNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Icon", DbType="NVarChar(50)")] + public string Icon + { + get + { + return this._Icon; + } + set + { + if ((this._Icon != value)) + { + this.OnIconChanging(value); + this.SendPropertyChanging(); + this._Icon = value; + this.SendPropertyChanged("Icon"); + this.OnIconChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(200)")] + public string Url + { + get + { + return this._Url; + } + set + { + if ((this._Url != value)) + { + this.OnUrlChanging(value); + this.SendPropertyChanging(); + this._Url = value; + this.SendPropertyChanged("Url"); + this.OnUrlChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] + public System.Nullable SortIndex + { + get + { + return this._SortIndex; + } + set + { + if ((this._SortIndex != value)) + { + this.OnSortIndexChanging(value); + this.SendPropertyChanging(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperMenu", DbType="NVarChar(50)")] + public string SuperMenu + { + get + { + return this._SuperMenu; + } + set + { + if ((this._SuperMenu != value)) + { + this.OnSuperMenuChanging(value); + this.SendPropertyChanging(); + this._SuperMenu = value; + this.SendPropertyChanged("SuperMenu"); + this.OnSuperMenuChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuType", DbType="NVarChar(50)")] + public string MenuType + { + get + { + return this._MenuType; + } + set + { + if ((this._MenuType != value)) + { + this.OnMenuTypeChanging(value); + this.SendPropertyChanging(); + this._MenuType = value; + this.SendPropertyChanged("MenuType"); + this.OnMenuTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOffice", DbType="Bit")] + public System.Nullable IsOffice + { + get + { + return this._IsOffice; + } + set + { + if ((this._IsOffice != value)) + { + this.OnIsOfficeChanging(value); + this.SendPropertyChanging(); + this._IsOffice = value; + this.SendPropertyChanged("IsOffice"); + this.OnIsOfficeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsEnd", DbType="Bit")] + public System.Nullable IsEnd + { + get + { + return this._IsEnd; + } + set + { + if ((this._IsEnd != value)) + { + this.OnIsEndChanging(value); + this.SendPropertyChanging(); + this._IsEnd = value; + this.SendPropertyChanged("IsEnd"); + this.OnIsEndChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUsed", DbType="Bit")] + public System.Nullable IsUsed + { + get + { + return this._IsUsed; + } + set + { + if ((this._IsUsed != value)) + { + this.OnIsUsedChanging(value); + this.SendPropertyChanging(); + this._IsUsed = value; + this.SendPropertyChanged("IsUsed"); + this.OnIsUsedChanged(); + } + } + } + + 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.Sys_MenuFlowOperate")] public partial class Sys_MenuFlowOperate : INotifyPropertyChanging, INotifyPropertyChanged { @@ -373207,12 +373692,8 @@ namespace Model private EntitySet _PostTraining_Method; - private EntitySet _PostTraining_Record; - private EntitySet _PostTraining_Role; - private EntitySet _PostTraining_Standard; - private EntitySet _PostTraining_Teachers; private EntitySet _ProcessControl_HotProessManage; @@ -373763,9 +374244,7 @@ namespace Model this._PostTraining_Category = new EntitySet(new Action(this.attach_PostTraining_Category), new Action(this.detach_PostTraining_Category)); this._PostTraining_Course = new EntitySet(new Action(this.attach_PostTraining_Course), new Action(this.detach_PostTraining_Course)); this._PostTraining_Method = new EntitySet(new Action(this.attach_PostTraining_Method), new Action(this.detach_PostTraining_Method)); - this._PostTraining_Record = new EntitySet(new Action(this.attach_PostTraining_Record), new Action(this.detach_PostTraining_Record)); this._PostTraining_Role = new EntitySet(new Action(this.attach_PostTraining_Role), new Action(this.detach_PostTraining_Role)); - this._PostTraining_Standard = new EntitySet(new Action(this.attach_PostTraining_Standard), new Action(this.detach_PostTraining_Standard)); this._PostTraining_Teachers = new EntitySet(new Action(this.attach_PostTraining_Teachers), new Action(this.detach_PostTraining_Teachers)); this._ProcessControl_HotProessManage = new EntitySet(new Action(this.attach_ProcessControl_HotProessManage), new Action(this.detach_ProcessControl_HotProessManage)); this._ProcessControl_InspectionManagement = new EntitySet(new Action(this.attach_ProcessControl_InspectionManagement), new Action(this.detach_ProcessControl_InspectionManagement)); @@ -378289,19 +378768,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_Sys_User", Storage="_PostTraining_Record", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] - public EntitySet PostTraining_Record - { - get - { - return this._PostTraining_Record; - } - set - { - this._PostTraining_Record.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Role_Sys_User", Storage="_PostTraining_Role", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet PostTraining_Role { @@ -378315,19 +378781,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Standard_Sys_User", Storage="_PostTraining_Standard", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] - public EntitySet PostTraining_Standard - { - get - { - return this._PostTraining_Standard; - } - set - { - this._PostTraining_Standard.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Teachers_Sys_User", Storage="_PostTraining_Teachers", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet PostTraining_Teachers { @@ -382600,18 +383053,6 @@ namespace Model entity.Sys_User = null; } - private void attach_PostTraining_Record(PostTraining_Record entity) - { - this.SendPropertyChanging(); - entity.Sys_User = this; - } - - private void detach_PostTraining_Record(PostTraining_Record entity) - { - this.SendPropertyChanging(); - entity.Sys_User = null; - } - private void attach_PostTraining_Role(PostTraining_Role entity) { this.SendPropertyChanging(); @@ -382624,18 +383065,6 @@ namespace Model entity.Sys_User = null; } - private void attach_PostTraining_Standard(PostTraining_Standard entity) - { - this.SendPropertyChanging(); - entity.Sys_User = this; - } - - private void detach_PostTraining_Standard(PostTraining_Standard entity) - { - this.SendPropertyChanging(); - entity.Sys_User = null; - } - private void attach_PostTraining_Teachers(PostTraining_Teachers entity) { this.SendPropertyChanging(); @@ -398914,12 +399343,12 @@ namespace Model private string _TestTrainingIds; - private System.Nullable _Durations; - private string _WorkPostNames; private System.Nullable _Outcome; + private System.Nullable _Durations; + private EntitySet _Person_TrainingTask; private EntityRef _Training_CompanyTraining; @@ -398948,12 +399377,12 @@ namespace Model partial void OnLearningTimeChanged(); partial void OnTestTrainingIdsChanging(string value); partial void OnTestTrainingIdsChanged(); - partial void OnDurationsChanging(System.Nullable value); - partial void OnDurationsChanged(); partial void OnWorkPostNamesChanging(string value); partial void OnWorkPostNamesChanged(); partial void OnOutcomeChanging(System.Nullable value); partial void OnOutcomeChanged(); + partial void OnDurationsChanging(System.Nullable value); + partial void OnDurationsChanged(); #endregion public Training_CompanyTrainingItem() @@ -399167,26 +399596,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Durations", DbType="Float")] - public System.Nullable Durations - { - get - { - return this._Durations; - } - set - { - if ((this._Durations != value)) - { - this.OnDurationsChanging(value); - this.SendPropertyChanging(); - this._Durations = value; - this.SendPropertyChanged("Durations"); - this.OnDurationsChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPostNames", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string WorkPostNames { @@ -399227,6 +399636,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Durations", DbType="Float")] + public System.Nullable Durations + { + get + { + return this._Durations; + } + set + { + if ((this._Durations != value)) + { + this.OnDurationsChanging(value); + this.SendPropertyChanging(); + this._Durations = value; + this.SendPropertyChanged("Durations"); + this.OnDurationsChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Person_TrainingTask_Training_CompanyTrainingItem", Storage="_Person_TrainingTask", ThisKey="CompanyTrainingItemId", OtherKey="CompanyTrainingItemId", DeleteRule="NO ACTION")] public EntitySet Person_TrainingTask { @@ -400009,6 +400438,8 @@ namespace Model private EntitySet _EduTrain_TrainRecord; + private EntityRef _Base_Project; + private EntityRef _Base_TrainLevel; private EntityRef _Base_TrainType; @@ -400084,6 +400515,7 @@ namespace Model public Training_Plan() { this._EduTrain_TrainRecord = new EntitySet(new Action(this.attach_EduTrain_TrainRecord), new Action(this.detach_EduTrain_TrainRecord)); + this._Base_Project = default(EntityRef); this._Base_TrainLevel = default(EntityRef); this._Base_TrainType = default(EntityRef); this._Sys_User = default(EntityRef); @@ -400125,6 +400557,10 @@ namespace Model { if ((this._ProjectId != value)) { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -400639,6 +401075,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_Plan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Training_Plan.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Training_Plan.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_Plan_Base_TrainLevel", Storage="_Base_TrainLevel", ThisKey="TrainLevelId", OtherKey="TrainLevelId", IsForeignKey=true)] public Base_TrainLevel Base_TrainLevel { @@ -401238,6 +401708,10 @@ namespace Model private string _States; + private EntityRef _Base_Project; + + private EntityRef _SitePerson_Person; + private EntityRef _Training_Plan; private EntitySet _Training_TaskItem; @@ -401262,6 +401736,8 @@ namespace Model public Training_Task() { + this._Base_Project = default(EntityRef); + this._SitePerson_Person = default(EntityRef); this._Training_Plan = default(EntityRef); this._Training_TaskItem = new EntitySet(new Action(this.attach_Training_TaskItem), new Action(this.detach_Training_TaskItem)); OnCreated(); @@ -401298,6 +401774,10 @@ namespace Model { if ((this._ProjectId != value)) { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -401342,6 +401822,10 @@ namespace Model { if ((this._UserId != value)) { + if (this._SitePerson_Person.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnUserIdChanging(value); this.SendPropertyChanging(); this._UserId = value; @@ -401391,6 +401875,74 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_Task_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Training_Task.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Training_Task.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_Task_SitePerson_Person", Storage="_SitePerson_Person", ThisKey="UserId", OtherKey="PersonId", IsForeignKey=true)] + public SitePerson_Person SitePerson_Person + { + get + { + return this._SitePerson_Person.Entity; + } + set + { + SitePerson_Person previousValue = this._SitePerson_Person.Entity; + if (((previousValue != value) + || (this._SitePerson_Person.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._SitePerson_Person.Entity = null; + previousValue.Training_Task.Remove(this); + } + this._SitePerson_Person.Entity = value; + if ((value != null)) + { + value.Training_Task.Add(this); + this._UserId = value.PersonId; + } + else + { + this._UserId = default(string); + } + this.SendPropertyChanged("SitePerson_Person"); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_Task_Training_Plan", Storage="_Training_Plan", ThisKey="PlanId", OtherKey="PlanId", IsForeignKey=true)] public Training_Plan Training_Plan { @@ -401501,6 +402053,8 @@ namespace Model private string _CompanyTrainingItemId; + private EntityRef _SitePerson_Person; + private EntityRef _Training_Plan; private EntityRef _Training_Task; @@ -401537,6 +402091,7 @@ namespace Model public Training_TaskItem() { + this._SitePerson_Person = default(EntityRef); this._Training_Plan = default(EntityRef); this._Training_Task = default(EntityRef); OnCreated(); @@ -401621,6 +402176,10 @@ namespace Model { if ((this._PersonId != value)) { + if (this._SitePerson_Person.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnPersonIdChanging(value); this.SendPropertyChanging(); this._PersonId = value; @@ -401790,6 +402349,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TaskItem_SitePerson_Person", Storage="_SitePerson_Person", ThisKey="PersonId", OtherKey="PersonId", IsForeignKey=true)] + public SitePerson_Person SitePerson_Person + { + get + { + return this._SitePerson_Person.Entity; + } + set + { + SitePerson_Person previousValue = this._SitePerson_Person.Entity; + if (((previousValue != value) + || (this._SitePerson_Person.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._SitePerson_Person.Entity = null; + previousValue.Training_TaskItem.Remove(this); + } + this._SitePerson_Person.Entity = value; + if ((value != null)) + { + value.Training_TaskItem.Add(this); + this._PersonId = value.PersonId; + } + else + { + this._PersonId = default(string); + } + this.SendPropertyChanged("SitePerson_Person"); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TaskItem_Training_Plan", Storage="_Training_Plan", ThisKey="PlanId", OtherKey="PlanId", IsForeignKey=true)] public Training_Plan Training_Plan { @@ -401935,6 +402528,8 @@ namespace Model private string _TrainTypeId; + private EntityRef _Base_Project; + private EntityRef _Sys_User; private EntityRef _Training_Plan; @@ -402001,6 +402596,7 @@ namespace Model public Training_TestPlan() { + this._Base_Project = default(EntityRef); this._Sys_User = default(EntityRef); this._Training_Plan = default(EntityRef); this._Training_TestPlanTraining = new EntitySet(new Action(this.attach_Training_TestPlanTraining), new Action(this.detach_Training_TestPlanTraining)); @@ -402039,6 +402635,10 @@ namespace Model { if ((this._ProjectId != value)) { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -402516,6 +403116,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Training_TestPlan.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Training_TestPlan.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestPlan_Sys_User", Storage="_Sys_User", ThisKey="PlanManId", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { @@ -402947,11 +403581,15 @@ namespace Model private int _Duration; + private string _CompanyTrainingItemId; + private string _Signature; private string _Fingerprint; - private string _CompanyTrainingItemId; + private EntityRef _Base_Project; + + private EntityRef _SitePerson_Person; private EntityRef _Training_TestPlan; @@ -402983,16 +403621,18 @@ namespace Model partial void OnIsFiledChanged(); partial void OnDurationChanging(int value); partial void OnDurationChanged(); + partial void OnCompanyTrainingItemIdChanging(string value); + partial void OnCompanyTrainingItemIdChanged(); partial void OnSignatureChanging(string value); partial void OnSignatureChanged(); partial void OnFingerprintChanging(string value); partial void OnFingerprintChanged(); - partial void OnCompanyTrainingItemIdChanging(string value); - partial void OnCompanyTrainingItemIdChanged(); #endregion public Training_TestRecord() { + this._Base_Project = default(EntityRef); + this._SitePerson_Person = default(EntityRef); this._Training_TestPlan = default(EntityRef); this._Training_TestRecordItem = new EntitySet(new Action(this.attach_Training_TestRecordItem), new Action(this.detach_Training_TestRecordItem)); OnCreated(); @@ -403029,6 +403669,10 @@ namespace Model { if ((this._ProjectId != value)) { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -403073,6 +403717,10 @@ namespace Model { if ((this._TestManId != value)) { + if (this._SitePerson_Person.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnTestManIdChanging(value); this.SendPropertyChanging(); this._TestManId = value; @@ -403222,6 +403870,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanyTrainingItemId", DbType="NVarChar(50)")] + public string CompanyTrainingItemId + { + get + { + return this._CompanyTrainingItemId; + } + set + { + if ((this._CompanyTrainingItemId != value)) + { + this.OnCompanyTrainingItemIdChanging(value); + this.SendPropertyChanging(); + this._CompanyTrainingItemId = value; + this.SendPropertyChanged("CompanyTrainingItemId"); + this.OnCompanyTrainingItemIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Signature", DbType="NVarChar(1000)")] public string Signature { @@ -403262,22 +403930,70 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanyTrainingItemId", DbType="NVarChar(50)")] - public string CompanyTrainingItemId + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestRecord_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project { get { - return this._CompanyTrainingItemId; + return this._Base_Project.Entity; } set { - if ((this._CompanyTrainingItemId != value)) + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) { - this.OnCompanyTrainingItemIdChanging(value); this.SendPropertyChanging(); - this._CompanyTrainingItemId = value; - this.SendPropertyChanged("CompanyTrainingItemId"); - this.OnCompanyTrainingItemIdChanged(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Training_TestRecord.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Training_TestRecord.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestRecord_SitePerson_Person", Storage="_SitePerson_Person", ThisKey="TestManId", OtherKey="PersonId", IsForeignKey=true)] + public SitePerson_Person SitePerson_Person + { + get + { + return this._SitePerson_Person.Entity; + } + set + { + SitePerson_Person previousValue = this._SitePerson_Person.Entity; + if (((previousValue != value) + || (this._SitePerson_Person.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._SitePerson_Person.Entity = null; + previousValue.Training_TestRecord.Remove(this); + } + this._SitePerson_Person.Entity = value; + if ((value != null)) + { + value.Training_TestRecord.Add(this); + this._TestManId = value.PersonId; + } + else + { + this._TestManId = default(string); + } + this.SendPropertyChanged("SitePerson_Person"); } } } @@ -418898,7 +419614,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(500)")] public string AcceptanceSite { get @@ -438584,7 +439300,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(500)")] public string AcceptanceSite { get @@ -454973,8 +455689,6 @@ namespace Model private string _WorkPostId; - private string _WorkPostName; - private System.Nullable _InTime; private System.Nullable _OutTime; @@ -455013,6 +455727,8 @@ namespace Model private string _WorkAreaName; + private string _WorkPostName; + private string _PositionName; private string _PostTitleName; @@ -455311,22 +456027,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPostName", DbType="NVarChar(100)")] - public string WorkPostName - { - get - { - return this._WorkPostName; - } - set - { - if ((this._WorkPostName != value)) - { - this._WorkPostName = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InTime", DbType="DateTime")] public System.Nullable InTime { @@ -455631,6 +456331,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPostName", DbType="NVarChar(100)")] + public string WorkPostName + { + get + { + return this._WorkPostName; + } + set + { + if ((this._WorkPostName != value)) + { + this._WorkPostName = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PositionName", DbType="NVarChar(50)")] public string PositionName { diff --git a/SGGL/Model/ModelProc.cs b/SGGL/Model/ModelProc.cs index 4ba8edc..71d6776 100644 --- a/SGGL/Model/ModelProc.cs +++ b/SGGL/Model/ModelProc.cs @@ -6,7 +6,7 @@ namespace Model using System.Reflection; using System; - public partial class SGGLDB : DataContext + public partial class CNPCDB : DataContext { /// diff --git a/SGGL/WebAPI/Controllers/BaseInfoController.cs b/SGGL/WebAPI/Controllers/BaseInfoController.cs index c750958..83baefd 100644 --- a/SGGL/WebAPI/Controllers/BaseInfoController.cs +++ b/SGGL/WebAPI/Controllers/BaseInfoController.cs @@ -297,7 +297,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString); + Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString); var getLists = (from x in db.InformationProject_Picture join y in db.AttachFile on x.PictureId equals y.ToKeyId where x.States == Const.State_2 && y.AttachUrl != null @@ -397,7 +397,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString); + Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString); string returnValue = string.Empty; var notice = (from x in db.InformationProject_Notice where x.IsRelease == true @@ -712,7 +712,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - var getTestRule = new Model.SGGLDB(Funs.ConnString).Sys_TestRule.FirstOrDefault(); + var getTestRule = new Model.CNPCDB(Funs.ConnString).Sys_TestRule.FirstOrDefault(); responeData.data = new { getTestRule }; } catch (Exception ex) diff --git a/SGGL/WebAPI/Controllers/DoorProject/DoorServerController.cs b/SGGL/WebAPI/Controllers/DoorProject/DoorServerController.cs index a6d3a51..9bcd41c 100644 --- a/SGGL/WebAPI/Controllers/DoorProject/DoorServerController.cs +++ b/SGGL/WebAPI/Controllers/DoorProject/DoorServerController.cs @@ -61,7 +61,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (department != null) { @@ -113,7 +113,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (employinfo != null) { @@ -222,7 +222,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (facerecord != null) { @@ -298,7 +298,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (validcardevent != null) { diff --git a/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs b/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs index c087b29..f4f4c05 100644 --- a/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs +++ b/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs @@ -48,7 +48,7 @@ namespace WebAPI.Controllers } if (!string.IsNullOrEmpty(projectId)) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int maxId = 0; var getmax = db.T_d_facerecord.Where(x => x.ProjectId == projectId && x.RoleID == "鐧藉悕鍗").Select(x => x.ID); @@ -151,7 +151,7 @@ namespace WebAPI.Controllers { if (person != null) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getProject = ProjectService.GetProjectByProjectCode(person.ProjectCode); if (getProject != null) @@ -379,7 +379,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode); if (getProject != null) @@ -425,7 +425,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode); if (getProject != null) diff --git a/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs b/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs index e7bd7da..218ec54 100644 --- a/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs +++ b/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs @@ -42,7 +42,7 @@ namespace WebAPI.Controllers } if (!string.IsNullOrEmpty(projectId)) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { int maxId = 0; var getmax = db.T_d_facerecord.Where(x => x.ProjectId == projectId && x.RoleID == "鐧藉悕鍗").Select(x => x.ID); @@ -146,7 +146,7 @@ namespace WebAPI.Controllers { if (person != null) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getProject = ProjectService.GetProjectByProjectCode(person.ProjectCode); if (getProject != null) diff --git a/SGGL/WebAPI/Controllers/EnvironmentalController.cs b/SGGL/WebAPI/Controllers/EnvironmentalController.cs index 7c0d112..23b1833 100644 --- a/SGGL/WebAPI/Controllers/EnvironmentalController.cs +++ b/SGGL/WebAPI/Controllers/EnvironmentalController.cs @@ -17,7 +17,7 @@ namespace WebAPI.Controllers ResponseData res = new ResponseData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Environmental_EnvironmentalMonitoring environment = new Environmental_EnvironmentalMonitoring(); environment.FileId = Guid.NewGuid().ToString(); diff --git a/SGGL/WebAPI/Controllers/FaceController.cs b/SGGL/WebAPI/Controllers/FaceController.cs index dc2a524..50d79b3 100644 --- a/SGGL/WebAPI/Controllers/FaceController.cs +++ b/SGGL/WebAPI/Controllers/FaceController.cs @@ -146,7 +146,7 @@ namespace WebAPI.Controllers else { string idCard = kqFace[0].user_id; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var person = db.SitePerson_Person.FirstOrDefault(u => u.IdentityCard == idCard && u.ProjectId == projectId); if (person != null) @@ -237,7 +237,7 @@ namespace WebAPI.Controllers } } } - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Sys_FaceRecordLog newLog = new Sys_FaceRecordLog { @@ -270,7 +270,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (facerecord != null) { @@ -348,7 +348,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (validcardevent != null) { diff --git a/SGGL/WebAPI/Controllers/HSSE/EquipmentQualityController.cs b/SGGL/WebAPI/Controllers/HSSE/EquipmentQualityController.cs index 89ddb4b..1b9dbe0 100644 --- a/SGGL/WebAPI/Controllers/HSSE/EquipmentQualityController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/EquipmentQualityController.cs @@ -132,7 +132,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - var getDataList = new Model.SGGLDB(Funs.ConnString).QualityAudit_EquipmentQuality.Where(x => x.ProjectId == projectId); + var getDataList = new Model.CNPCDB(Funs.ConnString).QualityAudit_EquipmentQuality.Where(x => x.ProjectId == projectId); if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId)) { getDataList = getDataList.Where(x => x.UnitId == unitId); @@ -170,7 +170,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).View_QualityAudit_EquipmentQuality + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).View_QualityAudit_EquipmentQuality where x.ProjectId == projectId select x; if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId)) diff --git a/SGGL/WebAPI/Controllers/HSSE/GeneralEquipmentQualityController.cs b/SGGL/WebAPI/Controllers/HSSE/GeneralEquipmentQualityController.cs index 3033513..efdf312 100644 --- a/SGGL/WebAPI/Controllers/HSSE/GeneralEquipmentQualityController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/GeneralEquipmentQualityController.cs @@ -111,7 +111,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - var getDataList = new Model.SGGLDB(Funs.ConnString).QualityAudit_GeneralEquipmentQuality.Where(x => x.ProjectId == projectId); + var getDataList = new Model.CNPCDB(Funs.ConnString).QualityAudit_GeneralEquipmentQuality.Where(x => x.ProjectId == projectId); if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId)) { getDataList = getDataList.Where(x => x.UnitId == unitId); diff --git a/SGGL/WebAPI/Controllers/HSSE/HSSEStandardsListController.cs b/SGGL/WebAPI/Controllers/HSSE/HSSEStandardsListController.cs index db49e63..b0a7736 100644 --- a/SGGL/WebAPI/Controllers/HSSE/HSSEStandardsListController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/HSSEStandardsListController.cs @@ -24,7 +24,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - responeData.data = from x in new Model.SGGLDB(Funs.ConnString).Law_HSSEStandardsList + responeData.data = from x in new Model.CNPCDB(Funs.ConnString).Law_HSSEStandardsList where x.StandardId == standardId select new { @@ -57,7 +57,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Law_HSSEStandardsList + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Law_HSSEStandardsList where x.TypeId == type && x.IsPass == true select x; int pageCount = q.Count(); @@ -100,7 +100,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Law_HSSEStandardsList + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Law_HSSEStandardsList where x.TypeId == type && x.IsPass == true select x; if (!string.IsNullOrEmpty(strParam)) diff --git a/SGGL/WebAPI/Controllers/HSSE/LawManageRuleController.cs b/SGGL/WebAPI/Controllers/HSSE/LawManageRuleController.cs index 3760d0d..09f0c11 100644 --- a/SGGL/WebAPI/Controllers/HSSE/LawManageRuleController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/LawManageRuleController.cs @@ -24,7 +24,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - responeData.data = from x in new Model.SGGLDB(Funs.ConnString).Law_ManageRule + responeData.data = from x in new Model.CNPCDB(Funs.ConnString).Law_ManageRule where x.ManageRuleId == manageRuleId && x.IsPass == true select new { @@ -59,7 +59,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Law_ManageRule + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Law_ManageRule where x.ManageRuleTypeId == type && x.IsPass == true select x; int pageCount = q.Count(); @@ -103,7 +103,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Law_ManageRule + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Law_ManageRule where x.ManageRuleTypeId == type && x.IsPass == true select x; if (!string.IsNullOrEmpty(strParam)) diff --git a/SGGL/WebAPI/Controllers/HSSE/LawRegulationListController.cs b/SGGL/WebAPI/Controllers/HSSE/LawRegulationListController.cs index 37e819a..1372cf4 100644 --- a/SGGL/WebAPI/Controllers/HSSE/LawRegulationListController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/LawRegulationListController.cs @@ -24,7 +24,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - responeData.data = from x in new Model.SGGLDB(Funs.ConnString).Law_LawRegulationList + responeData.data = from x in new Model.CNPCDB(Funs.ConnString).Law_LawRegulationList where x.LawRegulationId == lawRegulationId select new { @@ -59,7 +59,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Law_LawRegulationList + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Law_LawRegulationList where x.LawsRegulationsTypeId == type && x.IsPass == true select x; int pageCount = q.Count(); @@ -104,7 +104,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Law_LawRegulationList + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Law_LawRegulationList where x.LawsRegulationsTypeId == type && x.IsPass == true select x; if (!string.IsNullOrEmpty(strParam)) diff --git a/SGGL/WebAPI/Controllers/HSSE/LawRulesRegulationsController.cs b/SGGL/WebAPI/Controllers/HSSE/LawRulesRegulationsController.cs index 4acc80e..4d4d0b3 100644 --- a/SGGL/WebAPI/Controllers/HSSE/LawRulesRegulationsController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/LawRulesRegulationsController.cs @@ -24,7 +24,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - responeData.data = from x in new Model.SGGLDB(Funs.ConnString).Law_RulesRegulations + responeData.data = from x in new Model.CNPCDB(Funs.ConnString).Law_RulesRegulations where x.RulesRegulationsId == rulesRegulationsId select new { @@ -59,7 +59,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Law_RulesRegulations + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Law_RulesRegulations where x.RulesRegulationsTypeId == type && x.IsPass == true select x; int pageCount = q.Count(); @@ -103,7 +103,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Law_RulesRegulations + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Law_RulesRegulations where x.RulesRegulationsTypeId == type && x.IsPass == true select x; if (!string.IsNullOrEmpty(strParam)) diff --git a/SGGL/WebAPI/Controllers/HSSE/PageDataController.cs b/SGGL/WebAPI/Controllers/HSSE/PageDataController.cs index 9ccc41f..419832e 100644 --- a/SGGL/WebAPI/Controllers/HSSE/PageDataController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/PageDataController.cs @@ -24,7 +24,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString); + Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString); var getProject = ProjectService.GetProjectByProjectId(projectId); if (getProject != null) { diff --git a/SGGL/WebAPI/Controllers/HSSE/PauseNoticeController.cs b/SGGL/WebAPI/Controllers/HSSE/PauseNoticeController.cs index 571c02b..57e2641 100644 --- a/SGGL/WebAPI/Controllers/HSSE/PauseNoticeController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/PauseNoticeController.cs @@ -79,7 +79,7 @@ namespace WebAPI.Controllers try { //鎬绘暟 0寰呮彁浜わ紱1寰呯鍙戯紱2寰呮壒鍑嗭紱3寰呮帴鏀讹紱4宸查棴鐜 - var getDataList = new Model.SGGLDB(Funs.ConnString).Check_PauseNotice.Where(x => x.ProjectId == projectId && (x.UnitId == unitId || unitId == null)); + var getDataList = new Model.CNPCDB(Funs.ConnString).Check_PauseNotice.Where(x => x.ProjectId == projectId && (x.UnitId == unitId || unitId == null)); if (!string.IsNullOrEmpty(strParam)) { getDataList = getDataList.Where(x => x.PauseNoticeCode.Contains(strParam) || x.WrongContent.Contains(strParam) || x.PauseContent.Contains(strParam)); diff --git a/SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs b/SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs index 12bae09..08fcf30 100644 --- a/SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs @@ -52,7 +52,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString); + Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString); int tatalCount = 0, count1 = 0, count2 = 0, count3 = 0, count4 = 0; bool isSub = !(unitId == Const.UnitId_TCC); if (qualityType == "1") diff --git a/SGGL/WebAPI/Controllers/HSSE/ReceiveFileManagerController.cs b/SGGL/WebAPI/Controllers/HSSE/ReceiveFileManagerController.cs index d22989f..9f976e4 100644 --- a/SGGL/WebAPI/Controllers/HSSE/ReceiveFileManagerController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/ReceiveFileManagerController.cs @@ -128,7 +128,7 @@ namespace WebAPI.Controllers var getInfo = ReceiveFileManagerService.GetReceiveFileManagerById(receiveFileManagerId); if (getInfo != null && getInfo.FileType == "1") { - var getF = new Model.SGGLDB(Funs.ConnString).InformationProject_ReceiveFileManager.FirstOrDefault(x => x.FromId == getInfo.ReceiveFileManagerId); + var getF = new Model.CNPCDB(Funs.ConnString).InformationProject_ReceiveFileManager.FirstOrDefault(x => x.FromId == getInfo.ReceiveFileManagerId); if (getF == null) { ReceiveFileManagerService.IssueReceiveFile(getInfo.ReceiveFileManagerId); diff --git a/SGGL/WebAPI/Controllers/HSSE/ResourcesController.cs b/SGGL/WebAPI/Controllers/HSSE/ResourcesController.cs index b0fcdad..335d129 100644 --- a/SGGL/WebAPI/Controllers/HSSE/ResourcesController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/ResourcesController.cs @@ -326,7 +326,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - responeData.data = from x in new Model.SGGLDB(Funs.ConnString).Resources_SignManage + responeData.data = from x in new Model.CNPCDB(Funs.ConnString).Resources_SignManage where x.SignManageId == signManageId select new { @@ -341,7 +341,7 @@ namespace WebAPI.Controllers x.SignArea, x.SignType, x.SignImage, - AttachUrl = new Model.SGGLDB(Funs.ConnString).AttachFile.First(z=>z.ToKeyId ==x.SignManageId).AttachUrl.Replace('\\', '/') + AttachUrl = new Model.CNPCDB(Funs.ConnString).AttachFile.First(z=>z.ToKeyId ==x.SignManageId).AttachUrl.Replace('\\', '/') }; } catch (Exception ex) @@ -367,7 +367,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).Resources_SignManage + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).Resources_SignManage where x.SignType == type select x; if (!string.IsNullOrEmpty(strParam)) diff --git a/SGGL/WebAPI/Controllers/HSSE/ServerTestRecordController.cs b/SGGL/WebAPI/Controllers/HSSE/ServerTestRecordController.cs index a76a453..6b9d9eb 100644 --- a/SGGL/WebAPI/Controllers/HSSE/ServerTestRecordController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/ServerTestRecordController.cs @@ -196,7 +196,7 @@ namespace WebAPI.Controllers try { int mTime = 0; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTestRecord = db.Test_TestRecord.FirstOrDefault(x => x.TestRecordId == testRecordId); if (getTestRecord != null) diff --git a/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs b/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs index 71ada70..c327d89 100644 --- a/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs @@ -80,7 +80,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - var getTasks = new Model.SGGLDB(Funs.ConnString).Training_Task.FirstOrDefault(x => x.PlanId == trainingPlanId); + var getTasks = new Model.CNPCDB(Funs.ConnString).Training_Task.FirstOrDefault(x => x.PlanId == trainingPlanId); if (getTasks != null) { if (CommonService.IsMainUnitOrAdmin(userId)) @@ -193,7 +193,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - var getTestPlan = new Model.SGGLDB(Funs.ConnString).Training_TestPlan.FirstOrDefault(e => e.TestPlanId == testPlanId && e.States != "3" && e.TestStartTime <= DateTime.Now && e.TestEndTime >= DateTime.Now); + var getTestPlan = new Model.CNPCDB(Funs.ConnString).Training_TestPlan.FirstOrDefault(e => e.TestPlanId == testPlanId && e.States != "3" && e.TestStartTime <= DateTime.Now && e.TestEndTime >= DateTime.Now); if (getTestPlan != null) { var person = PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId); @@ -202,7 +202,7 @@ namespace WebAPI.Controllers //2-鑰冭瘯涓紱鐢熸垚鑰冭瘯璇曞嵎 if (getTestPlan.States == "2" ) { - var testRecord = new Model.SGGLDB(Funs.ConnString).Training_TestRecord.FirstOrDefault(x => x.TestPlanId == getTestPlan.TestPlanId && x.TestManId == person.PersonId && !x.TestEndTime.HasValue); + var testRecord = new Model.CNPCDB(Funs.ConnString).Training_TestRecord.FirstOrDefault(x => x.TestPlanId == getTestPlan.TestPlanId && x.TestManId == person.PersonId && !x.TestEndTime.HasValue); if (testRecord != null) { string testRecordId = APITestRecordService.CreateTestRecordItem(getTestPlan, testRecord.TestRecordId, person); @@ -215,7 +215,7 @@ namespace WebAPI.Controllers if (string.IsNullOrEmpty(getTestPlan.PlanId) && getTestPlan.UnitIds.Contains(person.UnitId) && (getTestPlan.WorkPostIds == null || getTestPlan.WorkPostIds.Contains(person.WorkPostId))) { //0-寰呮彁浜わ紱1-宸插彂甯冩湭鑰冭瘯 灏嗕汉鍛樻坊鍔犺繘鑰冭瘯璁板綍 - var testTRecord = new Model.SGGLDB(Funs.ConnString).Training_TestRecord.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TestManId == personId); + var testTRecord = new Model.CNPCDB(Funs.ConnString).Training_TestRecord.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TestManId == personId); if ((getTestPlan.States == "0" || getTestPlan.States == "1") && testTRecord == null && !string.IsNullOrEmpty(personId)) { Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord @@ -262,7 +262,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - var getTestPlan = new Model.SGGLDB(Funs.ConnString).Training_TestPlan.FirstOrDefault(e => e.TestPlanId == testPlanId); + var getTestPlan = new Model.CNPCDB(Funs.ConnString).Training_TestPlan.FirstOrDefault(e => e.TestPlanId == testPlanId); if (getTestPlan != null) { @@ -299,7 +299,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { var getCompanyTraining = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemCode == companyTrainingItemCode); if (getCompanyTraining != null) diff --git a/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs b/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs index ef06ef1..d7f2a1c 100644 --- a/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs @@ -97,7 +97,7 @@ namespace WebAPI.Controllers try { int mTime = 0; - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getTestRecord = db.Training_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecordId); if (getTestRecord != null) diff --git a/SGGL/WebAPI/Controllers/HomeController.cs b/SGGL/WebAPI/Controllers/HomeController.cs index 9daa9f4..8f1d43a 100644 --- a/SGGL/WebAPI/Controllers/HomeController.cs +++ b/SGGL/WebAPI/Controllers/HomeController.cs @@ -54,7 +54,7 @@ namespace WebAPI.Controllers // //} // //GpsPolygonHelper.isPointInPolygon(myLocation, gpsLoactions); // //string location = "108.61684,21.71513"; - // //using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + // //using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) // //{ // // var person = db.SitePerson_Person.Where(u => u.IdentityCard == "342401199502012298" && u.ProjectId == "59fe12ee-a986-4a60-b288-2c33a241dc28").FirstOrDefault(); // // if (person != null) @@ -168,7 +168,7 @@ namespace WebAPI.Controllers public ActionResult ZhuCeBaidu() { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var projectids = db.Base_Project.Where(p => p.IsFace == true).Select(p => p.ProjectId).ToList(); var SitePersonList = db.SitePerson_Person.Where(p => projectids.Contains(p.ProjectId) && p.PhotoUrl != null).ToList(); diff --git a/SGGL/WebAPI/Controllers/Person/PersonController.cs b/SGGL/WebAPI/Controllers/Person/PersonController.cs index 0ae71a2..20fb6a6 100644 --- a/SGGL/WebAPI/Controllers/Person/PersonController.cs +++ b/SGGL/WebAPI/Controllers/Person/PersonController.cs @@ -165,7 +165,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getViews = from x in db.SitePerson_Person where x.ProjectId == projectId && (strUnitId == null || x.UnitId == strUnitId) @@ -290,7 +290,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getDataList = db.View_QualityAudit_PersonQuality.Where(x => x.ProjectId == projectId && x.CertificateId != null); if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId)) @@ -417,7 +417,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (person != null && !string.IsNullOrEmpty(person.IdentityCard)) { @@ -483,7 +483,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { if (person != null && !string.IsNullOrEmpty(person.IdentityCard)) { @@ -958,7 +958,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { responeData.data = (from x in db.SitePerson_Person_Bak where x.ProjectId == projectId && x.InTime.HasValue && x.InTime < DateTime.Now @@ -995,7 +995,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var getPerson = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId); if (getPerson != null && !string.IsNullOrEmpty(type)) diff --git a/SGGL/WebAPI/Controllers/SYHSE/SYController.cs b/SGGL/WebAPI/Controllers/SYHSE/SYController.cs index 3601a91..82ab3b5 100644 --- a/SGGL/WebAPI/Controllers/SYHSE/SYController.cs +++ b/SGGL/WebAPI/Controllers/SYHSE/SYController.cs @@ -30,7 +30,7 @@ namespace WebAPI.Controllers.SYHSE var responeData = new Model.ResponeData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.SYHSEData_Promise promise = new SYHSEData_Promise(); promise.PromiseId = Guid.NewGuid().ToString(); @@ -70,7 +70,7 @@ namespace WebAPI.Controllers.SYHSE var responeData = new Model.ResponeData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.SYHSEData_Base dataBase = new SYHSEData_Base(); dataBase.Id = Guid.NewGuid().ToString(); @@ -111,7 +111,7 @@ namespace WebAPI.Controllers.SYHSE var responeData = new Model.ResponeData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.SYHSEData_MajorHazard hazard = new SYHSEData_MajorHazard(); hazard.Id = Guid.NewGuid().ToString(); @@ -164,7 +164,7 @@ namespace WebAPI.Controllers.SYHSE var responeData = new Model.ResponeData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.SYHSEData_HiddenDangers dangers = new SYHSEData_HiddenDangers(); dangers.Id = Guid.NewGuid().ToString(); @@ -253,7 +253,7 @@ namespace WebAPI.Controllers.SYHSE var responeData = new Model.ResponeData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.SYHSEData_Risk risk = db.SYHSEData_Risk.FirstOrDefault(x => x.RiskEvent == newItem.RiskEvent && x.ProjectId == newItem.ProjectId); if (risk == null) @@ -302,7 +302,7 @@ namespace WebAPI.Controllers.SYHSE var responeData = new Model.ResponeData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.SYHSEData_Licence dangers = new SYHSEData_Licence(); dangers.Id = Guid.NewGuid().ToString(); @@ -344,7 +344,7 @@ namespace WebAPI.Controllers.SYHSE var responeData = new Model.ResponeData(); try { - using (var db = new Model.SGGLDB(Funs.ConnString)) + using (var db = new Model.CNPCDB(Funs.ConnString)) { Model.SYHSEData_EnvironmentProtection dangers = new SYHSEData_EnvironmentProtection(); dangers.Id = Guid.NewGuid().ToString(); diff --git a/SGGL/WebAPI/Controllers/UnitController.cs b/SGGL/WebAPI/Controllers/UnitController.cs index 23fe9bf..9bd0ec8 100644 --- a/SGGL/WebAPI/Controllers/UnitController.cs +++ b/SGGL/WebAPI/Controllers/UnitController.cs @@ -142,7 +142,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - var getDataList = new Model.SGGLDB(Funs.ConnString).View_QualityAudit_SubUnitQuality.Where(x => x.ProjectId == projectId); + var getDataList = new Model.CNPCDB(Funs.ConnString).View_QualityAudit_SubUnitQuality.Where(x => x.ProjectId == projectId); //// 鎬绘暟 int tatalCount = getDataList.Count(); //// 杩囨湡 @@ -180,7 +180,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - IQueryable q = from x in new Model.SGGLDB(Funs.ConnString).View_QualityAudit_SubUnitQuality + IQueryable q = from x in new Model.CNPCDB(Funs.ConnString).View_QualityAudit_SubUnitQuality where x.ProjectId == projectId select x; if (type == "0") @@ -249,7 +249,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.Base_Unit newUnit = db.Base_Unit.FirstOrDefault(x => x.UnitCode == unit.UnitCode); if (newUnit == null) diff --git a/SGGL/WebAPI/Controllers/UserController.cs b/SGGL/WebAPI/Controllers/UserController.cs index 08238f9..aaa51dd 100644 --- a/SGGL/WebAPI/Controllers/UserController.cs +++ b/SGGL/WebAPI/Controllers/UserController.cs @@ -73,7 +73,7 @@ namespace WebAPI.Controllers }; try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var sysUser = db.Sys_User.FirstOrDefault(x => (x.Account == userInfo.Account || x.Telephone == userInfo.Telephone) && x.IsPost == true); if (sysUser != null) diff --git a/SGGL/WebAPI/Controllers/VehicleController.cs b/SGGL/WebAPI/Controllers/VehicleController.cs index 0c2faf6..6850f75 100644 --- a/SGGL/WebAPI/Controllers/VehicleController.cs +++ b/SGGL/WebAPI/Controllers/VehicleController.cs @@ -57,7 +57,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var vehicle = db.HSSE_Vehicle.FirstOrDefault(e => e.VehicleId == vehicleId); if (vehicle != null) @@ -85,7 +85,7 @@ namespace WebAPI.Controllers { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { Model.HSSE_VehicleInOut newInOut = new Model.HSSE_VehicleInOut {