From 727a27340fc49d41bf9f7efd81a9a44ade7a9677 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 六月 2022 13:15:52 +0800
Subject: [PATCH] 合同盖章
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 453 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 379 insertions(+), 74 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 0975306..f953040 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -493,7 +493,7 @@
if (complaintGongyingshangDTOs.Count > 0)
complaintletterDTO.complaintGongyingshangDTOs = complaintGongyingshangDTOs;
else
- complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() };
+ complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
}
else
@@ -501,7 +501,7 @@
complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
- complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() };
+ complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
}
ViewBag.complaintletterDTO = complaintletterDTO;
@@ -523,7 +523,7 @@
complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO()};
complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
- complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() };
+ complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() /*{ new TComplaintGongyingshangDTO() }*/;
ViewBag.complaintletterDTO = complaintletterDTO;
}
@@ -541,8 +541,9 @@
ViewBag.customer = _cooperatecustomCustomerService.GetList();
//ViewBag.project = _projectService.GetList();
+ ViewBag.ChallengeletterChosen = _cooperOrderService.GetListChallengeletterChosen().Where(x => x.Createtime >= DateTime.Now.AddMonths(-2)).ToList(); ;
-
+
ViewData.Model = dto;
@@ -686,6 +687,12 @@
}
+
+ if(data.OrderType1 == "姘戜簨绾犵悍" || data.OrderType1 == "鍏朵粬绾犵悍")
+ {
+ data.OrderType2 = data.OrderType3;
+ }
+
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
new TransactionOptions
{
@@ -743,6 +750,7 @@
{
//鏌ヨ涓昏〃
var complaintletterDTO = _cooperOrderService.GetListComplaintletter(data.Id).FirstOrDefault();
+ var challengeletterDTO = _cooperOrderService.GetListChallengeletter(data.TsrId).FirstOrDefault();
if (complaintletterDTO != null)
{
complaintletterDTO.TsrName = data.TsrName;
@@ -750,6 +758,7 @@
complaintletterDTO.TsrPostcode = data.TsrPostcode;
complaintletterDTO.TsrCorporation = data.TsrCorporation;
complaintletterDTO.TsrPhone = data.TsrPhone;
+ complaintletterDTO.TsrId = data.TsrId;
complaintletterDTO.XmName = data.tousuXmName;
complaintletterDTO.XmCode = data.tousuXmCode;
@@ -764,6 +773,10 @@
complaintletterDTO.Modifier = curentuser.Id;
complaintletterDTO.Modifytime = DateTime.Now;
complaintletterDTO.Status = 1;
+ if (challengeletterDTO != null)
+ {
+ complaintletterDTO.RequestInfo = challengeletterDTO.RequestInfo;
+ }
resultEntity = _cooperOrderService.saveComplaintletter(complaintletterDTO);
}
else
@@ -775,6 +788,7 @@
complaintletterDTO.TsrPostcode = data.TsrPostcode;
complaintletterDTO.TsrCorporation = data.TsrCorporation;
complaintletterDTO.TsrPhone = data.TsrPhone;
+ complaintletterDTO.TsrId = data.TsrId;
complaintletterDTO.XmName = data.tousuXmName;
complaintletterDTO.XmCode = data.tousuXmCode;
@@ -791,6 +805,10 @@
complaintletterDTO.Creater = curentuser.Id;
complaintletterDTO.Createtime = complaintletterDTO.Modifytime;
complaintletterDTO.Status = 1;
+ if (challengeletterDTO != null)
+ {
+ complaintletterDTO.RequestInfo = challengeletterDTO.RequestInfo;
+ }
resultEntity = _cooperOrderService.saveComplaintletter(complaintletterDTO);
}
resultEntity = _cooperOrderService.deleteComplaintShouquandaibiao(complaintletterDTO.Id);
@@ -866,6 +884,30 @@
}
}
+
+ resultEntity = _cooperOrderService.deleteChallengeItem(complaintletterDTO.Id);
+ if (challengeletterDTO!=null)
+ {
+ var challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
+ if (challengeItemDTOs != null && challengeItemDTOs.Count > 0)
+ {
+ for (int i = 0; i < challengeItemDTOs.Count; i++)
+ {
+
+ var complaintItemDTO = new TComplaintItemDTO();
+ complaintItemDTO.ComplaintId = complaintletterDTO.Id;
+ complaintItemDTO.Question = challengeItemDTOs[i].Question;
+ complaintItemDTO.Evidential = challengeItemDTOs[i].Evidential;
+ //complaintItemDTO.Law = data.Law[i];
+ //complaintItemDTO.Lawcoment = data.Lawcoment[i];
+ complaintItemDTO.Sort = i;
+ resultEntity = _cooperOrderService.saveComplaintItem(complaintItemDTO);
+
+
+ }
+ }
+ }
+
}
else if (data.OrderType1 == "浠ｆ嫙璐ㄧ枒鍑�")
@@ -1377,7 +1419,7 @@
var shi = _fiBookService.GetList().Select(x => new { code = x.Id, label = x.BookName }).ToList();
result = JsonConvert.SerializeObject(shi);
}
- if (OrderType == "02" || OrderType == "04" || OrderType == "06" || OrderType == "09")
+ if (OrderType == "02" || OrderType == "04" || OrderType == "06" || OrderType == "09" || OrderType == "08")
{
var shi = _fiServiceService.GetList().Where(x=>x.ServiceTypeTop == OrderType).Select(x => new { code = x.ServiceType, label = x.ServiceType }).Distinct().ToList();
result = JsonConvert.SerializeObject(shi);
@@ -1393,7 +1435,7 @@
result = JsonConvert.SerializeObject(shi);
}
- if (OrderType == "08" || OrderType == "10" || OrderType == "11")
+ if (OrderType == "10" || OrderType == "11")
{
result = "[]";
@@ -1576,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();
@@ -1663,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() };
}
@@ -1681,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() };
}
@@ -1723,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;
@@ -1744,6 +1788,7 @@
// resultEntity.Message = sysCodeDtl.Contents;
//}
resultEntity.Message = no;
+ resultEntity.Remark = challengeItemId;
resultEntity.DataList = sysCodeDtls;
return new JsonResult(resultEntity);
@@ -1807,51 +1852,124 @@
for (int i = 0; i < challengeletterDTO.challengeItemDTOs.Count; i++)
{
- data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
- data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\">鎶曡瘔浜嬮」"+(i != 0 ? (i + "") : "") + "</label>");
- data.Append("<div class=\"col-sm-4 col-md-4\" grouptype =\"Vdata\" > ");
- data.Append(" <select class=\"form - control\" name=\"Question\" data-placeholder=\"閫夋嫨 搴忓垪...\" onchange=\"Questionchangge("+ i + "); \">");
- data.Append("<option value=\"\" hassubinfo=\"true\">璇烽�夋嫨</option>");
- foreach (var item in question)
+ if (challengeletterDTO.challengeItemDTOs.Count == 1)
{
- if (!item.CodeSn.Equals(challengeletterDTO.challengeItemDTOs[i].Question))
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" id=\"Questionlabel\" class=\"text-right col-sm-1 col-md-1 control-label\">鎶曡瘔浜嬮」</label>");
+ data.Append("<div class=\"col-sm-4 col-md-4\" grouptype =\"Vdata\" > ");
+ data.Append(" <select class=\"form - control\" name=\"Question\" data-placeholder=\"閫夋嫨 搴忓垪...\" onchange=\"Questionchangge(" + i + "); \">");
+ data.Append("<option value=\"\" hassubinfo=\"true\">璇烽�夋嫨</option>");
+ foreach (var item in question)
{
- data.Append("<option value=\""+ item.CodeSn + "\" hassubinfo=\"true\">"+ item.Comments + "</option>");
+ if (!item.CodeSn.Equals(challengeletterDTO.challengeItemDTOs[i].Question))
+ {
+ data.Append("<option value=\"" + item.CodeSn + "\" hassubinfo=\"true\">" + item.Comments + "</option>");
+ }
+ else
+ {
+ data.Append("<option value=\"" + item.CodeSn + "\" hassubinfo=\"true\" selected=\"selected\" >" + item.Comments + "</option>");
+ }
}
- else
- {
- data.Append("<option value=\"" + item.CodeSn + "\" hassubinfo=\"true\" selected=\"selected\" >" + item.Comments + "</option>");
- }
- }
data.Append("</select>");
- data.Append(" </div>");
- if (i == 0)
- {
- data.Append("<div class=\"col-sm-2 col-md-2\" grouptype=\"Vdata\"> <button type=\"button\" class=\"addBtn\" onclick =\"addzhiyishixiang(this)\" data-type=\"1\" > 鎶曡瘔浜嬮」</button> </div>");
- }
- data.Append(" </div>");
- data.Append("<div class=\"clearfix layer-area\" style =\"padding-bottom:15px; \" > ");
- data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 浜嬪疄渚濇嵁" + (i != 0 ? (i + "") : "") + "</label>");
- data.Append(" <div class=\"col-sm-8 col-md-8\" > ");
- data.Append("<textarea class=\"form-control bt\" name =\"Evidential\" title =\"浜嬪疄渚濇嵁\" isempty =\"\" maxlength =\"300\" length =\"long\" > "+ challengeletterDTO.challengeItemDTOs[i].Evidential + "</textarea>");
- data.Append("</div>");
- data.Append("</div>");
- data.Append(" <div id=\"falvyiju" + i + "\">");
- for (int j = 0; j < challengeletterDTO.challengeItemDTOs[i].sysCodeDtls.Count; j++)
- {
- data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
- data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 娉曞緥渚濇嵁" + (i != 0 ? (i + "") : "") + "</label>");
- data.Append("<div class=\"col-sm-8 col-md-8\" > " + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].CodeSn + "</div>");
+ data.Append(" </div>");
+ if (i == 0)
+ {
+ data.Append("<div class=\"col-sm-2 col-md-2\" grouptype=\"Vdata\"> <button type=\"button\" class=\"addBtn\" onclick =\"addzhiyishixiang(this)\" data-type=\"1\" > 鎶曡瘔浜嬮」</button> </div>");
+ }
+ data.Append(" </div>");
+ data.Append("<div class=\"clearfix layer-area\" style =\"padding-bottom:15px; \" > ");
+ data.Append("<label grouptype=\"Vdata\" id=\"Evidentiallabel\" class=\"text-right col-sm-1 col-md-1 control-label\" > 浜嬪疄渚濇嵁</label>");
+ data.Append(" <div class=\"col-sm-8 col-md-8\" > ");
+ data.Append("<textarea class=\"form-control bt\" name =\"Evidential\" title =\"浜嬪疄渚濇嵁\" isempty =\"\" maxlength =\"300\" length =\"long\" > " + challengeletterDTO.challengeItemDTOs[i].Evidential + "</textarea>");
data.Append("</div>");
+ data.Append("</div>");
+ data.Append(" <div id=\"falvyiju" + i + "\">");
+ for (int j = 0; j < challengeletterDTO.challengeItemDTOs[i].sysCodeDtls.Count; j++)
+ {
+ if (challengeletterDTO.challengeItemDTOs[i].sysCodeDtls.Count == 1)
+ {
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 娉曞緥渚濇嵁</label>");
+ data.Append("<div class=\"col-sm-8 col-md-8\" > 銆�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].CodeSn + "銆�"+ challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "锛�"+ challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Contents + "</div>");
+ data.Append("</div>");
- data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
- data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 鍐呭" + (i != 0 ? (i + "") : "") + "</label>");
- data.Append("<div class=\"col-sm-8 col-md-8\" > " + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Contents + "</div>");
+
+ }
+ else
+ {
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 娉曞緥渚濇嵁" + (i +1) + "</label>");
+ data.Append("<div class=\"col-sm-8 col-md-8\" > 銆�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].CodeSn + "銆�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "锛�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Contents + "</div>");
+ data.Append("</div>");
+
+
+ }
+
+ }
+
+
data.Append("</div>");
}
-
-
- data.Append("</div>");
+ else
+ {
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\">鎶曡瘔浜嬮」" + (i +1) + "</label>");
+ data.Append("<div class=\"col-sm-4 col-md-4\" grouptype =\"Vdata\" > ");
+ data.Append(" <select class=\"form - control\" name=\"Question\" data-placeholder=\"閫夋嫨 搴忓垪...\" onchange=\"Questionchangge(" + i + "); \">");
+ data.Append("<option value=\"\" hassubinfo=\"true\">璇烽�夋嫨</option>");
+ foreach (var item in question)
+ {
+ if (!item.CodeSn.Equals(challengeletterDTO.challengeItemDTOs[i].Question))
+ {
+ data.Append("<option value=\"" + item.CodeSn + "\" hassubinfo=\"true\">" + item.Comments + "</option>");
+ }
+ else
+ {
+ data.Append("<option value=\"" + item.CodeSn + "\" hassubinfo=\"true\" selected=\"selected\" >" + item.Comments + "</option>");
+ }
+ }
+ data.Append("</select>");
+ data.Append(" </div>");
+ if (i == 0)
+ {
+ data.Append("<div class=\"col-sm-2 col-md-2\" grouptype=\"Vdata\"> <button type=\"button\" class=\"addBtn\" onclick =\"addzhiyishixiang(this)\" data-type=\"1\" > 鎶曡瘔浜嬮」</button> </div>");
+ }
+ data.Append(" </div>");
+ data.Append("<div class=\"clearfix layer-area\" style =\"padding-bottom:15px; \" > ");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 浜嬪疄渚濇嵁" + (i + 1) + "</label>");
+ data.Append(" <div class=\"col-sm-8 col-md-8\" > ");
+ data.Append("<textarea class=\"form-control bt\" name =\"Evidential\" title =\"浜嬪疄渚濇嵁\" isempty =\"\" maxlength =\"300\" length =\"long\" > " + challengeletterDTO.challengeItemDTOs[i].Evidential + "</textarea>");
+ data.Append("</div>");
+ data.Append("</div>");
+ data.Append(" <div id=\"falvyiju" + i + "\">");
+ for (int j = 0; j < challengeletterDTO.challengeItemDTOs[i].sysCodeDtls.Count; j++)
+ {
+ if (challengeletterDTO.challengeItemDTOs[i].sysCodeDtls.Count == 1)
+ {
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 娉曞緥渚濇嵁</label>");
+ data.Append("<div class=\"col-sm-8 col-md-8\" > 銆�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].CodeSn + "銆�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "锛�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Contents + "</div>");
+ data.Append("</div>");
+
+
+ }
+ else
+ {
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 娉曞緥渚濇嵁" + (i + 1) + "</label>");
+ data.Append("<div class=\"col-sm-8 col-md-8\" > 銆�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].CodeSn + "銆�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "锛�" + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Contents + "</div>");
+ data.Append("</div>");
+
+
+ }
+ }
+
+
+ data.Append("</div>");
+ }
+
+
+
}
challengeletterDTO.GysId = data.ToString();
@@ -1906,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);
@@ -1930,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);
@@ -1967,14 +2085,31 @@
{
if (!(string.IsNullOrEmpty(data.Question[i])
&& string.IsNullOrEmpty(data.Evidential[i])
- && string.IsNullOrEmpty(data.Law[i])
- && string.IsNullOrEmpty(data.Lawcoment[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);
@@ -2019,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;
}
}
@@ -2034,13 +2173,13 @@
if (complaintShouquandaibiaoDTOs.Count > 0)
challengeletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
else
- challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+ challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() /*{ new TComplaintShouquandaibiaoDTO() }*/;
}
else
{
challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
- challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+ challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() /*{ new TComplaintShouquandaibiaoDTO() }*/;
}
//ViewBag.challengeletterDTO = challengeletterDTO;
@@ -2116,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() };
}
@@ -2142,20 +2287,71 @@
if (complaintGongyingshangDTOs.Count > 0)
complaintletterDTO.complaintGongyingshangDTOs = complaintGongyingshangDTOs;
else
- complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() };
+ complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() /*{ new TComplaintGongyingshangDTO() }*/;
}
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() };
+ 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();//璐ㄧ枒璇锋眰
@@ -2166,7 +2362,7 @@
ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");
- ViewBag.ChallengeletterChosen = _cooperOrderService.GetListChallengeletterChosen();
+ ViewBag.ChallengeletterChosen = _cooperOrderService.GetListChallengeletterChosen().Where(x => x.Createtime >= DateTime.Now.AddMonths(-2)).ToList(); ;
ViewData.Model = complaintletterDTO;
return View();
@@ -2233,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;
@@ -2272,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;
@@ -2364,14 +2560,31 @@
{
if (!(string.IsNullOrEmpty(data.Question[i])
&& string.IsNullOrEmpty(data.Evidential[i])
- && string.IsNullOrEmpty(data.Law[i])
- && string.IsNullOrEmpty(data.Lawcoment[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);
@@ -2434,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;
}
}
@@ -2455,13 +2672,13 @@
if (complaintShouquandaibiaoDTOs.Count > 0)
complaintletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
else
- complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+ complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() /*{ new TComplaintShouquandaibiaoDTO() }*/;
List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = _cooperOrderService.GetListComplaintGongyingshang(complaintletterDTO.Id);
if (complaintGongyingshangDTOs.Count > 0)
complaintletterDTO.complaintGongyingshangDTOs = complaintGongyingshangDTOs;
else
- complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() };
+ complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
}
else
@@ -2469,8 +2686,8 @@
complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
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() };
+ complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>()/* { new TComplaintShouquandaibiaoDTO() }*/;
+ complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() /*{ new TComplaintGongyingshangDTO() }*/;
}
@@ -2523,5 +2740,93 @@
ViewData.Model = complaintletterDTO;
return View();
}
+
+
+
+
+ public IActionResult Printbiaoshuhetong(string id = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ var cooperOrderDTO = _cooperOrderService.Get(id);
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(cooperOrderDTO.Khdw);
+ cooperOrderDTO.MoneyName = MoneyToUpperHelper.MoneyToUpper(cooperOrderDTO.Money.Value.ToString("0.##"));
+
+ ViewData["cooperOrderDTO"] = cooperOrderDTO;
+ ViewData["cooperatecustomCustomerDTO"] = cooperatecustomCustomerDTO;
+
+
+ return View();
+ }
+
+ public IActionResult Printzhiyitousuhetong(string id = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ var cooperOrderDTO = _cooperOrderService.Get(id);
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(cooperOrderDTO.Khdw);
+ cooperOrderDTO.MoneyName = MoneyToUpperHelper.MoneyToUpper(cooperOrderDTO.Money.Value.ToString("0.##"));
+
+ ViewData["cooperOrderDTO"] = cooperOrderDTO;
+ ViewData["cooperatecustomCustomerDTO"] = cooperatecustomCustomerDTO;
+
+
+ return View();
+ }
+
+ public IActionResult Printhuiyuanhetong(string id = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ var cooperOrderDTO = _cooperOrderService.Get(id);
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(cooperOrderDTO.Khdw);
+ cooperOrderDTO.MoneyName = MoneyToUpperHelper.MoneyToUpper(cooperOrderDTO.Money.Value.ToString("0.##"));
+
+ FiMemberDTO fiMemberDTO = _fiMemberService.GetList().Where(x => x.Id == cooperOrderDTO.OrderType1).FirstOrDefault();
+
+ if (fiMemberDTO != null)
+ {
+ cooperOrderDTO.OrderType1Name = fiMemberDTO.MemberType;
+ cooperOrderDTO.OrderType2 = fiMemberDTO.MemberAuthority;
+ }
+
+
+
+
+ ViewData["cooperOrderDTO"] = cooperOrderDTO;
+ ViewData["cooperatecustomCustomerDTO"] = cooperatecustomCustomerDTO;
+
+
+ return View();
+ }
+
+ public IActionResult Printfengxianhetong(string id = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ var cooperOrderDTO = _cooperOrderService.Get(id);
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(cooperOrderDTO.Khdw);
+ cooperOrderDTO.MoneyName = MoneyToUpperHelper.MoneyToUpper(cooperOrderDTO.Money.Value.ToString("0.##"));
+ var jichumoney = cooperOrderDTO.Jichumoney.HasValue ? cooperOrderDTO.Jichumoney.Value : 0;
+ var tuihuimoney = cooperOrderDTO.Money.Value - jichumoney;
+
+ cooperOrderDTO.Jichumoney = tuihuimoney;
+ cooperOrderDTO.JichumoneyName = MoneyToUpperHelper.MoneyToUpper(tuihuimoney.ToString("0.##"));
+
+
+
+
+ ViewData["cooperOrderDTO"] = cooperOrderDTO;
+ ViewData["cooperatecustomCustomerDTO"] = cooperatecustomCustomerDTO;
+
+
+ return View();
+ }
+
+
}
}
--
Gitblit v1.9.1