From 69a8bb4807c77d05b5b43328acbf4ad26fb5fc68 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 05 五月 2023 15:00:52 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml | 1
zhengcaioa/Services/CooperatecustomCustomerService.cs | 15 +++++++
zhengcaioa/DTO/IntentionCustomerDTO.cs | 3 +
zhengcaioa/Services/IntentionCustomerService.cs | 15 +++++++
zhengcaioa/DTO/CooperatecustomCustomerDTO.cs | 3 +
zhengcaioa/Model/IntentionCustomer.cs | 2 +
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml | 15 +++++--
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 5 +-
zhengcaioa/Model/CooperatecustomCustomer.cs | 2 +
zhengcaioa/Model/zhengcaioaContext.cs | 16 ++++++++
10 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
index ee56ac7..d8e4acb 100644
--- a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
+++ b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
@@ -88,6 +88,8 @@
public DateTime? Ywjltime { get; set; }
public int Guanliankehushu { get; set; }
+ public string Kuaidistatus { get; set; }
+ public DateTime? Kuaiditime { get; set; }
}
@@ -107,5 +109,6 @@
public string Shifouweixin { get; set; }
public string HuiyuanId { get; set; }
+ public string Kuaidistatus { get; set; }
}
}
diff --git a/zhengcaioa/DTO/IntentionCustomerDTO.cs b/zhengcaioa/DTO/IntentionCustomerDTO.cs
index ea08ac2..d1d4bab 100644
--- a/zhengcaioa/DTO/IntentionCustomerDTO.cs
+++ b/zhengcaioa/DTO/IntentionCustomerDTO.cs
@@ -71,6 +71,8 @@
public DateTime? Ywjltime { get; set; }
public int Guanliankehushu { get; set; }
+ public string Kuaidistatus { get; set; }
+ public DateTime? Kuaiditime { get; set; }
}
public class IntentionCustomerDTOSearch : SearchEntity
@@ -102,5 +104,6 @@
public string Customertype { get; set; }
public string Visittimes { get; set; }
+ public string Kuaidistatus { get; set; }
}
}
diff --git a/zhengcaioa/Model/CooperatecustomCustomer.cs b/zhengcaioa/Model/CooperatecustomCustomer.cs
index 14d5ec5..e16cca4 100644
--- a/zhengcaioa/Model/CooperatecustomCustomer.cs
+++ b/zhengcaioa/Model/CooperatecustomCustomer.cs
@@ -52,5 +52,7 @@
public int? Taocanjianshu { get; set; }
public DateTime? Ywjltime { get; set; }
+ public string Kuaidistatus { get; set; }
+ public DateTime? Kuaiditime { get; set; }
}
}
diff --git a/zhengcaioa/Model/IntentionCustomer.cs b/zhengcaioa/Model/IntentionCustomer.cs
index 370bb5c..6d1d004 100644
--- a/zhengcaioa/Model/IntentionCustomer.cs
+++ b/zhengcaioa/Model/IntentionCustomer.cs
@@ -52,5 +52,7 @@
public string HuiyuanId { get; set; }
public DateTime? Ywjltime { get; set; }
+ public string Kuaidistatus { get; set; }
+ public DateTime? Kuaiditime { get; set; }
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index cb8e88d..ac5a519 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -2735,6 +2735,14 @@
.HasColumnType("datetime")
.HasColumnName("weixintime");
+ entity.Property(e => e.Kuaidistatus)
+ .HasMaxLength(1)
+ .HasColumnName("kuaidistatus");
+
+ entity.Property(e => e.Kuaiditime)
+ .HasColumnType("datetime")
+ .HasColumnName("kuaiditime");
+
entity.Property(e => e.Ywjltime)
.HasColumnType("datetime")
.HasColumnName("ywjltime");
@@ -4297,6 +4305,14 @@
.HasColumnType("datetime")
.HasColumnName("weixintime");
+ entity.Property(e => e.Kuaidistatus)
+ .HasMaxLength(1)
+ .HasColumnName("kuaidistatus");
+
+ entity.Property(e => e.Kuaiditime)
+ .HasColumnType("datetime")
+ .HasColumnName("kuaiditime");
+
entity.Property(e => e.Ywjltime)
.HasColumnType("datetime")
.HasColumnName("ywjltime");
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index b8024a6..9a04ea6 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -375,6 +375,8 @@
ShenyushouxinName = a.Shenyushouxin.HasValue ? a.Shenyushouxin.Value.ToString("f2") : "",
Taocanjianshu = a.Taocanjianshu ?? 0,
Customertype = "鍚堜綔瀹㈡埛",
+ Kuaidistatus = a.Kuaidistatus,
+ Kuaiditime = a.Kuaiditime,
}
);
@@ -392,6 +394,19 @@
}
+ if (!string.IsNullOrWhiteSpace(searchEntity.Kuaidistatus))
+ {
+ if (searchEntity.Kuaidistatus == "A")
+ {
+ query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim());
+ }
+ else
+ {
+ query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim() || a.Kuaidistatus == null);
+ }
+
+ }
+
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
data.Heji1 = Math.Round(query.Sum(x => x.Yufukuan) ?? 0, 2);
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 5642c5f..9c77a76 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -352,6 +352,8 @@
Zuijinzhuizongtime = a.Zuijinzhuizongtime,
ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
Visittimes = lll.Visittimes,
+ Kuaidistatus = a.Kuaidistatus,
+ Kuaiditime = a.Kuaiditime,
}
);
@@ -360,6 +362,19 @@
query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim());
}
+ if (!string.IsNullOrWhiteSpace(searchEntity.Kuaidistatus))
+ {
+ if (searchEntity.Kuaidistatus == "A")
+ {
+ query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim());
+ }
+ else
+ {
+ query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim() || a.Kuaidistatus == null);
+ }
+
+ }
+
if (!string.IsNullOrWhiteSpace(searchEntity.Ywjl))
{
if(searchEntity.Ywjl != "11111")
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index c311230..d892fd1 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -526,7 +526,7 @@
"寤烘。鏃堕棿","瀹㈡埛鏉ユ簮","琛屼笟鍒嗙被","瀹㈡埛绫诲瀷","瀹㈡埛鍚嶇О","瀹㈡埛鍗曚綅","鑱旂郴浜哄井淇�"
,"瀹㈡埛鍦板潃","缃戝潃","鑱旂郴浜哄骇鏈�","鑱旂郴浜烘墜鏈�","鑱旂郴浜篞Q","鑱旂郴浜洪偖绠�",
- "鑱旂郴浜�2濮撳悕","鑱旂郴浜�2鎵嬫満","鑱旂郴浜�2QQ"
+ "鑱旂郴浜�2濮撳悕","鑱旂郴浜�2鎵嬫満","鑱旂郴浜�2QQ","璁块棶娆℃暟"
};
foreach(var columnTitle in columnTitles)
@@ -575,7 +575,8 @@
cell.Value = item.YwTel;
cell = worksheet.Cells[x, y++];
cell.Value = item.YwQq;
-
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Visittimes;
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index 75f5ca4..cb877c6 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
@@ -80,6 +80,7 @@
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
{ label: '寤烘。鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
{ label: '鏄惁鍔犲井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
+ { label: '鏄惁鍙戝揩閫�', name: 'Kuaidistatus', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
];
var _pageAdd = function () {
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
index cb0b19c..42ec91b 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
@@ -90,7 +90,7 @@
{ label: '鏄惁鍔犲井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
{ label: '鏄惁褰曞叆鐢佃瘽', name: 'ShifouDianhua', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
{ label: '璁块棶娆℃暟澶т簬', name: 'Visittimes', labtype: 'txt', hidden: false },
-
+ { label: '鏄惁鍙戝揩閫�', name: 'Kuaidistatus', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
];
var _pageAdd = function () {
OpenWindow("鏂板鎰忓悜瀹㈡埛", "98%", "100%", "/IntentionCustomer/Edit/");
@@ -256,16 +256,23 @@
var City = $("#PBSCity").val();
var AreaId = $("#PBSAreaId").val();
var Name = $("#PBSName").val();
-
- var Createtime = $("#PBSCreatetime").val();
+ var Createtimestart = $("#PBSCreatetimestart").val();
+ var Createtimeend = $("#PBSCreatetimeend").val();
+ var Createtime = "";
+ if (Createtimestart != null && Createtimestart != "") {
+ Createtime = Createtimestart + "|" + Createtimeend;
+ }
var Creater = $("#PBSCreater").val();
var Shifouweixin = $("#PBSShifouweixin").val();
+ var ShifouDianhua = $("#PBSShifouDianhua").val();
+ var Visittimes = $("#PBSVisittimes").val();
+ var Kuaidistatus = $("#PBSKuaidistatus").val();
var url = "/IntentionCustomer/GetDaochu?Khly=" + Khly + "&Hyfl=" + Hyfl + "&Khlx=" + Khlx + "&Ywjl=" + Ywjl + "&Sheng=" + Sheng + "&City=" + City + "&AreaId=" + AreaId + "&Name=" + Name + "&Createtime=" + Createtime
- + "&Creater=" + Creater + "&Shifouweixin=" + Shifouweixin;
+ + "&Creater=" + Creater + "&Shifouweixin=" + Shifouweixin + "&ShifouDianhua=" + ShifouDianhua + "&Visittimes=" + Visittimes + "&Kuaidistatus=" + Kuaidistatus;
var me = window.open(url, "瀵煎嚭"); //鎵撳紑鏂扮獥鍙�
--
Gitblit v1.9.1