From 0e6d0e8975e92a6395d2d9f692edd5a7d0984c5a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 15 六月 2022 08:39:59 +0800
Subject: [PATCH] 爬虫
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 146 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 128 insertions(+), 18 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 90534e2..ff08a23 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -687,6 +687,12 @@
}
+
+ if(data.OrderType1 == "姘戜簨绾犵悍" || data.OrderType1 == "鍏朵粬绾犵悍")
+ {
+ data.OrderType2 = data.OrderType3;
+ }
+
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
new TransactionOptions
{
@@ -1612,13 +1618,7 @@
actionEntity.PageIco = "fa fa-search";
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+
ViewData["ActionInfo"] = actionlist;
ViewBag.status = _liaotianService.GetSYScode("t_challengeletter", "status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -1699,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() };
}
@@ -1717,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() };
}
@@ -1759,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;
@@ -1780,6 +1788,7 @@
// resultEntity.Message = sysCodeDtl.Contents;
//}
resultEntity.Message = no;
+ resultEntity.Remark = challengeItemId;
resultEntity.DataList = sysCodeDtls;
return new JsonResult(resultEntity);
@@ -2015,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);
@@ -2039,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);
@@ -2078,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);
@@ -2127,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;
}
}
@@ -2224,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() };
}
@@ -2255,15 +2292,66 @@
}
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() };
complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
}
+ //鍒ゆ柇鏄惁鏈夎川鐤戝嚱
+ if (complaintletterDTO.Status != 2)
+ {
+ CooperOrderDTO cooperOrderDTO = _cooperOrderService.Get(complaintletterDTO.OrderId);
+ List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengelettertousu(cooperOrderDTO.Khdw, complaintletterDTO.XmCode);
+
+ if(challengeletterDTOs!=null&& challengeletterDTOs.Count > 0)
+ {
+ TChallengeletterDTO challengeletterDTO = challengeletterDTOs[0];
+ complaintletterDTO.PurchaserName = challengeletterDTO.PurchaserName;
+ complaintletterDTO.ChallengeDateName = challengeletterDTO.DocumentsDate.HasValue ? challengeletterDTO.DocumentsDate.Value.ToString("yyyy-MM-dd") : "";
+ complaintletterDTO.RequestInfo = challengeletterDTO.RequestInfo;
+ complaintletterDTO.Questioned = challengeletterDTO.PurchaserName;
+ complaintletterDTO.complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
+ if (complaintletterDTO.complaintShouquandaibiaoDTOs.Count == 0)
+ complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+ List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
+ if (challengeItemDTOs.Count > 0)
+ {
+ List<TComplaintItemDTO> complaintItemDTOs = new List<TComplaintItemDTO>();
+ foreach(var challengeItemDTO in challengeItemDTOs)
+ {
+ TComplaintItemDTO complaintItemDTO = new TComplaintItemDTO();
+ complaintItemDTO.Id = challengeItemDTO.Id;
+ complaintItemDTO.ComplaintId = challengeItemDTO.ChallengeId;
+ complaintItemDTO.Question = challengeItemDTO.Question;
+ complaintItemDTO.Evidential = challengeItemDTO.Evidential;
+ complaintItemDTO.Law = challengeItemDTO.Law;
+ complaintItemDTO.Lawcoment = challengeItemDTO.Lawcoment;
+ complaintItemDTO.Sort = challengeItemDTO.Sort;
+
+ complaintItemDTOs.Add(complaintItemDTO);
+ }
+
+ complaintletterDTO.complaintItemDTOs = complaintItemDTOs;
+ foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
+ {
+ var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
+ complaintItemDTO.sysCodeDtls = sysCodeDtls2;
+ }
+ }
+ else
+ {
+ complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+ }
+
+ }
+ }
ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info").OrderBy(x => x.CodeSn).ToList();//璐ㄧ枒璇锋眰
@@ -2341,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;
@@ -2380,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;
@@ -2474,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);
@@ -2541,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;
}
}
--
Gitblit v1.9.1