zhengcaioa.git - Gitblit

			@@ -1177,6 +1177,45 @@

			var result = _mapper.Map<List<TComplaintletterDTO>>(entity);

			var listCode = (from a in _context.SysCodeDtls
			join b in _context.SysCodes
			on a.CodeId equals b.Id
			where a.RecStatus == "A"
			&& b.RecStatus == "A"
			select new CodeDataEntity()
			{
			CodeId = b.Id,
			CodeTable = b.CodeTable,
			CodeField = b.CodeField,
			CodeSn = a.CodeSn,
			Comments = a.Comments,
			Contents = a.Contents,
			RecStatus = a.RecStatus,
			Sort = a.Sort
			}
			).ToList();

			var request_info = listCode.Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "request_info").ToList();
			var shifou = listCode.Where(x => x.CodeTable == "system" && x.CodeField == "shifou").ToList();
			foreach (var complaintletterDTO in result)
			{
			var codeDataEntity = request_info.Where(x => x.CodeSn == complaintletterDTO.RequestInfo).FirstOrDefault();
			if (codeDataEntity != null)
			{
			complaintletterDTO.RequestInfoName = codeDataEntity.Comments;
			}

			codeDataEntity = shifou.Where(x => x.CodeSn == complaintletterDTO.IsNotice).FirstOrDefault();
			if (codeDataEntity != null)
			{
			complaintletterDTO.IsNoticeName = codeDataEntity.Comments;
			}
			codeDataEntity = shifou.Where(x => x.CodeSn == complaintletterDTO.IsResultnotice).FirstOrDefault();
			if (codeDataEntity != null)
			{
			complaintletterDTO.IsResultnoticeName = codeDataEntity.Comments;
			}
			}

			return result;
			}
			@@ -1249,12 +1288,13 @@

			updateproject.DocumentsDate = entity.DocumentsDate;
			updateproject.RequestInfo = entity.RequestInfo;


			updateproject.Status = entity.Status;










			updateproject.Modifier = entity.Modifier;
			@@ -1285,6 +1325,82 @@

			var result = _mapper.Map<List<TComplaintItemDTO>>(entity);

			var question = (from a in _context.SysCodeDtls
			join b in _context.SysCodes
			on a.CodeId equals b.Id
			where a.RecStatus == "A"
			&& b.RecStatus == "A"
			select new CodeDataEntity()
			{
			CodeId = b.Id,
			CodeTable = b.CodeTable,
			CodeField = b.CodeField,
			CodeSn = a.CodeSn,
			Comments = a.Comments,
			Contents = a.Contents,
			RecStatus = a.RecStatus,
			Sort = a.Sort
			}
			).Where(x => x.CodeTable == "t_challenge_items" && x.CodeField == "question").ToList();


			var law = (from a in _context.SysCodeDtls
			join b in _context.SysCodes
			on a.CodeId equals b.Id
			where a.RecStatus == "A"
			&& b.RecStatus == "A"
			select new CodeDataEntity()
			{
			CodeId = b.Id,
			CodeTable = b.CodeTable,
			CodeField = b.CodeField,
			CodeSn = a.CodeSn,
			Comments = a.Comments,
			Contents = a.Contents,
			RecStatus = a.RecStatus,
			Sort = a.Sort
			}
			).Where(x => x.CodeTable == "t_complaint_items" && x.CodeField == "law").ToList();

			var falv = (from a in _context.SysCodeDtls
			join b in _context.SysCodes
			on a.CodeId equals b.Id
			where a.RecStatus == "A"
			&& b.RecStatus == "A"
			select new CodeDataEntity()
			{
			CodeId = b.Id,
			CodeTable = b.CodeTable,
			CodeField = b.CodeField,
			CodeSn = a.CodeSn,
			Comments = a.Comments,
			Contents = a.Contents,
			RecStatus = a.RecStatus,
			Sort = a.Sort
			}
			).Where(x => x.CodeTable == "expert_test_topicjiexi" && x.CodeField == "falv").ToList();

			foreach (var complaintItemDTO in result)
			{
			var codeDataEntity = question.Where(x => x.CodeSn == complaintItemDTO.Question).FirstOrDefault();
			if (codeDataEntity != null)
			{
			complaintItemDTO.QuestionName = codeDataEntity.Comments;
			}

			codeDataEntity = law.Where(x => x.CodeSn == complaintItemDTO.Law).FirstOrDefault();
			if (codeDataEntity != null)
			{
			complaintItemDTO.LawName = codeDataEntity.Comments;
			complaintItemDTO.Lawcoment = codeDataEntity.Contents;

			codeDataEntity = falv.Where(x => x.CodeSn == complaintItemDTO.LawName).FirstOrDefault();
			if (codeDataEntity != null)
			{
			complaintItemDTO.LawName = codeDataEntity.Comments;
			}
			}
			}

			return result;
			}
			@@ -1710,13 +1826,14 @@
			WeishouMoney = (a.Money ?? 0) /- (a.Youhui ?? 0)/ - (lll.YishouMoney ?? 0),
			OrderType1 = a.OrderType1,
			Status = b.Status.ToString(),
			Modifytime = b.Modifytime.Value,
			//StatusName = ddd.Comments
			}
			).ToList();


			var query1 =(from a in _context.CooperOrders
			join b in _context.TComplaintletters.Where(x => x.Status == 1)
			join b in _context.TComplaintletters
			on a.Id equals b.OrderId


			@@ -1764,11 +1881,12 @@
			WeishouMoney = (a.Money ?? 0) /- (a.Youhui ?? 0)/ - (lll.YishouMoney ?? 0),
			OrderType1 = a.OrderType1,
			Status = b.Status.ToString(),
			Modifytime = b.Modifytime.Value,
			}
			).ToList();

			query2.AddRange(query1);
			var query = query2.Where(x => x.WeishouMoney <= 0).OrderByDescending(x => x.Createtime).ToList();
			var query = query2.Where(x => x.WeishouMoney <= 0).OrderByDescending(x => x.Modifytime).ToList();