From 65e60c2c3c2eb2c175cf7d2a08295d08c585f626 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 21 十二月 2021 14:45:20 +0800
Subject: [PATCH] 投诉书,质疑书

---
 zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs |  279 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 250 insertions(+), 29 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 2fad9f5..cc6a92d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1539,6 +1539,13 @@
             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();
@@ -1593,6 +1600,14 @@
         {
             var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
             ViewData["curentuser"] = curentuser;
+            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+            var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+            foreach (var sysCodeDtl in sysCodeDtls1)
+            {
+                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+                if (sysCodeDtl1 != null)
+                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+            }
 
             //璐ㄧ枒鍑�
             List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
@@ -1606,9 +1621,20 @@
                 }
                 List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
                 if (challengeItemDTOs.Count > 0)
+                {
                     challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
+                    foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
+                    {
+                      var sysCodeDtls2 =  sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
+                        challengeItemDTO.sysCodeDtls = sysCodeDtls2;
+                    }
+                }
                 else
+                {
                     challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                    challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+                }
+                  
                 List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
 
                 if (complaintShouquandaibiaoDTOs.Count > 0)
@@ -1619,6 +1645,7 @@
             else
             {
                 challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
                 challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
             }
             //ViewBag.challengeletterDTO = challengeletterDTO;
@@ -1628,15 +1655,7 @@
 
             ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info").OrderBy(x=>x.CodeSn).ToList();//璐ㄧ枒璇锋眰
             ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question").OrderBy(x => x.CodeSn).ToList(); //	璐ㄧ枒浜嬮」
-            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
-            var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
-            foreach ( var sysCodeDtl in sysCodeDtls1)
-            {
-                var sysCodeDtl1  = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
-                if (sysCodeDtl1 != null)
-                    sysCodeDtl.Comments = sysCodeDtl1.Comments;
-            }
-
+           
             ViewBag.law = sysCodeDtls1;//娉曞緥渚濇嵁
 
 
@@ -1680,7 +1699,7 @@
             {
                 var sysCodeDtl1 = sysCodeDtls1.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
                 if (sysCodeDtl1 != null)
-                    sysCodeDtl.Comments = sysCodeDtl1.Comments;
+                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
             }
 
             //if (sysCodeDtl != null)
@@ -1691,6 +1710,118 @@
             resultEntity.DataList = sysCodeDtls;
 
             return new JsonResult(resultEntity);
+        }
+
+
+        public IActionResult getZhiyihan(string id = null)
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+            var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+            foreach (var sysCodeDtl in sysCodeDtls1)
+            {
+                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+                if (sysCodeDtl1 != null)
+                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+            }
+
+            //璐ㄧ枒鍑�
+            List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
+            TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+            if (challengeletterDTOs != null && challengeletterDTOs.Count > 0)
+            {
+                challengeletterDTO = challengeletterDTOs[0];
+                if (challengeletterDTO.DocumentsDate.HasValue)
+                {
+                    challengeletterDTO.DocumentsDateName = challengeletterDTO.DocumentsDate.Value.ToString("yyyy-MM-dd");
+                }
+                List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
+                if (challengeItemDTOs.Count > 0)
+                {
+                    challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
+                    foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
+                    {
+                        var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
+                        challengeItemDTO.sysCodeDtls = sysCodeDtls2;
+                    }
+                }
+                else
+                {
+                    challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                    challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+                }
+
+                List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
+
+                if (complaintShouquandaibiaoDTOs.Count > 0)
+                    challengeletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
+                else
+                    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() };
+            }
+            var question = _liaotianService.GetSYScode("t_challenge_items", "question").OrderBy(x => x.CodeSn).ToList(); //	璐ㄧ枒浜嬮」
+            StringBuilder data = new StringBuilder();
+
+            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 (!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 != 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>");
+
+                    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>");
+                    data.Append("</div>");
+                }
+                   
+              
+                data.Append("</div>");
+            }
+
+            challengeletterDTO.GysId = data.ToString();
+
+            return new JsonResult(challengeletterDTO);
+
+ 
         }
 
         /// <summary>
@@ -1806,8 +1937,8 @@
                             challengeItemDTO.ChallengeId = challengeletterDTO.Id;
                             challengeItemDTO.Question = data.Question[i];
                             challengeItemDTO.Evidential = data.Evidential[i];
-                            challengeItemDTO.Law = data.Law[i];
-                            challengeItemDTO.Lawcoment = data.Lawcoment[i];
+                            //challengeItemDTO.Law = data.Law[i];
+                            //challengeItemDTO.Lawcoment = data.Lawcoment[i];
                             challengeItemDTO.Sort = i;
                             resultEntity = _cooperOrderService.saveChallengeItem(challengeItemDTO);
                         }
@@ -1826,7 +1957,14 @@
         {
             var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
             ViewData["curentuser"] = curentuser;
-
+            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+            var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+            foreach (var sysCodeDtl in sysCodeDtls1)
+            {
+                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+                if (sysCodeDtl1 != null)
+                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+            }
             //璐ㄧ枒鍑�
             List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
             TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
@@ -1839,9 +1977,21 @@
                 }
                 List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
                 if (challengeItemDTOs.Count > 0)
+                {
                     challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
+                    foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
+                    {
+                        var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
+                        challengeItemDTO.sysCodeDtls = sysCodeDtls2;
+                    }
+                }
+                  
                 else
+                {
                     challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                    challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+                }
+                  
                 List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
 
                 if (complaintShouquandaibiaoDTOs.Count > 0)
@@ -1852,6 +2002,7 @@
             else
             {
                 challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
                 challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
             }
             //ViewBag.challengeletterDTO = challengeletterDTO;
@@ -1885,7 +2036,15 @@
         {
             var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
             ViewData["curentuser"] = curentuser;
+            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+            var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
 
+            foreach (var sysCodeDtl in sysCodeDtls1)
+            {
+                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+                if (sysCodeDtl1 != null)
+                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+            }
             //鎶曡瘔涔�
             List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
             TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
@@ -1915,9 +2074,20 @@
 
                 List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
                 if (complaintItemDTOs.Count > 0)
+                {
                     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() };
+                }
+                   
 
                 List<TComplaintRespondentDTO> complaintRespondentDTOs = _cooperOrderService.GetListComplaintRespondent(complaintletterDTO.Id);
                 if (complaintRespondentDTOs.Count > 0)
@@ -1941,6 +2111,7 @@
             else
             {
                 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() };
@@ -1952,21 +2123,13 @@
 
             ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info").OrderBy(x => x.CodeSn).ToList();//璐ㄧ枒璇锋眰
             ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question").OrderBy(x => x.CodeSn).ToList(); //	璐ㄧ枒浜嬮」
-            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
-            var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
-           
-            foreach (var sysCodeDtl in sysCodeDtls1)
-            {
-                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
-                if (sysCodeDtl1 != null)
-                    sysCodeDtl.Comments = sysCodeDtl1.Comments;
-            }
+            
 
             ViewBag.law = sysCodeDtls1;//娉曞緥渚濇嵁
 
             ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");
 
-
+            ViewBag.ChallengeletterChosen = _cooperOrderService.GetListChallengeletterChosen();
 
             ViewData.Model = complaintletterDTO;
             return View();
@@ -2036,6 +2199,7 @@
                     complaintletterDTO.Status = 2;
                     complaintletterDTO.RequestInfo = data.RequestInfo;
                     complaintletterDTO.PrintNum = data.PrintNum;
+                    complaintletterDTO.TsrId = data.TsrId;
                     resultEntity = _cooperOrderService.saveComplaintletter(complaintletterDTO);
                 }
                 else
@@ -2074,6 +2238,7 @@
                     complaintletterDTO.Status = 2;
                     complaintletterDTO.RequestInfo = data.RequestInfo;
                     complaintletterDTO.PrintNum = data.PrintNum;
+                    complaintletterDTO.TsrId = data.TsrId;
                     resultEntity = _cooperOrderService.saveComplaintletter(complaintletterDTO);
                 }
 
@@ -2169,8 +2334,8 @@
                             complaintItemDTO.ComplaintId = complaintletterDTO.Id;
                             complaintItemDTO.Question = data.Question[i];
                             complaintItemDTO.Evidential = data.Evidential[i];
-                            complaintItemDTO.Law = data.Law[i];
-                            complaintItemDTO.Lawcoment = data.Lawcoment[i];
+                            //complaintItemDTO.Law = data.Law[i];
+                            //complaintItemDTO.Lawcoment = data.Lawcoment[i];
                             complaintItemDTO.Sort = i;
                             resultEntity = _cooperOrderService.saveComplaintItem(complaintItemDTO);
                         }
@@ -2190,7 +2355,14 @@
         {
             var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
             ViewData["curentuser"] = curentuser;
-
+            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+            var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+            foreach (var sysCodeDtl in sysCodeDtls1)
+            {
+                var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+                if (sysCodeDtl1 != null)
+                    sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+            }
             //鎶曡瘔涔�
             List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
             TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
@@ -2210,19 +2382,31 @@
 
                 if (complaintletterDTO.ChallengeDate.HasValue)
                 {
-                    complaintletterDTO.ChallengeDateName = complaintletterDTO.ChallengeDate.Value.ToString("yyyy-MM-dd");
+                    complaintletterDTO.ChallengeDateName = complaintletterDTO.ChallengeDate.Value.ToString("yyyy骞碝M鏈坉d鏃�");
                 }
                 if (complaintletterDTO.RespondDate.HasValue)
                 {
-                    complaintletterDTO.RespondDateName = complaintletterDTO.RespondDate.Value.ToString("yyyy-MM-dd");
+                    complaintletterDTO.RespondDateName = complaintletterDTO.RespondDate.Value.ToString("yyyy骞碝M鏈坉d鏃�");
                 }
 
 
                 List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
                 if (complaintItemDTOs.Count > 0)
+                {
                     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() };
+                }
+                    
 
                 List<TComplaintRespondentDTO> complaintRespondentDTOs = _cooperOrderService.GetListComplaintRespondent(complaintletterDTO.Id);
                 if (complaintRespondentDTOs.Count > 0)
@@ -2246,6 +2430,7 @@
             else
             {
                 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() };
@@ -2253,10 +2438,46 @@
             }
 
 
+            if (string.IsNullOrEmpty(complaintletterDTO.ChallengeDateName))
+            {
+                complaintletterDTO.ChallengeDateName = "銆�銆�骞淬��鏈堛��鏃�";
+            }
+            if (string.IsNullOrEmpty(complaintletterDTO.Questioned))
+            {
+                complaintletterDTO.Questioned = "銆�銆�銆�銆�銆�銆�";
+            }
+            if (string.IsNullOrEmpty(complaintletterDTO.Respondent))
+            {
+                complaintletterDTO.Respondent = "銆�銆�銆�銆�銆�銆�";
+            }
+            if (string.IsNullOrEmpty(complaintletterDTO.RespondDateName))
+            {
+                complaintletterDTO.RespondDateName = "銆�銆�骞淬��鏈堛��鏃�";
+            }
 
+            //璐ㄧ枒鍑�
+            List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(complaintletterDTO.TsrId);
+            TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+            if (challengeletterDTOs != null && challengeletterDTOs.Count > 0)
+            {
+                challengeletterDTO = challengeletterDTOs[0];
 
+                List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
+                complaintletterDTO.SqdbId = "";
+                if (challengeItemDTOs.Count > 0)
+                {
+                   
+                    foreach (var challengeItemDTO in challengeItemDTOs)
+                    {
+                        
+                        complaintletterDTO.SqdbId += challengeItemDTO.QuestionName+";";
+                    }
+                }
+                
 
-
+                
+            }
+             
 
 
 

--
Gitblit v1.9.1