From a8443b50329759fcfa77bbe68b88ebac98fa8fc9 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期四, 30 十二月 2021 10:40:36 +0800 Subject: [PATCH] 文书排版 --- zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 215 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 161 insertions(+), 54 deletions(-) diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs index 0975306..638a5d5 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; @@ -743,6 +744,7 @@ { //鏌ヨ涓昏〃 var complaintletterDTO = _cooperOrderService.GetListComplaintletter(data.Id).FirstOrDefault(); + var challengeletterDTO = _cooperOrderService.GetListChallengeletter(data.TsrId).FirstOrDefault(); if (complaintletterDTO != null) { complaintletterDTO.TsrName = data.TsrName; @@ -750,6 +752,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 +767,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 +782,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 +799,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 +878,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 == "浠f嫙璐ㄧ枒鍑�") @@ -1807,51 +1843,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(); @@ -1967,8 +2076,7 @@ { if (!(string.IsNullOrEmpty(data.Question[i]) && string.IsNullOrEmpty(data.Evidential[i]) - && string.IsNullOrEmpty(data.Law[i]) - && string.IsNullOrEmpty(data.Lawcoment[i]))) + )) { var challengeItemDTO = new TChallengeItemDTO(); challengeItemDTO.ChallengeId = challengeletterDTO.Id; @@ -2034,13 +2142,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; @@ -2142,7 +2250,7 @@ if (complaintGongyingshangDTOs.Count > 0) complaintletterDTO.complaintGongyingshangDTOs = complaintGongyingshangDTOs; else - complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() }; + complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() /*{ new TComplaintGongyingshangDTO() }*/; } else @@ -2151,7 +2259,7 @@ 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() }*/; } @@ -2166,7 +2274,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(); @@ -2364,8 +2472,7 @@ { if (!(string.IsNullOrEmpty(data.Question[i]) && string.IsNullOrEmpty(data.Evidential[i]) - && string.IsNullOrEmpty(data.Law[i]) - && string.IsNullOrEmpty(data.Lawcoment[i]))) + )) { var complaintItemDTO = new TComplaintItemDTO(); complaintItemDTO.ComplaintId = complaintletterDTO.Id; @@ -2455,13 +2562,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 +2576,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() }*/; } -- Gitblit v1.9.1