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

This commit is contained in:
李鹏飞 2022-11-15 17:45:06 +08:00
parent 54e6fcfc20 419320e354
commit 0352866cea
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/API/HSSE/APIServerTestRecordService.cs
View File

@ -163,7 +163,7 @@ namespace BLL
{ {
if (getTestPlan.TestEndTime > DateTime.Now) if (getTestPlan.TestEndTime > DateTime.Now)
{ {
var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == getTestPlan.TestPlanId && x.UserType == testRecord.UserType); var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == getTestPlan.TestPlanId && (x.UserType == testRecord.UserType || x.UserType == null));
if (getTestPlanTraining.Count() > 0) if (getTestPlanTraining.Count() > 0)
{ {
int cout1 = getTestPlanTraining.Sum(x => x.TestType1Count ?? 0); int cout1 = getTestPlanTraining.Sum(x => x.TestType1Count ?? 0);
@ -294,7 +294,7 @@ namespace BLL
var item = db.Test_TestRecordItem.FirstOrDefault(x => x.TestRecordId == testRecordId); var item = db.Test_TestRecordItem.FirstOrDefault(x => x.TestRecordId == testRecordId);
if (item == null) if (item == null)
{ {
var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == testPlanId && x.UserType == getTestRecord.ManType); var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == testPlanId && (x.UserType == getTestRecord.ManType || x.UserType == null));
if (getTestPlanTraining.Count() > 0) if (getTestPlanTraining.Count() > 0)
{ {
List<Model.Training_TestTrainingItem> getTestTrainingItemList = new List<Model.Training_TestTrainingItem>(); List<Model.Training_TestTrainingItem> getTestTrainingItemList = new List<Model.Training_TestTrainingItem>();

2
SGGL/FineUIPro.Web/PersonManage/Test/TestPlanEdit.aspx
View File

@ -94,7 +94,7 @@
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:HiddenField runat="server" ID="hdTestPlanTrainingId"></f:HiddenField> <f:HiddenField runat="server" ID="hdTestPlanTrainingId"></f:HiddenField>
<f:DropDownList runat="server" ID="drpUserType" Label="人员" LabelWidth="90px"> <f:DropDownList runat="server" ID="drpUserType" Label="按人员类型" LabelWidth="90px" ShowRedStar="true">
<f:ListItem Text="管理人员" Value="1" /> <f:ListItem Text="管理人员" Value="1" />
<f:ListItem Text="临时用户" Value="2" /> <f:ListItem Text="临时用户" Value="2" />
<f:ListItem Text="作业人员" Value="3" /> <f:ListItem Text="作业人员" Value="3" />

4
SGGL/WebAPI/WebAPI.csproj
View File

@ -353,9 +353,9 @@
<WebProjectProperties> <WebProjectProperties>
<UseIIS>True</UseIIS> <UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort> <AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>7040</DevelopmentServerPort> <DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath> <DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:7040/</IISUrl> <IISUrl>http://localhost:3070/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication> <NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer> <UseCustomServer>False</UseCustomServer>
<CustomServerUrl> <CustomServerUrl>