zhengcaioa.git - Gitblit

			@@ -687,6 +687,12 @@

			}


			if(data.OrderType1 == "民事纠纷" \|\| data.OrderType1 == "其他纠纷")
			{
			data.OrderType2 = data.OrderType3;
			}

			using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
			new TransactionOptions
			{
			@@ -1693,12 +1699,18 @@
			foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
			{
			var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
			if (!string.IsNullOrEmpty(challengeItemDTO.Law))
			{
			sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
			}
			challengeItemDTO.sysCodeDtls = sysCodeDtls2;
			}
			}
			else
			{
			challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
			var challengeItemDTO = new TChallengeItemDTO();
			challengeItemDTO.Id = 1;
			challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { challengeItemDTO };
			challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
			}

			@@ -1711,7 +1723,9 @@
			}
			else
			{
			challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
			var challengeItemDTO = new TChallengeItemDTO();
			challengeItemDTO.Id = 1;
			challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { challengeItemDTO };
			challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
			challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
			}
			@@ -1753,7 +1767,7 @@
			return new JsonResult(resultEntity);
			}

			public IActionResult getQuestionLaw(string id, string no)
			public IActionResult getQuestionLaw(string id, string no,string challengeItemId = "")
			{
			ResultEntity<SysCodeDtl> resultEntity = new ResultEntity<SysCodeDtl>();
			resultEntity.Result = true;
			@@ -1774,6 +1788,7 @@
			// resultEntity.Message = sysCodeDtl.Contents;
			//}
			resultEntity.Message = no;
			resultEntity.Remark = challengeItemId;
			resultEntity.DataList = sysCodeDtls;

			return new JsonResult(resultEntity);
			@@ -2009,7 +2024,7 @@
			challengeletterDTO.DocumentsDate = data.zhiyiDocumentsDate;
			challengeletterDTO.Modifier = curentuser.Id;
			challengeletterDTO.Modifytime = DateTime.Now;
			challengeletterDTO.Status = 2;
			challengeletterDTO.Status = int.Parse(data.Status);
			challengeletterDTO.RequestInfo = data.RequestInfo;
			challengeletterDTO.PrintNum = data.PrintNum;
			resultEntity = _cooperOrderService.saveChallengeletter(challengeletterDTO);
			@@ -2033,7 +2048,7 @@
			challengeletterDTO.Modifytime = DateTime.Now;
			challengeletterDTO.Creater = curentuser.Id;
			challengeletterDTO.Createtime = challengeletterDTO.Modifytime;
			challengeletterDTO.Status = 2;
			challengeletterDTO.Status = int.Parse(data.Status); ;
			challengeletterDTO.RequestInfo = data.RequestInfo;
			challengeletterDTO.PrintNum = data.PrintNum;
			resultEntity = _cooperOrderService.saveChallengeletter(challengeletterDTO);
			@@ -2072,11 +2087,29 @@
			&& string.IsNullOrEmpty(data.Evidential[i])
			))
			{
			string Law = "";
			var challengeItemId = data.challengeItemId[i];
			var Laws = data.Law;
			var challengeItemIdlaw = data.challengeItemIdlaw;
			if(Laws != null&& Laws.Length > 0)
			{
			for (int j = 0; j < Laws.Length; j++)
			{
			if(challengeItemId == challengeItemIdlaw[j])
			{
			Law += Laws[j] + ",";
			}

			}
			if(!string.IsNullOrEmpty(Law))
			Law = Law.TrimEnd(','); //移除最后的逗号
			}

			var challengeItemDTO = new TChallengeItemDTO();
			challengeItemDTO.ChallengeId = challengeletterDTO.Id;
			challengeItemDTO.Question = data.Question[i];
			challengeItemDTO.Evidential = data.Evidential[i];
			//challengeItemDTO.Law = data.Law[i];
			challengeItemDTO.Law = Law;
			//challengeItemDTO.Lawcoment = data.Lawcoment[i];
			challengeItemDTO.Sort = i;
			resultEntity = _cooperOrderService.saveChallengeItem(challengeItemDTO);
			@@ -2121,6 +2154,10 @@
			foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
			{
			var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
			if (!string.IsNullOrEmpty(challengeItemDTO.Law))
			{
			sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
			}
			challengeItemDTO.sysCodeDtls = sysCodeDtls2;
			}
			}
			@@ -2218,12 +2255,18 @@
			foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
			{
			var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
			if (!string.IsNullOrEmpty(complaintItemDTO.Law))
			{
			sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
			}
			complaintItemDTO.sysCodeDtls = sysCodeDtls2;
			}
			}
			else
			{
			complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
			var complaintItemDTO = new TComplaintItemDTO();
			complaintItemDTO.Id = 1;
			complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { complaintItemDTO };
			complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
			}

			@@ -2249,7 +2292,9 @@
			}
			else
			{
			complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
			var complaintItemDTO = new TComplaintItemDTO();
			complaintItemDTO.Id = 1;
			complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { complaintItemDTO };
			complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
			complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
			complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
			@@ -2384,7 +2429,7 @@

			complaintletterDTO.Modifier = curentuser.Id;
			complaintletterDTO.Modifytime = DateTime.Now;
			complaintletterDTO.Status = 2;
			complaintletterDTO.Status = int.Parse(data.Status);
			complaintletterDTO.RequestInfo = data.RequestInfo;
			complaintletterDTO.PrintNum = data.PrintNum;
			complaintletterDTO.TsrId = data.TsrId;
			@@ -2423,7 +2468,7 @@
			complaintletterDTO.Modifytime = DateTime.Now;
			complaintletterDTO.Creater = curentuser.Id;
			complaintletterDTO.Createtime = complaintletterDTO.Modifytime;
			complaintletterDTO.Status = 2;
			complaintletterDTO.Status = int.Parse(data.Status);
			complaintletterDTO.RequestInfo = data.RequestInfo;
			complaintletterDTO.PrintNum = data.PrintNum;
			complaintletterDTO.TsrId = data.TsrId;
			@@ -2517,11 +2562,29 @@
			&& string.IsNullOrEmpty(data.Evidential[i])
			))
			{
			string Law = "";
			var complaintItemId = data.complaintItemId[i];
			var Laws = data.Law;
			var complaintItemIdlaw = data.complaintItemIdlaw;
			if (Laws != null && Laws.Length > 0)
			{
			for (int j = 0; j < Laws.Length; j++)
			{
			if (complaintItemId == complaintItemIdlaw[j])
			{
			Law += Laws[j] + ",";
			}

			}
			if (!string.IsNullOrEmpty(Law))
			Law = Law.TrimEnd(','); //移除最后的逗号
			}

			var complaintItemDTO = new TComplaintItemDTO();
			complaintItemDTO.ComplaintId = complaintletterDTO.Id;
			complaintItemDTO.Question = data.Question[i];
			complaintItemDTO.Evidential = data.Evidential[i];
			//complaintItemDTO.Law = data.Law[i];
			complaintItemDTO.Law = Law;
			//complaintItemDTO.Lawcoment = data.Lawcoment[i];
			complaintItemDTO.Sort = i;
			resultEntity = _cooperOrderService.saveComplaintItem(complaintItemDTO);
			@@ -2584,6 +2647,10 @@
			foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
			{
			var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
			if (!string.IsNullOrEmpty(complaintItemDTO.Law))
			{
			sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
			}
			complaintItemDTO.sysCodeDtls = sysCodeDtls2;
			}
			}