Commit ec6ca0ab by xin.yang

some update

parent 0c7bd868
...@@ -356,9 +356,9 @@ namespace Siger.ApiACC.Controllers ...@@ -356,9 +356,9 @@ namespace Siger.ApiACC.Controllers
[HttpGet] [HttpGet]
public IActionResult GetFixtureToolList() public IActionResult GetFixtureToolList(string categoryid)
{ {
var list = _toolsRepository.GetDataList(ProjectId); var list = _toolsRepository.GetDataList(categoryid.ToInt(), ProjectId);
return new ObjectResult(list); return new ObjectResult(list);
} }
} }
......
...@@ -76,7 +76,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories ...@@ -76,7 +76,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
} }
public IEnumerable<ResponseFixtureTools> GetDataList(int projectid) public IEnumerable<ResponseFixtureTools> GetDataList(int categoryid, int projectid)
{ {
var query = from q in _context.siger_automation_fixture_tools var query = from q in _context.siger_automation_fixture_tools
join p in _context.siger_automation_fixture_tools_category on q.category equals p.guid join p in _context.siger_automation_fixture_tools_category on q.category equals p.guid
...@@ -98,6 +98,10 @@ namespace Siger.Middlelayer.AccRepository.Repositories ...@@ -98,6 +98,10 @@ namespace Siger.Middlelayer.AccRepository.Repositories
status = q.status, status = q.status,
updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : "" updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : ""
}; };
if (categoryid > 0)
{
query = query.Where(q => q.categoryid == categoryid);
}
var entities = query.OrderByDescending(q => q.id).AsNoTracking().ToList(); var entities = query.OrderByDescending(q => q.id).AsNoTracking().ToList();
return entities; return entities;
} }
......
...@@ -11,7 +11,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface ...@@ -11,7 +11,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface
IPagedCollectionResult<ResponseFixtureTools> GetPagedList(int category, string code, string name, int state, IPagedCollectionResult<ResponseFixtureTools> GetPagedList(int category, string code, string name, int state,
int projectid, int page, int pagesize); int projectid, int page, int pagesize);
IEnumerable<ResponseFixtureTools> GetDataList(int projectid); IEnumerable<ResponseFixtureTools> GetDataList(int categoryid, int projectid);
ResponseProductFixtureInfo GetProductFixtureLocation(int projectId, string guid); ResponseProductFixtureInfo GetProductFixtureLocation(int projectId, string guid);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment