From 8878b4d2c65329d454688d306e9d692c760bffe5 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 30 十一月 2021 14:32:39 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs | 4 +-
zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml | 16 ++++++++
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs | 2
zhengcaioa/DTO/TChallengeletterDTO.cs | 1
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml | 2
zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js | 2
zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs | 2
zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs | 2
zhengcaioa/DTO/TComplaintletterDTO.cs | 5 ++
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 56 +++++++++++++++++++++++++++
10 files changed, 84 insertions(+), 8 deletions(-)
diff --git a/zhengcaioa/DTO/TChallengeletterDTO.cs b/zhengcaioa/DTO/TChallengeletterDTO.cs
index 7a5a448..3f41f98 100644
--- a/zhengcaioa/DTO/TChallengeletterDTO.cs
+++ b/zhengcaioa/DTO/TChallengeletterDTO.cs
@@ -36,5 +36,6 @@
public DateTime? Modifytime { get; set; }
public string Modifier { get; set; }
public int? Status { get; set; }
+ public List<TChallengeItemDTO> challengeItemDTOs { get; set; }
}
}
diff --git a/zhengcaioa/DTO/TComplaintletterDTO.cs b/zhengcaioa/DTO/TComplaintletterDTO.cs
index 775b2c0..c81f6aa 100644
--- a/zhengcaioa/DTO/TComplaintletterDTO.cs
+++ b/zhengcaioa/DTO/TComplaintletterDTO.cs
@@ -47,5 +47,10 @@
public DateTime? Modifytime { get; set; }
public string Modifier { get; set; }
public int? Status { get; set; }
+ public List<TComplaintItemDTO> complaintItemDTOs { get; set; }
+ public List<TComplaintRespondentDTO> complaintRespondentDTOs { get; set; }
+
+
+
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index c4cdcf7..9465279 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -417,6 +417,48 @@
dto = _cooperOrderService.Get(id);
ViewBag.ShouliStatus = ShouliStatus;
//ViewBag.YouHuiList = _askService.GetAskYouHuiList(dto.Khdw, dto.OrderType);
+ //璐ㄧ枒鍑�
+ List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
+ TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+ if (challengeletterDTOs!=null&& challengeletterDTOs.Count > 0)
+ {
+ challengeletterDTO = challengeletterDTOs[0];
+ List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
+ if(challengeItemDTOs.Count>0)
+ challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
+ else
+ challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ }
+ else
+ {
+ challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ }
+ ViewBag.challengeletterDTO = challengeletterDTO;
+ //鎶曡瘔涔�
+ List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
+ TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
+ if (complaintletterDTOs != null && complaintletterDTOs.Count > 0)
+ {
+ complaintletterDTO = complaintletterDTOs[0];
+ List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
+ if (complaintItemDTOs.Count > 0)
+ complaintletterDTO.complaintItemDTOs = complaintItemDTOs;
+ else
+ complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+
+ List<TComplaintRespondentDTO> complaintRespondentDTOs = _cooperOrderService.GetListComplaintRespondent(complaintletterDTO.Id);
+ if (complaintRespondentDTOs.Count > 0)
+ complaintletterDTO.complaintRespondentDTOs = complaintRespondentDTOs;
+ else
+ complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
+
+ }
+ else
+ {
+ complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
+ }
+ ViewBag.complaintletterDTO = complaintletterDTO;
}
else
{
@@ -425,8 +467,20 @@
ViewBag.ShouliStatus = "1";
dto.OrderNo = _cooperOrderService.GetOrderNo();
//ViewBag.YouHuiList = new List<AdmAskYouHuiDTO>();
- }
+ //璐ㄧ枒鍑�
+ TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+ challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ ViewBag.challengeletterDTO = challengeletterDTO;
+ //鎶曡瘔涔�
+ TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
+ complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO()};
+ ViewBag.complaintletterDTO = complaintletterDTO;
+ }
+ ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info");//璐ㄧ枒璇锋眰
+ ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question"); // 璐ㄧ枒浜嬮」
+ ViewBag.law = _liaotianService.GetSYScode("t_complaint_items", "law");//娉曞緥渚濇嵁
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
index 3d4c9fa..6b6596e 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -160,7 +160,7 @@
resultEntity.Message = "鏃犺仈绯讳汉";
}
- string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛屽鎴�. 璇︽儏瑙侊細" + neirong);
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛�" + neirong + " 璇︽儏瑙侊細http://51zhengcai.com/");
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
index 441c518..479b310 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
@@ -212,7 +212,7 @@
resultEntity.Message = "鏃犺仈绯讳汉";
}
- string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛屽鎴�. 璇︽儏瑙侊細" + neirong);
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛�" + neirong + " 璇︽儏瑙侊細http://51zhengcai.com/");
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
index de561dc..ed15861 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
@@ -247,7 +247,7 @@
IntentionCustomerDTO intentionCustomerDTO = _intentionCustomerService.Get(data.Viscustomer);
if(intentionCustomerDTO!=null && ( !string.IsNullOrEmpty(intentionCustomerDTO.Phone) || !string.IsNullOrEmpty(intentionCustomerDTO.Tel)))
{
- string sss = SMSHelper.PushWToUserMES(string.IsNullOrEmpty(intentionCustomerDTO.Phone)? intentionCustomerDTO.Tel: intentionCustomerDTO.Phone, "鎮ㄥソ锛屽鎴�. 璇︽儏瑙侊細"+data.DuanxinNeirong);
+ string sss = SMSHelper.PushWToUserMES(string.IsNullOrEmpty(intentionCustomerDTO.Phone)? intentionCustomerDTO.Tel: intentionCustomerDTO.Phone, "鎮ㄥソ锛�" + data.DuanxinNeirong + " 璇︽儏瑙侊細http://51zhengcai.com/" );
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
@@ -342,7 +342,7 @@
resultEntity.Message = "鏃犺仈绯讳汉";
}
- string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛屽鎴�. 璇︽儏瑙侊細" + neirong );
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛�" + neirong + " 璇︽儏瑙侊細http://51zhengcai.com/");
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
diff --git a/zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs b/zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs
index e4e68ec..fa75a54 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs
@@ -653,7 +653,7 @@
resultEntity.Message = "鏃犺仈绯荤數璇�";
}
- string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛屼笓瀹�. 璇︽儏瑙侊細" + neirong);
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛�"+neirong+" 璇︽儏瑙侊細http://51zhengcai.com/" );
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
index 87827bd..e42be0b 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
@@ -14,6 +14,22 @@
//List<SysCodeDtl> YouHuiList = ViewData["YouHuiList"] as List<SysCodeDtl>; //浼樻儬鍒楄〃
+ TChallengeletterDTO challengeletterDTO = ViewData["challengeletterDTO"] as TChallengeletterDTO; //璐ㄧ枒鍑�
+
+ List<TChallengeItemDTO> challengeItemDTOs = challengeletterDTO.challengeItemDTOs;
+
+ TComplaintletterDTO complaintletterDTO = ViewData["complaintletterDTO"] as TComplaintletterDTO; //鎶曡瘔涔�
+
+ List<TComplaintItemDTO> complaintItemDTOs = complaintletterDTO.complaintItemDTOs;
+
+ List<TComplaintRespondentDTO> complaintRespondentDTOs = complaintletterDTO.complaintRespondentDTOs;
+
+ List<SysCodeDtl> request_info = ViewData["request_info"] as List<SysCodeDtl>; //璐ㄧ枒璇锋眰
+
+ List<SysCodeDtl> question = ViewData["question"] as List<SysCodeDtl>; //璐ㄧ枒浜嬮」
+
+ List<SysCodeDtl> law = ViewData["law"] as List<SysCodeDtl>; //娉曞緥渚濇嵁
+
}
@{
Layout = null;
diff --git a/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml b/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml
index d7b99b3..ad6c95d 100644
--- a/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml
@@ -57,7 +57,7 @@
<script src="~/js/plugins/search/searchtoolbar.js?v=20"></script>
<script src="~/js/plugins/chosen/chosen.jquery.js"></script>
<script src="~/js/plugins/iCheck/icheck.min.js"></script>
- <script src="~/js/plugins/search/search.js?v=1111111111"></script>
+ <script src="~/js/plugins/search/search.js?v=11111111111"></script>
<script src="~/js/plugins/datapicker/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="~/js/plugins/treeview/bootstrap-treeview.js"></script>
<script src="~/js/TUJS.js"></script>
diff --git a/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js b/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js
index 4711ba3..b87836c 100644
--- a/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js
+++ b/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js
@@ -191,7 +191,7 @@
footerrow: footerrow,
rownumbers: true,
rowNum: 30,
- rowList: [30, 50, 100,200],
+ rowList: [30, 50, 100,500],
cmTemplate: { sortable: false },
jsonReader: {
root: "DataList", page: "CurrPage", total: "PageTotal", // 寰堥噸瑕� 瀹氫箟浜� 鍚庡彴鍒嗛〉鍙傛暟鐨勫悕瀛椼��
--
Gitblit v1.9.1