lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据库变更CNPC_XJYJ

Browse Source
This commit is contained in:
夏菊
2025-08-04 18:04:41 +08:00
parent bafbf97359
commit 79a7f35e22
679 changed files with 5590 additions and 3465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/BaseInfoController.cs
+3 -3
View File
@@ -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)
SGGL/WebAPI/Controllers/DoorProject/DoorServerController.cs
+4 -4
View File
@@ -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)
{
SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs
+4 -4
View File
@@ -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)
SGGL/WebAPI/Controllers/DoorProject/uploadController.cs
+2 -2
View File
@@ -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)
SGGL/WebAPI/Controllers/EnvironmentalController.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace WebAPI.Controllers
ResponseData<string> res = new ResponseData<string>();
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();
SGGL/WebAPI/Controllers/FaceController.cs
+4 -4
View File
@@ -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)
{
SGGL/WebAPI/Controllers/HSSE/EquipmentQualityController.cs
+2 -2
View File
@@ -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<Model.View_QualityAudit_EquipmentQuality> q = from x in new Model.SGGLDB(Funs.ConnString).View_QualityAudit_EquipmentQuality
IQueryable<Model.View_QualityAudit_EquipmentQuality> q = from x in new Model.CNPCDB(Funs.ConnString).View_QualityAudit_EquipmentQuality
where x.ProjectId == projectId
select x;
if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId))
SGGL/WebAPI/Controllers/HSSE/GeneralEquipmentQualityController.cs
+1 -1
View File
@@ -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);
SGGL/WebAPI/Controllers/HSSE/HSSEStandardsListController.cs
+3 -3
View File
@@ -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<Model.Law_HSSEStandardsList> q = from x in new Model.SGGLDB(Funs.ConnString).Law_HSSEStandardsList
IQueryable<Model.Law_HSSEStandardsList> 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<Model.Law_HSSEStandardsList> q = from x in new Model.SGGLDB(Funs.ConnString).Law_HSSEStandardsList
IQueryable<Model.Law_HSSEStandardsList> q = from x in new Model.CNPCDB(Funs.ConnString).Law_HSSEStandardsList
where x.TypeId == type && x.IsPass == true
select x;
if (!string.IsNullOrEmpty(strParam))
SGGL/WebAPI/Controllers/HSSE/LawManageRuleController.cs
+3 -3
View File
@@ -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<Model.Law_ManageRule> q = from x in new Model.SGGLDB(Funs.ConnString).Law_ManageRule
IQueryable<Model.Law_ManageRule> 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<Model.Law_ManageRule> q = from x in new Model.SGGLDB(Funs.ConnString).Law_ManageRule
IQueryable<Model.Law_ManageRule> q = from x in new Model.CNPCDB(Funs.ConnString).Law_ManageRule
where x.ManageRuleTypeId == type && x.IsPass == true
select x;
if (!string.IsNullOrEmpty(strParam))
SGGL/WebAPI/Controllers/HSSE/LawRegulationListController.cs
+3 -3
View File
@@ -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<Model.Law_LawRegulationList> q = from x in new Model.SGGLDB(Funs.ConnString).Law_LawRegulationList
IQueryable<Model.Law_LawRegulationList> 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<Model.Law_LawRegulationList> q = from x in new Model.SGGLDB(Funs.ConnString).Law_LawRegulationList
IQueryable<Model.Law_LawRegulationList> q = from x in new Model.CNPCDB(Funs.ConnString).Law_LawRegulationList
where x.LawsRegulationsTypeId == type && x.IsPass == true
select x;
if (!string.IsNullOrEmpty(strParam))
SGGL/WebAPI/Controllers/HSSE/LawRulesRegulationsController.cs
+3 -3
View File
@@ -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<Model.Law_RulesRegulations> q = from x in new Model.SGGLDB(Funs.ConnString).Law_RulesRegulations
IQueryable<Model.Law_RulesRegulations> 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<Model.Law_RulesRegulations> q = from x in new Model.SGGLDB(Funs.ConnString).Law_RulesRegulations
IQueryable<Model.Law_RulesRegulations> q = from x in new Model.CNPCDB(Funs.ConnString).Law_RulesRegulations
where x.RulesRegulationsTypeId == type && x.IsPass == true
select x;
if (!string.IsNullOrEmpty(strParam))
SGGL/WebAPI/Controllers/HSSE/PageDataController.cs
+1 -1
View File
@@ -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)
{
SGGL/WebAPI/Controllers/HSSE/PauseNoticeController.cs
+1 -1
View File
@@ -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));
SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs
+1 -1
View File
@@ -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")
SGGL/WebAPI/Controllers/HSSE/ReceiveFileManagerController.cs
+1 -1
View File
@@ -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);
SGGL/WebAPI/Controllers/HSSE/ResourcesController.cs
+3 -3
View File
@@ -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<Model.Resources_SignManage> q = from x in new Model.SGGLDB(Funs.ConnString).Resources_SignManage
IQueryable<Model.Resources_SignManage> q = from x in new Model.CNPCDB(Funs.ConnString).Resources_SignManage
where x.SignType == type
select x;
if (!string.IsNullOrEmpty(strParam))
SGGL/WebAPI/Controllers/HSSE/ServerTestRecordController.cs
+1 -1
View File
@@ -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)
SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
+6 -6
View File
@@ -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)
SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
+1 -1
View File
@@ -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)
SGGL/WebAPI/Controllers/HomeController.cs
+2 -2
View File
@@ -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();
SGGL/WebAPI/Controllers/Person/PersonController.cs
+6 -6
View File
@@ -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))
SGGL/WebAPI/Controllers/SYHSE/SYController.cs
+7 -7
View File
@@ -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();
SGGL/WebAPI/Controllers/UnitController.cs
+3 -3
View File
@@ -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<Model.View_QualityAudit_SubUnitQuality> q = from x in new Model.SGGLDB(Funs.ConnString).View_QualityAudit_SubUnitQuality
IQueryable<Model.View_QualityAudit_SubUnitQuality> 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)
SGGL/WebAPI/Controllers/UserController.cs
+1 -1
View File
@@ -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)
SGGL/WebAPI/Controllers/VehicleController.cs
+2 -2
View File
@@ -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
{