fix bug

Server/Apis/Siger.ApiACC/Controllers/FixtureToolsController.cs

@@ -40,9 +40,17 @@ namespace Siger.ApiACC.Controllers
 
         public IActionResult GetPageList(string category, string code, string name, string state, int page, int pagesize, string toexcel)
         {
-            var data = _toolsRepository.GetPagedList(category.ToInt(), code, name, string.IsNullOrEmpty(state) ? -1 : state.ToInt(), ProjectId, page, pagesize, toexcel);
-            var list = new List<ResponseFixtureTools>();
             var categorys = _toolsCategoryRepository.GetList(q => q.projectId == ProjectId && q.status == (int)RowState.Valid).ToList();
+            var categoryIds = new List<int>();
+            if(category.ToInt() > 0)
+            {
+                var cate = categorys.FirstOrDefault(q => q.id == category.ToInt());
+                var sonCates = GetSonCategoryList(cate.guid, categorys);
+                categoryIds = sonCates.Select(q => q.id).ToList();
+                categoryIds.Add(category.ToInt());
+            }
+            var data = _toolsRepository.GetPagedList(categoryIds, code, name, string.IsNullOrEmpty(state) ? -1 : state.ToInt(), ProjectId, page, pagesize, toexcel);
+            var list = new List<ResponseFixtureTools>();            
             foreach(var item in data.Data)
             {
                 var cates = GetParentCategoryList(item.cate_guid, categorys);
@@ -258,7 +266,16 @@ namespace Siger.ApiACC.Controllers
         [HttpGet]
         public IActionResult GetCategoryPageList(string id, int page, int pagesize, string toexcel = "")
         {
-            var data = _toolsCategoryRepository.GetPagedList(id.ToInt(), ProjectId, page, pagesize, toexcel);
+            var categorys = _toolsCategoryRepository.GetList(q => q.projectId == ProjectId && q.status == (int)RowState.Valid).ToList();
+            var categoryIds = new List<int>();
+            if (id.ToInt() > 0)
+            {
+                var cate = categorys.FirstOrDefault(q => q.id == id.ToInt());
+                var sonCates = GetSonCategoryList(cate.guid, categorys);
+                categoryIds = sonCates.Select(q => q.id).ToList();
+                categoryIds.Add(id.ToInt());
+            }
+            var data = _toolsCategoryRepository.GetPagedList(categoryIds, ProjectId, page, pagesize, toexcel);
             if(toexcel.ToInt() == 1)
             {
                 return ExportCategoryExcel(data.Data);

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsCategoryRepository.cs

@@ -23,7 +23,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
             _context = context;
         }
 
-        public IPagedCollectionResult<ResponseFixtureToolsCategory> GetPagedList(int id, int projectid, int page, int pagesize, string toexcel = "")
+        public IPagedCollectionResult<ResponseFixtureToolsCategory> GetPagedList(List<int> id, int projectid, int page, int pagesize, string toexcel = "")
         {
             Expression<Func<ResponseFixtureToolsCategory, bool>> FunNum = f => true;
             var query = from q in _context.siger_automation_fixture_tools_category
@@ -41,9 +41,9 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             createtime = q.createtime.ToString(ParameterConstant.DateTimeFormat),
                             time = q.createtime
                         };
-            if (id > 0)
+            if (id.Any())
             {
-                FunNum = q => q.id == id;
+                FunNum = q => id.Contains(q.id);
             }
             if(toexcel.ToInt() == 1)
             {

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsRepository.cs

@@ -24,7 +24,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
             _context = context;
         }
 
-        public IPagedCollectionResult<ResponseFixtureTools> GetPagedList(int category, string code, string name, int state, 
+        public IPagedCollectionResult<ResponseFixtureTools> GetPagedList(List<int> category, string code, string name, int state, 
                 int projectid, int page, int pagesize, string toexcel = "")
         {
             var query = from q in _context.siger_automation_fixture_tools
@@ -53,9 +53,9 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : ""
                         };
             Expression<Func<ResponseFixtureTools, bool>> categoryExpression = f => true;
-            if (category > 0)
+            if (category.Any())
             {
-                categoryExpression = q => q.categoryid == category;
+                categoryExpression = q => category.Contains(q.categoryid);
             }
             Expression<Func<ResponseFixtureTools, bool>> codeExpression = f => true;
             if (!string.IsNullOrEmpty(code))

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationFixtureToolsCategoryRepository.cs

@@ -9,7 +9,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface
 {
     public interface IAutomationFixtureToolsCategoryRepository : IAccRepositoryBase<siger_automation_fixture_tools_category>
     {
-        IPagedCollectionResult<ResponseFixtureToolsCategory> GetPagedList(int id, int projectid, int page, int pagesize, string toexcel = "");
+        IPagedCollectionResult<ResponseFixtureToolsCategory> GetPagedList(List<int> id, int projectid, int page, int pagesize, string toexcel = "");
 
         CommonImportResult ImportData(IEnumerable<FixtureToolsCategoryTemplate> list, int projectid);
     }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationFixtureToolsRepository.cs

@@ -9,7 +9,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface
 {
     public interface IAutomationFixtureToolsRepository : IAccRepositoryBase<siger_automation_fixture_tools>
     {
-        IPagedCollectionResult<ResponseFixtureTools> GetPagedList(int category, string code, string name, int state,
+        IPagedCollectionResult<ResponseFixtureTools> GetPagedList(List<int> category, string code, string name, int state,
                 int projectid, int page, int pagesize, string toexcel = "");
 
         IEnumerable<ResponseFixtureTools> GetDataList(int categoryid, int projectid);

Server/Infrastructure/Repositories/Siger.Middlelayer.QmsRepository/Repositories/CheckSnTraceInspectionRepository.cs

@@ -58,7 +58,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
                                 sectionid = q.sectionid,
                                 sectionname = s.title ?? "",
                                 routeid = q.routeid,
-                                routename = r.name ?? "",
+                                routename = r.route_name ?? "",
                                 testroom = q.testroom,
                                 sn = q.sn,
                                 checktype = q.check_type,