2345
This commit is contained in:
		
							parent
							
								
									79f17c96c6
								
							
						
					
					
						commit
						258cc2abf7
					
				@ -1312,7 +1312,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
 | 
				
			|||||||
                var listRiskReasons = GetEntities<T_BS_RISK_REASON>(e => !e.IS_DELETED, filterR, null).OrderBy(e => e.NAME).ToList();
 | 
					                var listRiskReasons = GetEntities<T_BS_RISK_REASON>(e => !e.IS_DELETED, filterR, null).OrderBy(e => e.NAME).ToList();
 | 
				
			||||||
                string CODE = DateTime.Now.ToString("yyyyMMddHHmm");
 | 
					                string CODE = DateTime.Now.ToString("yyyyMMddHHmm");
 | 
				
			||||||
                //DEPARTMENT_TYPE { get; set; }"FMDepartmentType"部门=0,  车间=1,   班组=2,  公司=3
 | 
					                //DEPARTMENT_TYPE { get; set; }"FMDepartmentType"部门=0,  车间=1,   班组=2,  公司=3
 | 
				
			||||||
                BaseFilter filterD = new BaseFilter();
 | 
					                BaseFilter filterD = new BaseFilter(filter.OrgId);
 | 
				
			||||||
                filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
 | 
					                filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
 | 
				
			||||||
                var listDep = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.ENABLE_STATUS == 0, filterD, null);
 | 
					                var listDep = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.ENABLE_STATUS == 0, filterD, null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -1518,7 +1518,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                    DateTime dtMin = Convert.ToDateTime(DateTime.Now.AddMonths(-1 * (caculate - 1)).ToString("yyyy-MM-01 00:00:00"));
 | 
					                    DateTime dtMin = Convert.ToDateTime(DateTime.Now.AddMonths(-1 * (caculate - 1)).ToString("yyyy-MM-01 00:00:00"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    BaseFilter filterD = new BaseFilter();
 | 
					                    BaseFilter filterD = new BaseFilter(filter.OrgId);
 | 
				
			||||||
                    filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
 | 
					                    filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
 | 
				
			||||||
                    IEnumerable<T_FM_DEPARTMENT> listDep = null;
 | 
					                    IEnumerable<T_FM_DEPARTMENT> listDep = null;
 | 
				
			||||||
                    try
 | 
					                    try
 | 
				
			||||||
@ -2104,7 +2104,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
 | 
				
			|||||||
                    DateTime dtMin = Convert.ToDateTime(DateTime.Now.AddMonths(-1 * (caculate - 1)).ToString("yyyy-MM-01 00:00:00"));
 | 
					                    DateTime dtMin = Convert.ToDateTime(DateTime.Now.AddMonths(-1 * (caculate - 1)).ToString("yyyy-MM-01 00:00:00"));
 | 
				
			||||||
                    //按生产单元区分  安全检查  每种检查的数量
 | 
					                    //按生产单元区分  安全检查  每种检查的数量
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    BaseFilter filterD = new BaseFilter();
 | 
					                    BaseFilter filterD = new BaseFilter(filter.OrgId);
 | 
				
			||||||
                    filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
 | 
					                    filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID" };
 | 
				
			||||||
                    var listDep = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.ENABLE_STATUS == 0, filterD, null);
 | 
					                    var listDep = GetEntities<T_FM_DEPARTMENT>(e => !e.IS_DELETED && e.ENABLE_STATUS == 0, filterD, null);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user