diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs index 1d47f44..47b0d8e 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs @@ -96,7 +96,8 @@ namespace APT.BS.WebApi.Controllers.Api } //wyw1114 expression && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == DEPARTMENT_ID - Expression> expression = e => e.RISK_AREA_ID == RISK_AREA_ID && e.CHECK_TYPE_LEVEL_ID == CHECK_TYPE_LEVEL_ID && e.CHECK_PROJECT_ID == CHECK_PROJECT_ID && e.CHECK_PROJECT_CATEGORY_ID == CHECK_PROJECT_CATEGORY_ID && e.CHECKCONTENT == CHECKCONTENT && !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.CHECK_QUESTION_ID.HasValue; + // && e.CHECK_PROJECT_CATEGORY_ID == CHECK_PROJECT_CATEGORY_ID + Expression> expression = e => e.RISK_AREA_ID == RISK_AREA_ID && e.CHECK_TYPE_LEVEL_ID == CHECK_TYPE_LEVEL_ID && e.CHECK_PROJECT_ID == CHECK_PROJECT_ID && e.CHECKCONTENT == CHECKCONTENT && !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.CHECK_QUESTION_ID.HasValue; if (!string.IsNullOrEmpty(CHECKCONTENTSearch)) { diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs index 77a77ab..954f880 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs @@ -5581,27 +5581,11 @@ namespace APT.BS.WebApi.Controllers.Api throw new Exception("行【" + (i + 1) + "】整改建议与措施不能为空！"); } - //改版没了 - //if (listRiskSubminContentl[i].Nav_ListRiskQuestionReason == null) - //{ - // throw new Exception("行【" + (i + 1) + "】隐患原因不能为空！"); - //} if (string.IsNullOrEmpty(listRiskSubminContentl[i].ADDRESS)) { throw new Exception("行【" + (i + 1) + "】隐患地点不能为空！"); } - //通知责任人 取消 - ////if (string.IsNullOrEmpty(listRiskSubminContentl[i].Nav_User.NAME)) - //if (listRiskSubminContentl[i].USER_ID == null || listRiskSubminContentl[i].USER_ID == Guid.Empty) - //{ - // throw new Exception("行【" + (i + 1) + "】通知责任人不能为空！"); - //} - ////if (string.IsNullOrEmpty(listRiskSubminContentl[i].Nav_Department.NAME)) - //if (listRiskSubminContentl[i].DEPARTMENT_ID == null || listRiskSubminContentl[i].DEPARTMENT_ID == Guid.Empty) - //{ - // throw new Exception("行【" + (i + 1) + "】责任单位不能为空！"); - //} if (!listRiskSubminContentl[i].LastDateUser.HasValue) { @@ -5641,10 +5625,10 @@ namespace APT.BS.WebApi.Controllers.Api { throw new Exception("请选择行【" + (i + 1) + "】的检查项目！"); } - if (!listRiskSubminContentl[i].CHECK_PROJECT_CATEGORY_ID.HasValue) - { - throw new Exception("请选择行【" + (i + 1) + "】的检查项目分类！"); - } + //if (!listRiskSubminContentl[i].CHECK_PROJECT_CATEGORY_ID.HasValue) + //{ + // throw new Exception("请选择行【" + (i + 1) + "】的检查项目分类！"); + //} } } } @@ -5671,17 +5655,6 @@ namespace APT.BS.WebApi.Controllers.Api { throw new Exception("行【" + (i + 1) + "】隐患地点不能为空！"); } - - //通知责任人 取消 - //if (listRiskSubminContentl[i].USER_ID == null || listRiskSubminContentl[i].USER_ID == Guid.Empty) - //{ - // throw new Exception("行【" + (i + 1) + "】通知责任人不能为空！"); - //} - //if (listRiskSubminContentl[i].DEPARTMENT_ID == null || listRiskSubminContentl[i].DEPARTMENT_ID == Guid.Empty) - //{ - // throw new Exception("行【" + (i + 1) + "】责任单位不能为空！"); - //} - if (!listRiskSubminContentl[i].CHECK_QUESTION_ID.HasValue || string.IsNullOrEmpty(listRiskSubminContentl[i].DEMAND)) { throw new Exception("行【" + (i + 1) + "】整改建议与措施不能为空！"); @@ -5730,10 +5703,10 @@ namespace APT.BS.WebApi.Controllers.Api { throw new Exception("请选择行【" + (i + 1) + "】的检查项目！"); } - if (!listRiskSubminContentl[i].CHECK_PROJECT_CATEGORY_ID.HasValue) - { - throw new Exception("请选择行【" + (i + 1) + "】的检查项目分类！"); - } + //if (!listRiskSubminContentl[i].CHECK_PROJECT_CATEGORY_ID.HasValue) + //{ + // throw new Exception("请选择行【" + (i + 1) + "】的检查项目分类！"); + //} } } @@ -5799,7 +5772,7 @@ namespace APT.BS.WebApi.Controllers.Api modelNotice.ID = Guid.NewGuid(); modelNotice.CODE = entity.CODE + "_" + (listParam.Count() + 1).ToString(); - modelNotice.NAME = entity.NAME + ((BSQuestionLevelEnum)item.QUESTION_LEVEL).GetDescription() + "级隐患"; + modelNotice.NAME = entity.NAME + ((BSQuestionLevelEnum)item.QUESTION_LEVEL).GetDescription() + "隐患";//级 modelNotice.RISK_SUBMIT_ID = item.RISK_SUBMIT_ID.Value; modelNotice.QUESTION_LEVEL = item.QUESTION_LEVEL; modelNotice.NOTICETIME = DateTime.Now; @@ -5831,36 +5804,6 @@ namespace APT.BS.WebApi.Controllers.Api //回头看看是否正常 } - //listDataID_Sub.Add(item.ID);//每条明细都要添加记录 - - - //if (!listParam.Contains(item.QUESTION_LEVEL.ToString()) && !item.RISK_SUBMIT_NOTICE_ID.HasValue)//&& !item.RISK_SUBMIT_NOTICE_ID.HasValue 通知不能重复 2023-04-26（概率发生 看反馈 没得验证） - //{ - // #region 不包含此等级 添加通知 - // T_BS_RISK_SUBMIT_NOTICE modelNotice = new T_BS_RISK_SUBMIT_NOTICE(); - // modelNotice.ID = Guid.NewGuid(); - // modelNotice.CODE = entity.CODE + "_" + (listParam.Count() + 1).ToString(); - // modelNotice.NAME = entity.NAME + ((BSQuestionLevelEnum)item.QUESTION_LEVEL).GetDescription(); - // modelNotice.RISK_SUBMIT_ID = item.RISK_SUBMIT_ID.Value; - // modelNotice.QUESTION_LEVEL = item.QUESTION_LEVEL; - // modelNotice.NOTICETIME = DateTime.Now; - // modelNotice.RiskContentState = (int)RiskContentState.Notice; - // modelNotice.APPROVE_ID = Guid.NewGuid(); - // modelNotice.ORG_ID = item.ORG_ID; - // #endregion - // listSubmitNotice.Add(modelNotice); - // item.APPROVE_ID = modelNotice.APPROVE_ID; - // item.RISK_SUBMIT_NOTICE_ID = modelNotice.ID; - // listId.Add(modelNotice.ID); - // listParam.Add(modelNotice.QUESTION_LEVEL.ToString()); - // listApproveId.Add(modelNotice.APPROVE_ID.Value); - //} - //else - //{ - // //有此隐患等级//查找对应等级的审核表信息 - // item.APPROVE_ID = listSubmitNotice.First(e => e.QUESTION_LEVEL == item.QUESTION_LEVEL).APPROVE_ID; - // item.RISK_SUBMIT_NOTICE_ID = listSubmitNotice.First(e => e.QUESTION_LEVEL == item.QUESTION_LEVEL).ID; - //} } if (item.Nav_ListRiskQuestionReason != null && item.Nav_ListRiskQuestionReason.Any()) @@ -5889,7 +5832,7 @@ namespace APT.BS.WebApi.Controllers.Api { if (item.CHECK_QUESTION_ID != item.Nav_CheckMain.Nav_CheckQuestion.ID) { - var checkMain = GetEntity(e => e.CHECK_QUESTION_ID == item.CHECK_QUESTION_ID && e.CHECK_PROJECT_ID == item.Nav_CheckMain.CHECK_PROJECT_ID && e.CHECK_PROJECT_CATEGORY_ID == item.Nav_CheckMain.CHECK_PROJECT_CATEGORY_ID && e.CHECK_PROJECT_CATEGORY_ID == item.Nav_CheckMain.CHECK_PROJECT_CATEGORY_ID && e.CHECKCONTENT == item.Nav_CheckMain.CHECKCONTENT); + var checkMain = GetEntity(e => e.CHECK_QUESTION_ID == item.CHECK_QUESTION_ID && e.CHECK_PROJECT_ID == item.Nav_CheckMain.CHECK_PROJECT_ID && e.CHECKCONTENT == item.Nav_CheckMain.CHECKCONTENT);//&& e.CHECK_PROJECT_CATEGORY_ID == item.Nav_CheckMain.CHECK_PROJECT_CATEGORY_ID && e.CHECK_PROJECT_CATEGORY_ID == item.Nav_CheckMain.CHECK_PROJECT_CATEGORY_ID if (checkMain == null) { //检查问题与描述一致 检查问题不能修改 @@ -5898,18 +5841,6 @@ namespace APT.BS.WebApi.Controllers.Api } } } - - //if (item.CHECK_QUESTION_ID.HasValue) - //{ - // if (item.Nav_Question == null) - // { - // item.Nav_Question = GetEntity(item.CHECK_QUESTION_ID.Value); - // } - // if (item.DEMAND.Trim() != item.Nav_Question.DEMAND.Trim()) - // { - // throw new Exception("行号：【" + rowIndex.ToString() + "】的整改建议与措施【" + item.Nav_Question.DEMAND + "】不能修改，操作失败！"); - // } - //} } } @@ -5935,29 +5866,7 @@ namespace APT.BS.WebApi.Controllers.Api } } - //int RequestType = DataHelper.GetRequestType(Request.Headers); - //if (RequestType == 2) - //{ - // if (listRiskSubminContentl != null && listRiskSubminContentl.Any()) - // { - // foreach (var item in listRiskSubminContentl) - // { - // item.Nav_UserCheck = null; - // item.Nav_UserDeal = null; - // item.Nav_User = null; - // item.Nav_Department = null; - // item.Nav_DepartmentDeal = null; - // } - // } - // if (listSubmitContentReason != null && listSubmitContentReason.Any()) - // { - // foreach (var item in listSubmitContentReason) - // { - // item.Nav_RiskReason = null; - // } - // } - //} if (entity.SUBMIT_STATUS == (int)BSSubmitStatusEnum.Temp) { @@ -6428,8 +6337,8 @@ namespace APT.BS.WebApi.Controllers.Api //移动端 修改 版本兼容 if (!entityContent.CHECK_PROJECT_ID.HasValue) throw new Exception("请选择的检查项目！"); - if (!entityContent.CHECK_PROJECT_CATEGORY_ID.HasValue) - throw new Exception("请选择的检查项目分类！"); + //if (!entityContent.CHECK_PROJECT_CATEGORY_ID.HasValue) + // throw new Exception("请选择的检查项目分类！"); } if (!entityContent.RISK_AREA_ID.HasValue) @@ -6516,7 +6425,7 @@ namespace APT.BS.WebApi.Controllers.Api { try { - entityContent.NAME = ((BSQuestionLevelEnum)entityContent.QUESTION_LEVEL).GetDescription() + "级隐患"; + entityContent.NAME = ((BSQuestionLevelEnum)entityContent.QUESTION_LEVEL).GetDescription() + "隐患";//级 //手动上报车间级巡回检查A } catch { } @@ -6601,8 +6510,7 @@ namespace APT.BS.WebApi.Controllers.Api { if (entityContent.CHECK_QUESTION_ID != entityContent.Nav_CheckMain.Nav_CheckQuestion.ID) { - var checkMain = GetEntity(e => e.CHECK_QUESTION_ID == entityContent.CHECK_QUESTION_ID && e.CHECK_PROJECT_ID == entityContent.Nav_CheckMain.CHECK_PROJECT_ID && e.CHECK_PROJECT_CATEGORY_ID == entityContent.Nav_CheckMain.CHECK_PROJECT_CATEGORY_ID && e.CHECK_PROJECT_CATEGORY_ID == entityContent.Nav_CheckMain.CHECK_PROJECT_CATEGORY_ID && e.CHECKCONTENT == entityContent.Nav_CheckMain.CHECKCONTENT); - if (checkMain == null) + var checkMain = GetEntity(e => e.CHECK_QUESTION_ID == entityContent.CHECK_QUESTION_ID && e.CHECK_PROJECT_ID == entityContent.Nav_CheckMain.CHECK_PROJECT_ID && e.CHECKCONTENT == entityContent.Nav_CheckMain.CHECKCONTENT);//&& e.CHECK_PROJECT_CATEGORY_ID == entityContent.Nav_CheckMain.CHECK_PROJECT_CATEGORY_ID { //检查问题与描述一致 检查问题不能修改 throw new Exception("整改建议与措施【" + entityContent.Nav_CheckMain.Nav_CheckQuestion.DEMAND + "】不能修改，操作失败！"); diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs index 9798941..4c8a294 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs @@ -165,14 +165,14 @@ namespace APT.BS.WebApi.Controllers.Api { safecheck.Nav_ListCheckRiskArea = new List(); safecheck.Nav_ListCheckProject = new List(); - safecheck.Nav_ListCheckProjectCategory = new List(); + //safecheck.Nav_ListCheckProjectCategory = new List(); safecheck.Nav_Files = new List(); } else { safecheck.Nav_ListCheckRiskArea = GetEntities(e => e.SAFE_CHECK_ID == safecheck.ID, null, "Nav_RiskArea").ToList(); safecheck.Nav_ListCheckProject = GetEntities(e => e.SAFE_CHECK_ID == safecheck.ID, null, "Nav_CheckProject").ToList(); - safecheck.Nav_ListCheckProjectCategory = GetEntities(e => e.SAFE_CHECK_ID == safecheck.ID, null, "Nav_CheckProjectCategory").ToList(); + //safecheck.Nav_ListCheckProjectCategory = GetEntities(e => e.SAFE_CHECK_ID == safecheck.ID, null, "Nav_CheckProjectCategory").ToList(); safecheck.Nav_Files = GetEntities(e => e.SAFE_CHECK_ID == safecheck.ID, null, "Nav_ImgFile.Nav_File").ToList(); } @@ -278,7 +278,7 @@ namespace APT.BS.WebApi.Controllers.Api List listDetail = new List(); List listArea = new List(); List listProj = new List(); - List listProjCate = new List(); + //List listProjCate = new List(); T_BS_SAFE_CHECK_DETAIL checkModel = null; int ROW_NO = 0; foreach (var item in listCheckMain) //listCheckMain @@ -293,7 +293,7 @@ namespace APT.BS.WebApi.Controllers.Api { continue; } - checkModel = listDetail.FirstOrDefault(e => e.RISK_AREA_ID == item.RISK_AREA_ID && e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID && e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID && e.CHECKCONTENT == item.CHECKCONTENT && e.CHECKPROOF == item.CHECKPROOF); + checkModel = listDetail.FirstOrDefault(e => e.RISK_AREA_ID == item.RISK_AREA_ID && e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID && e.CHECKCONTENT == item.CHECKCONTENT && e.CHECKPROOF == item.CHECKPROOF);// && e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID if (checkModel != null) { continue; @@ -317,19 +317,14 @@ namespace APT.BS.WebApi.Controllers.Api modelDetail.Nav_CheckArea = item.Nav_RiskArea; modelDetail.CHECK_PROJECT_ID = item.CHECK_PROJECT_ID; modelDetail.Nav_CheckProject = item.Nav_CheckProject; - //modelDetail.CHECK_PROJECT_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_PROJECT_CATEGORY_ID; - //modelDetail.Nav_CheckProjectProjectCategory = item.Nav_CheckProjectProjectCategory; - modelDetail.CHECK_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_CATEGORY_ID; - modelDetail.Nav_CheckProjectCategory = item.Nav_CheckProjectCategory; - //modelDetail.CHECK_QUESTION_ID = item.CHECK_QUESTION_ID; - //modelDetail.Nav_CheckQuestion = item.Nav_CheckQuestion; + //modelDetail.CHECK_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_CATEGORY_ID; + //modelDetail.Nav_CheckProjectCategory = item.Nav_CheckProjectCategory; modelDetail.CHECKCONTENT = item.CHECKCONTENT; modelDetail.CHECKPROOF = item.CHECKPROOF; modelDetail.SERIOUS_RISK = (BSSeriousRiskEnum)item.SERIOUS_RISK; modelDetail.ISAUTOLOAD = true; //wyw1114-1 - //modelDetail.DEPARTMENT_ID = userLogin.DEPARTMENT_ID;// item.DEPARTMENT_ID; modelDetail.DEPARTMENT_ID = safecheck.DEPARTMENTID;// item.DEPARTMENT_ID; modelDetail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID; @@ -359,19 +354,17 @@ namespace APT.BS.WebApi.Controllers.Api listProj.Add(modelProj); } - if (listProjCate.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID) == null) - { - T_BS_SAFE_CHECK_PROJECT_CATEGORY modelProjCate = new T_BS_SAFE_CHECK_PROJECT_CATEGORY(); - modelProjCate.ID = Guid.NewGuid(); - modelProjCate.ORG_ID = item.ORG_ID; - modelProjCate.SAFE_CHECK_ID = safecheck.ID; - modelProjCate.Nav_SafeCheck = safecheck; - //modelProjCate.CHECK_PROJECT_CATEGORY_ID = item.Nav_CheckProjectProjectCategory.CHECK_PROJECT_CATEGORY_ID; - //modelProjCate.Nav_CheckProjectCategory = item.Nav_CheckProjectProjectCategory.Nav_CheckProjectCategory; - modelProjCate.CHECK_PROJECT_CATEGORY_ID = item.Nav_CheckProjectCategory.ID;//.CHECK_PROJECT_CATEGORY_ID; - modelProjCate.Nav_CheckProjectCategory = item.Nav_CheckProjectCategory;//.Nav_CheckProjectCategory; - listProjCate.Add(modelProjCate); - } + //if (listProjCate.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID) == null) + //{ + // T_BS_SAFE_CHECK_PROJECT_CATEGORY modelProjCate = new T_BS_SAFE_CHECK_PROJECT_CATEGORY(); + // modelProjCate.ID = Guid.NewGuid(); + // modelProjCate.ORG_ID = item.ORG_ID; + // modelProjCate.SAFE_CHECK_ID = safecheck.ID; + // modelProjCate.Nav_SafeCheck = safecheck; + // //modelProjCate.CHECK_PROJECT_CATEGORY_ID = item.Nav_CheckProjectCategory.ID;//.CHECK_PROJECT_CATEGORY_ID; + // //modelProjCate.Nav_CheckProjectCategory = item.Nav_CheckProjectCategory;//.Nav_CheckProjectCategory; + // listProjCate.Add(modelProjCate); + //} if (!string.IsNullOrEmpty(modelDetail.CHECKPROOF)) { @@ -399,7 +392,7 @@ namespace APT.BS.WebApi.Controllers.Api safecheck.Nav_ListSafeCheckDetail = listDetail; safecheck.Nav_ListCheckRiskArea = listArea; safecheck.Nav_ListCheckProject = listProj; - safecheck.Nav_ListCheckProjectCategory = listProjCate; + //safecheck.Nav_ListCheckProjectCategory = listProjCate; } //} } @@ -1309,10 +1302,10 @@ namespace APT.BS.WebApi.Controllers.Api { throw new Exception("请选择检查项目!"); } - if (entity.Nav_ListCheckProjectCategory == null || !entity.Nav_ListCheckProjectCategory.Any()) - { - throw new Exception("请选择检查项目分类!"); - } + //if (entity.Nav_ListCheckProjectCategory == null || !entity.Nav_ListCheckProjectCategory.Any()) + //{ + // throw new Exception("请选择检查项目分类!"); + //} if (!entity.CHECKTIME.HasValue) { throw new Exception("请选择检查时间!"); @@ -1378,7 +1371,7 @@ namespace APT.BS.WebApi.Controllers.Api List listRowIndexEmpty = new List(); List listRowIndexProjEmpty = new List(); - List listRowIndexProjCEmpty = new List(); + //List listRowIndexProjCEmpty = new List(); List listRowIndexProjContEmpty = new List(); List listRowIndexAreEmpty = new List(); @@ -1409,10 +1402,10 @@ namespace APT.BS.WebApi.Controllers.Api { listRowIndexProjEmpty.Add(i + 1); } - if (listDetail[i].CHECK_PROJECT_CATEGORY_ID == null) - { - listRowIndexProjCEmpty.Add(i + 1); - } + //if (listDetail[i].CHECK_PROJECT_CATEGORY_ID == null) + //{ + // listRowIndexProjCEmpty.Add(i + 1); + //} if (string.IsNullOrEmpty(listDetail[i].CHECKCONTENT)) { listRowIndexProjContEmpty.Add(i + 1); @@ -1550,12 +1543,12 @@ namespace APT.BS.WebApi.Controllers.Api strWarm = "行【" + string.Join(",", listRowIndexProjEmpty) + "】检查项目不能为空"; throw new Exception(strWarm); } - if (listRowIndexProjCEmpty.Count > 0) - { - string strWarm = ""; - strWarm = "行【" + string.Join(",", listRowIndexProjCEmpty) + "】检查项目分类不能为空"; - throw new Exception(strWarm); - } + //if (listRowIndexProjCEmpty.Count > 0) + //{ + // string strWarm = ""; + // strWarm = "行【" + string.Join(",", listRowIndexProjCEmpty) + "】检查项目分类不能为空"; + // throw new Exception(strWarm); + //} if (listRowIndexProjContEmpty.Count > 0) { string strWarm = ""; @@ -1868,10 +1861,10 @@ namespace APT.BS.WebApi.Controllers.Api if (delProject != null && delProject.Any()) listDelProjectID = delProject.Select(e => e.ID).ToList(); - var listCategoryID = listCategory.Select(e => e.ID); - var delCategory = GetEntities(e => e.SAFE_CHECK_ID == entity.ID && !listCategoryID.Contains(e.ID), null, null); - if (delCategory != null && delCategory.Any()) - listDelCategoryID = delCategory.Select(e => e.ID).ToList(); + //var listCategoryID = listCategory.Select(e => e.ID); + //var delCategory = GetEntities(e => e.SAFE_CHECK_ID == entity.ID && !listCategoryID.Contains(e.ID), null, null); + //if (delCategory != null && delCategory.Any()) + // listDelCategoryID = delCategory.Select(e => e.ID).ToList(); var listUserIDs = listUser.Select(e => e.ID); var delDetailUser = GetEntities(e => e.SAFE_CHECK_ID == entity.ID && !listUserIDs.Contains(e.ID), null, null); @@ -1938,8 +1931,8 @@ namespace APT.BS.WebApi.Controllers.Api BantchSaveEntityNoCommit(listArea); if (listProject != null && listProject.Any())//检查项目 BantchSaveEntityNoCommit(listProject); - if (listCategory != null && listCategory.Any())//项目分类 - BantchSaveEntityNoCommit(listCategory); + //if (listCategory != null && listCategory.Any())//项目分类 + // BantchSaveEntityNoCommit(listCategory); //if (listUserIDDel != null && listUserIDDel.Any()) // BantchDeleteEntityNoCommit(listUserIDDel); if (listDelAreaID != null) @@ -2105,8 +2098,8 @@ namespace APT.BS.WebApi.Controllers.Api BantchSaveEntityNoCommit(listArea); if (listProject != null && listProject.Any())//检查项目 BantchSaveEntityNoCommit(listProject); - if (listCategory != null && listCategory.Any())//项目分类 - BantchSaveEntityNoCommit(listCategory); + //if (listCategory != null && listCategory.Any())//项目分类 + // BantchSaveEntityNoCommit(listCategory); //if (listUserIDDel != null && listUserIDDel.Any()) // BantchDeleteEntityNoCommit(listUserIDDel); //if (task != null)//代办消息 清除 @@ -2532,7 +2525,7 @@ namespace APT.BS.WebApi.Controllers.Api //var info = this.GetEntities(expression, null, new string[] { "Nav_CheckProject", "Nav_CheckQuestion", "Nav_CheckProjectProjectCategory", "Nav_CheckProjectProjectCategory.Nav_CheckProjectCategory", "Nav_RiskArea" }).OrderBy(e => e.CHECK_PROJECT_ID).ThenBy(e => e.CHECKCONTENT).ToList(); - var info = this.GetEntities(expression, null, new string[] { "Nav_CheckProject", "Nav_CheckQuestion", "Nav_CheckProjectCategory", "Nav_RiskArea" }).OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.NUM).ToList(); + var info = this.GetEntities(expression, null, new string[] { "Nav_CheckProject", "Nav_CheckQuestion", "Nav_RiskArea" }).OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.NUM).ToList();//"Nav_CheckProjectCategory", //.OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.CHECK_PROJECT_CATEGORY_ID).ThenBy(e => e.CHECK_PROJECT_ID).ThenBy(e => e.CHECKCONTENT).ToList(); @@ -2553,7 +2546,7 @@ namespace APT.BS.WebApi.Controllers.Api var listMainID = listTemp.Select(e => e.ID).ToList(); expressionDetail = expressionDetail.And(e => e.CHECK_MAIN_ID.HasValue && listMainID.Contains(e.CHECK_MAIN_ID.Value)); } - var listDetailTemp = GetEntities(expressionDetail, null, new string[] { "Nav_SafeCheck", "Nav_CheckMain", "Nav_CheckArea", "Nav_CheckProject", "Nav_CheckProjectProjectCategory", "Nav_CheckProjectCategory", "Nav_CheckQuestion", "Nav_ListCheckDetailUser.Nav_User" }).OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.ROW_NO); + var listDetailTemp = GetEntities(expressionDetail, null, new string[] { "Nav_SafeCheck", "Nav_CheckMain", "Nav_CheckArea", "Nav_CheckProject", "Nav_CheckQuestion", "Nav_ListCheckDetailUser.Nav_User" }).OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.ROW_NO);//"Nav_CheckProjectProjectCategory",, "Nav_CheckProjectCategory" if (listDetailTemp != null && listDetailTemp.Any()) { modelSafeCheck.Nav_ListSafeCheckDetail = listDetailTemp.ToList(); @@ -2568,7 +2561,7 @@ namespace APT.BS.WebApi.Controllers.Api } for (int i = 0; i < listTemp.Count; i++) { - checkModel = listDetail.FirstOrDefault(e => e.RISK_AREA_ID == listTemp[i].RISK_AREA_ID && e.CHECK_PROJECT_ID == listTemp[i].CHECK_PROJECT_ID && e.CHECK_PROJECT_CATEGORY_ID == listTemp[i].CHECK_PROJECT_CATEGORY_ID && e.CHECKCONTENT == listTemp[i].CHECKCONTENT && e.CHECKPROOF == listTemp[i].CHECKPROOF); + checkModel = listDetail.FirstOrDefault(e => e.RISK_AREA_ID == listTemp[i].RISK_AREA_ID && e.CHECK_PROJECT_ID == listTemp[i].CHECK_PROJECT_ID && e.CHECKCONTENT == listTemp[i].CHECKCONTENT && e.CHECKPROOF == listTemp[i].CHECKPROOF);//&& e.CHECK_PROJECT_CATEGORY_ID == listTemp[i].CHECK_PROJECT_CATEGORY_ID if (checkModel != null) { continue; @@ -2587,12 +2580,11 @@ namespace APT.BS.WebApi.Controllers.Api CheckDetail.Nav_CheckArea = listTemp[i].Nav_RiskArea; CheckDetail.CHECK_PROJECT_ID = listTemp[i].CHECK_PROJECT_ID; CheckDetail.Nav_CheckProject = listTemp[i].Nav_CheckProject; - CheckDetail.CHECK_PROJECT_PROJECT_CATEGORY_ID = listTemp[i].CHECK_PROJECT_PROJECT_CATEGORY_ID; - CheckDetail.Nav_CheckProjectProjectCategory = listTemp[i].Nav_CheckProjectProjectCategory; - - CheckDetail.CHECK_PROJECT_CATEGORY_ID = listTemp[i].CHECK_PROJECT_CATEGORY_ID; - CheckDetail.Nav_CheckProjectCategory = listTemp[i].Nav_CheckProjectCategory; + //CheckDetail.CHECK_PROJECT_PROJECT_CATEGORY_ID = listTemp[i].CHECK_PROJECT_PROJECT_CATEGORY_ID; + //CheckDetail.Nav_CheckProjectProjectCategory = listTemp[i].Nav_CheckProjectProjectCategory; + //CheckDetail.CHECK_PROJECT_CATEGORY_ID = listTemp[i].CHECK_PROJECT_CATEGORY_ID; + //CheckDetail.Nav_CheckProjectCategory = listTemp[i].Nav_CheckProjectCategory; CheckDetail.CHECK_QUESTION_ID = listTemp[i].CHECK_QUESTION_ID; CheckDetail.Nav_CheckQuestion = listTemp[i].Nav_CheckQuestion; @@ -2689,7 +2681,7 @@ namespace APT.BS.WebApi.Controllers.Api switch (listFilterRule[i].Field) { case "Parameter1": - listProjectCategoryID = GetGuid(listFilterRule[i].Value.ToString(), ','); + //listProjectCategoryID = GetGuid(listFilterRule[i].Value.ToString(), ','); break; case "Parameter2": CHECK_TYPE_ID = new Guid(listFilterRule[i].Value.ToString()); @@ -2740,9 +2732,7 @@ namespace APT.BS.WebApi.Controllers.Api expression = expression.And(e => e.CHECK_TYPE_LEVEL_ID == CHECK_TYPE_LEVEL_ID && e.CHECK_TYPE_ID == CHECK_TYPE_ID); expression = expression.And(e => e.RISK_AREA_ID.HasValue && listAreaID.Contains(e.RISK_AREA_ID.Value)); expression = expression.And(e => e.CHECK_PROJECT_ID.HasValue && listProjectID.Contains(e.CHECK_PROJECT_ID.Value)); - - //expression = expression.And(e => e.CHECK_PROJECT_PROJECT_CATEGORY_ID.HasValue && listProjectCategoryID.Contains(e.Nav_CheckProjectProjectCategory.CHECK_PROJECT_CATEGORY_ID)); - expression = expression.And(e => e.CHECK_PROJECT_CATEGORY_ID.HasValue && listProjectCategoryID.Contains(e.Nav_CheckProjectCategory.ID)); + //expression = expression.And(e => e.CHECK_PROJECT_CATEGORY_ID.HasValue && listProjectCategoryID.Contains(e.Nav_CheckProjectCategory.ID)); break; default: break;