lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2024-03-11 23:25:20 +08:00
parent 60e1677254 d03c9a0e00
commit f6dee3c033
17 changed files with 573 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIPersonService.cs
+2 -2
View File
@@ -61,7 +61,7 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.PersonItem person = new Model.PersonItem();
var getProjectPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == sitePersonId || (x.ProjectId == projectId && x.IdentityCard == idcard));
var getProjectPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == sitePersonId || (x.ProjectId == projectId && x.ProjectId.Length > 1 && x.IdentityCard == idcard));
if (getProjectPerson != null)
{
person.SitePersonId = getProjectPerson.SitePersonId;
@@ -135,7 +135,7 @@ namespace BLL
person.AttachUrl4 = getAttachUrl4(getProjectPerson.PersonId);
person.AttachUrl5 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#5", null);
}
var getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == idcard);
var getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == idcard && idcard.Length > 1);
if (getPerson != null)
{
person.PersonId = getPerson.PersonId;
SGGL/BLL/BLL.csproj
+5 -10
View File
@@ -70,9 +70,13 @@
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@@ -846,15 +850,6 @@
<WCFMetadataStorage Include="Service References\OAWebService\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>
SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs
+18 -16
View File
@@ -76,24 +76,26 @@ namespace BLL
/// <param name="SpotCheckDetail"></param>
public static void UpdateSpotCheckDetail(Model.Check_SpotCheckDetail SpotCheckDetail)
{
Model.SGGLDB db = Funs.DB;
Model.Check_SpotCheckDetail newSpotCheckDetail = db.Check_SpotCheckDetail.FirstOrDefault(e => e.SpotCheckDetailId == SpotCheckDetail.SpotCheckDetailId);
if (newSpotCheckDetail != null)
using (var db = new Model.SGGLDB(Funs.ConnString))
{
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(null, SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
newSpotCheckDetail.RectifyDescription = SpotCheckDetail.RectifyDescription;
newSpotCheckDetail.IsDataOK = SpotCheckDetail.IsDataOK;
newSpotCheckDetail.DataConfirmDate = SpotCheckDetail.DataConfirmDate;
newSpotCheckDetail.State = SpotCheckDetail.State;
newSpotCheckDetail.HandleMan = SpotCheckDetail.HandleMan;
newSpotCheckDetail.IsShow = SpotCheckDetail.IsShow;
Model.Check_SpotCheckDetail newSpotCheckDetail = db.Check_SpotCheckDetail.FirstOrDefault(e => e.SpotCheckDetailId == SpotCheckDetail.SpotCheckDetailId);
if (newSpotCheckDetail != null)
{
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(null, SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
newSpotCheckDetail.RectifyDescription = SpotCheckDetail.RectifyDescription;
newSpotCheckDetail.IsDataOK = SpotCheckDetail.IsDataOK;
newSpotCheckDetail.DataConfirmDate = SpotCheckDetail.DataConfirmDate;
newSpotCheckDetail.State = SpotCheckDetail.State;
newSpotCheckDetail.HandleMan = SpotCheckDetail.HandleMan;
newSpotCheckDetail.IsShow = SpotCheckDetail.IsShow;
db.SubmitChanges();
db.SubmitChanges();
}
}
}
SGGL/BLL/CQMS/Check/SpotCheckService.cs
+22 -20
View File
@@ -76,27 +76,29 @@ namespace BLL
/// <param name="SpotCheck"></param>
public static void UpdateSpotCheck(Model.Check_SpotCheck SpotCheck)
{
Model.SGGLDB db = Funs.DB;
Model.Check_SpotCheck newSpotCheck = db.Check_SpotCheck.First(e => e.SpotCheckCode == SpotCheck.SpotCheckCode);
newSpotCheck.DocCode = SpotCheck.DocCode;
newSpotCheck.UnitId = SpotCheck.UnitId;
newSpotCheck.CheckDateType = SpotCheck.CheckDateType;
newSpotCheck.SpotCheckDate = SpotCheck.SpotCheckDate;
newSpotCheck.SpotCheckDate2 = SpotCheck.SpotCheckDate2;
newSpotCheck.CheckArea = SpotCheck.CheckArea;
newSpotCheck.IsOK = SpotCheck.IsOK;
newSpotCheck.JointCheckMans = SpotCheck.JointCheckMans;
newSpotCheck.JointCheckMans2 = SpotCheck.JointCheckMans2;
newSpotCheck.JointCheckMans3 = SpotCheck.JointCheckMans3;
newSpotCheck.CNProfessionalCode = SpotCheck.CNProfessionalCode;
newSpotCheck.AttachUrl = SpotCheck.AttachUrl;
newSpotCheck.State = SpotCheck.State;
newSpotCheck.ControlPointType = SpotCheck.ControlPointType;
newSpotCheck.State2 = SpotCheck.State2;
newSpotCheck.IsShow = SpotCheck.IsShow;
newSpotCheck.SaveHandleMan = SpotCheck.SaveHandleMan;
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.Check_SpotCheck newSpotCheck = db.Check_SpotCheck.First(e => e.SpotCheckCode == SpotCheck.SpotCheckCode);
newSpotCheck.DocCode = SpotCheck.DocCode;
newSpotCheck.UnitId = SpotCheck.UnitId;
newSpotCheck.CheckDateType = SpotCheck.CheckDateType;
newSpotCheck.SpotCheckDate = SpotCheck.SpotCheckDate;
newSpotCheck.SpotCheckDate2 = SpotCheck.SpotCheckDate2;
newSpotCheck.CheckArea = SpotCheck.CheckArea;
newSpotCheck.IsOK = SpotCheck.IsOK;
newSpotCheck.JointCheckMans = SpotCheck.JointCheckMans;
newSpotCheck.JointCheckMans2 = SpotCheck.JointCheckMans2;
newSpotCheck.JointCheckMans3 = SpotCheck.JointCheckMans3;
newSpotCheck.CNProfessionalCode = SpotCheck.CNProfessionalCode;
newSpotCheck.AttachUrl = SpotCheck.AttachUrl;
newSpotCheck.State = SpotCheck.State;
newSpotCheck.ControlPointType = SpotCheck.ControlPointType;
newSpotCheck.State2 = SpotCheck.State2;
newSpotCheck.IsShow = SpotCheck.IsShow;
newSpotCheck.SaveHandleMan = SpotCheck.SaveHandleMan;
db.SubmitChanges();
db.SubmitChanges();
}
}
/// <summary>
SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs
+55 -51
View File
@@ -43,33 +43,35 @@ namespace BLL
/// <param name="ControlItemAndCycle"></param>
public static void AddControlItemAndCycle(Model.WBS_ControlItemAndCycle ControlItemAndCycle)
{
Model.SGGLDB db = Funs.DB;
Model.WBS_ControlItemAndCycle newControlItemAndCycle = new Model.WBS_ControlItemAndCycle();
//string newKeyID = SQLHelper.GetNewID(typeof(Model.WBS_ControlItemAndCycle));
newControlItemAndCycle.ControlItemAndCycleId = ControlItemAndCycle.ControlItemAndCycleId;
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.WorkPackageIds = WorkPackageService.getWorkPageIdsByControlItemAndCycle(ControlItemAndCycle.WorkPackageId, ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ProjectId = ControlItemAndCycle.ProjectId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.IsSelected = ControlItemAndCycle.IsSelected;
newControlItemAndCycle.IsApprove = ControlItemAndCycle.IsApprove;
newControlItemAndCycle.AttachUrl = ControlItemAndCycle.AttachUrl;
newControlItemAndCycle.Weights = ControlItemAndCycle.Weights;
newControlItemAndCycle.HGForms = ControlItemAndCycle.HGForms;
newControlItemAndCycle.SHForms = ControlItemAndCycle.SHForms;
newControlItemAndCycle.Standard = ControlItemAndCycle.Standard;
newControlItemAndCycle.ClauseNo = ControlItemAndCycle.ClauseNo;
newControlItemAndCycle.CheckNum = ControlItemAndCycle.CheckNum;
newControlItemAndCycle.InitControlItemCode = ControlItemAndCycle.InitControlItemCode;
newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate;
newControlItemAndCycle.Costs = ControlItemAndCycle.Costs;
newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType;
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.WBS_ControlItemAndCycle newControlItemAndCycle = new Model.WBS_ControlItemAndCycle();
//string newKeyID = SQLHelper.GetNewID(typeof(Model.WBS_ControlItemAndCycle));
newControlItemAndCycle.ControlItemAndCycleId = ControlItemAndCycle.ControlItemAndCycleId;
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.WorkPackageIds = WorkPackageService.getWorkPageIdsByControlItemAndCycle(ControlItemAndCycle.WorkPackageId, ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ProjectId = ControlItemAndCycle.ProjectId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.IsSelected = ControlItemAndCycle.IsSelected;
newControlItemAndCycle.IsApprove = ControlItemAndCycle.IsApprove;
newControlItemAndCycle.AttachUrl = ControlItemAndCycle.AttachUrl;
newControlItemAndCycle.Weights = ControlItemAndCycle.Weights;
newControlItemAndCycle.HGForms = ControlItemAndCycle.HGForms;
newControlItemAndCycle.SHForms = ControlItemAndCycle.SHForms;
newControlItemAndCycle.Standard = ControlItemAndCycle.Standard;
newControlItemAndCycle.ClauseNo = ControlItemAndCycle.ClauseNo;
newControlItemAndCycle.CheckNum = ControlItemAndCycle.CheckNum;
newControlItemAndCycle.InitControlItemCode = ControlItemAndCycle.InitControlItemCode;
newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate;
newControlItemAndCycle.Costs = ControlItemAndCycle.Costs;
newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType;
db.WBS_ControlItemAndCycle.InsertOnSubmit(newControlItemAndCycle);
db.SubmitChanges();
db.WBS_ControlItemAndCycle.InsertOnSubmit(newControlItemAndCycle);
db.SubmitChanges();
}
}
/// <summary>
@@ -78,32 +80,34 @@ namespace BLL
/// <param name="ControlItemAndCycle"></param>
public static void UpdateControlItemAndCycle(Model.WBS_ControlItemAndCycle ControlItemAndCycle)
{
Model.SGGLDB db = Funs.DB;
Model.WBS_ControlItemAndCycle newControlItemAndCycle = db.WBS_ControlItemAndCycle.First(e => e.ControlItemAndCycleId == ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.IsSelected = ControlItemAndCycle.IsSelected;
newControlItemAndCycle.IsApprove = ControlItemAndCycle.IsApprove;
newControlItemAndCycle.AttachUrl = ControlItemAndCycle.AttachUrl;
newControlItemAndCycle.Weights = ControlItemAndCycle.Weights;
newControlItemAndCycle.HGForms = ControlItemAndCycle.HGForms;
newControlItemAndCycle.SHForms = ControlItemAndCycle.SHForms;
newControlItemAndCycle.Standard = ControlItemAndCycle.Standard;
newControlItemAndCycle.ClauseNo = ControlItemAndCycle.ClauseNo;
newControlItemAndCycle.CheckNum = ControlItemAndCycle.CheckNum;
newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate;
newControlItemAndCycle.Costs = ControlItemAndCycle.Costs;
newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType;
newControlItemAndCycle.RealEndDate = ControlItemAndCycle.RealEndDate;
newControlItemAndCycle.PlanCost = ControlItemAndCycle.PlanCost;
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.WBS_ControlItemAndCycle newControlItemAndCycle = db.WBS_ControlItemAndCycle.First(e => e.ControlItemAndCycleId == ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.IsSelected = ControlItemAndCycle.IsSelected;
newControlItemAndCycle.IsApprove = ControlItemAndCycle.IsApprove;
newControlItemAndCycle.AttachUrl = ControlItemAndCycle.AttachUrl;
newControlItemAndCycle.Weights = ControlItemAndCycle.Weights;
newControlItemAndCycle.HGForms = ControlItemAndCycle.HGForms;
newControlItemAndCycle.SHForms = ControlItemAndCycle.SHForms;
newControlItemAndCycle.Standard = ControlItemAndCycle.Standard;
newControlItemAndCycle.ClauseNo = ControlItemAndCycle.ClauseNo;
newControlItemAndCycle.CheckNum = ControlItemAndCycle.CheckNum;
newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate;
newControlItemAndCycle.Costs = ControlItemAndCycle.Costs;
newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType;
newControlItemAndCycle.RealEndDate = ControlItemAndCycle.RealEndDate;
newControlItemAndCycle.PlanCost = ControlItemAndCycle.PlanCost;
db.SubmitChanges();
db.SubmitChanges();
}
}
/// <summary>