gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gaofei:f4767c7713d50582beb4416af400f667fbea167f
Branches Tags
gaofei:master
..
compare: gaofei:bb6197e0844545c366c467753f3f9390b19bd987
Branches Tags
gaofei:master

No commits in common. "f4767c7713d50582beb4416af400f667fbea167f" and "bb6197e0844545c366c467753f3f9390b19bd987" have entirely different histories.
f4767c7713 ... bb6197e084

3 changed files with 8 additions and 13 deletions
Show Stats Expand all files Collapse all files

13
HJGL_DS/BLL/API/APIWeldServices.cs
View File

@ -407,21 +407,16 @@ namespace BLL.API
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
public static Model.ResponeData getProjectWelder(string projectId, string unitId, string date)
public static Model.ResponeData getProjectWelder(string projectId)
{
Model.ResponeData respone = new ResponeData();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
DateTime dateTime =DateTime.Parse("1000-10-10");
if (!string.IsNullOrEmpty(date) && date != "null")
{
dateTime = DateTime.Parse(date);
}
var q = from pw in db.Project_Welder
join w in db.HJGL_BS_Welder on pw.WED_ID equals w.WED_ID
where w.PhotoUrl !=null && pw.ExchangeTime > dateTime
join w in db.HJGL_BS_Welder on pw.WED_ID equals w.WED_ID
where pw.ProjectId == projectId
where w.PhotoUrl !=null && pw.ExchangeTime ==null
select w;
List<WelderItem> res = new List<WelderItem>();
foreach (var p in q)
{

2
HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
View File

@ -415,7 +415,7 @@
var pw = Funs.DB.Project_Welder.Where(x => x.WED_ID == WED_ID);
foreach(var w in pw)
{
w.ExchangeTime = DateTime.Now;
w.ExchangeTime = null;
}
Funs.DB.SubmitChanges();
Alert.ShowInParent(PersonFace(welder), MessageBoxIcon.Warning);

6
HJGL_DS/WebAPI/Controllers/WeldController.cs
View File

@ -179,14 +179,15 @@ namespace WebAPI.Controllers
}
[HttpGet]
public Model.ResponeData getProjectWelder(string projectId, string unitId, string date)
public Model.ResponeData getProjectWelder(string projectId)
{
Model.ResponeData respone = new ResponeData();
try
{
return APIWeldServices.getProjectWelder(projectId, unitId, date);
return APIWeldServices.getProjectWelder(projectId);
}
catch (Exception e)
{
@ -195,7 +196,6 @@ namespace WebAPI.Controllers
}
return respone;
}
[HttpGet]
public Model.ResponeData getUpdateWelderExchangeTime(string wedId,string projectId)
{