手动新增检查登记 修改
This commit is contained in:
		
							parent
							
								
									aaa7f288ff
								
							
						
					
					
						commit
						9b5be02e40
					
				@ -8138,9 +8138,9 @@ namespace APT.BS.WebApi.Controllers.Api
 | 
				
			|||||||
            IEnumerable<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategory = null;
 | 
					            IEnumerable<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategory = null;
 | 
				
			||||||
            if (entity.SAFE_CHECK_ID != Guid.Empty)
 | 
					            if (entity.SAFE_CHECK_ID != Guid.Empty)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                listCheakProject = GetEntities<T_BS_SAFE_CHECK_PROJECT>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
 | 
					                listCheakProject = GetEntities<T_BS_SAFE_CHECK_PROJECT>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
 | 
				
			||||||
                listCheakArea = GetEntities<T_BS_SAFE_CHECK_RISK_AREA>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
 | 
					                listCheakArea = GetEntities<T_BS_SAFE_CHECK_RISK_AREA>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
 | 
				
			||||||
                listCheakCategory = GetEntities<T_BS_SAFE_CHECK_PROJECT_CATEGORY>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
 | 
					                listCheakCategory = GetEntities<T_BS_SAFE_CHECK_PROJECT_CATEGORY>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            return SafeExecute(() =>
 | 
					            return SafeExecute(() =>
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
@ -8203,8 +8203,6 @@ namespace APT.BS.WebApi.Controllers.Api
 | 
				
			|||||||
                T_BS_CHECK_MAIN modelMain = null;
 | 
					                T_BS_CHECK_MAIN modelMain = null;
 | 
				
			||||||
                int NUM = 0;
 | 
					                int NUM = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                T_BS_SAFE_CHECK_RISK_AREA cheakAreaAdd = null;
 | 
					                T_BS_SAFE_CHECK_RISK_AREA cheakAreaAdd = null;
 | 
				
			||||||
                List<T_BS_SAFE_CHECK_PROJECT> listCheakProjectAdd = new List<T_BS_SAFE_CHECK_PROJECT>();
 | 
					                List<T_BS_SAFE_CHECK_PROJECT> listCheakProjectAdd = new List<T_BS_SAFE_CHECK_PROJECT>();
 | 
				
			||||||
                List<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategoryAdd = new List<T_BS_SAFE_CHECK_PROJECT_CATEGORY>();
 | 
					                List<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategoryAdd = new List<T_BS_SAFE_CHECK_PROJECT_CATEGORY>();
 | 
				
			||||||
@ -8323,11 +8321,12 @@ namespace APT.BS.WebApi.Controllers.Api
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                    //判断 完善 检查表 项目与项目分类信息
 | 
					                    //判断 完善 检查表 项目与项目分类信息
 | 
				
			||||||
                    var checkProj = listCheakProject.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID);
 | 
					                    var checkProj = listCheakProject.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID);
 | 
				
			||||||
 | 
					                    if (checkProj == null)
 | 
				
			||||||
 | 
					                        checkProj = listCheakProjectAdd.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID);
 | 
				
			||||||
                    if (checkProj == null)
 | 
					                    if (checkProj == null)
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        listCheakProjectAdd.Add(new T_BS_SAFE_CHECK_PROJECT()
 | 
					                        listCheakProjectAdd.Add(new T_BS_SAFE_CHECK_PROJECT()
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
 | 
					 | 
				
			||||||
                            ID = Guid.NewGuid(),
 | 
					                            ID = Guid.NewGuid(),
 | 
				
			||||||
                            ORG_ID = entity.ORG_ID,
 | 
					                            ORG_ID = entity.ORG_ID,
 | 
				
			||||||
                            CREATER_ID = loginId,
 | 
					                            CREATER_ID = loginId,
 | 
				
			||||||
@ -8338,11 +8337,12 @@ namespace APT.BS.WebApi.Controllers.Api
 | 
				
			|||||||
                        });
 | 
					                        });
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                    var checkCategory = listCheakCategory.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID);
 | 
					                    var checkCategory = listCheakCategory.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID);
 | 
				
			||||||
 | 
					                    if (checkCategory == null)
 | 
				
			||||||
 | 
					                        checkCategory = listCheakCategoryAdd.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID);
 | 
				
			||||||
                    if (checkCategory == null)
 | 
					                    if (checkCategory == null)
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        listCheakCategoryAdd.Add(new T_BS_SAFE_CHECK_PROJECT_CATEGORY()
 | 
					                        listCheakCategoryAdd.Add(new T_BS_SAFE_CHECK_PROJECT_CATEGORY()
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
 | 
					 | 
				
			||||||
                            ID = Guid.NewGuid(),
 | 
					                            ID = Guid.NewGuid(),
 | 
				
			||||||
                            ORG_ID = entity.ORG_ID,
 | 
					                            ORG_ID = entity.ORG_ID,
 | 
				
			||||||
                            CREATER_ID = loginId,
 | 
					                            CREATER_ID = loginId,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user