|
|
@@ -671,7 +671,7 @@ namespace CallCenterApi.Interface.Controllers
|
|
671
|
671
|
/// <param name="stime"></param>
|
|
672
|
672
|
/// <param name="endtime"></param>
|
|
673
|
673
|
/// <returns></returns>
|
|
674
|
|
- public ActionResult ExitTypelist(string name, string phone, string creatname, int SendWay=-1, int IsSend=-1)
|
|
|
674
|
+ public ActionResult ExitTypelist(string name, string phone,string starttime, string endtime , string creatname, int SendWay=-1, int IsSend=-1)
|
|
675
|
675
|
{
|
|
676
|
676
|
DataTable dt = new DataTable();
|
|
677
|
677
|
string sql = $" F_IsDelete=0";
|
|
|
@@ -689,6 +689,13 @@ namespace CallCenterApi.Interface.Controllers
|
|
689
|
689
|
sql += " and SendWay=" + SendWay;
|
|
690
|
690
|
if (IsSend >= 0)
|
|
691
|
691
|
sql += " and IsSend=" + IsSend;
|
|
|
692
|
+
|
|
|
693
|
+ if (!string.IsNullOrEmpty(starttime))
|
|
|
694
|
+ sql += " and SendTime >'" + starttime.Trim() + "'";
|
|
|
695
|
+
|
|
|
696
|
+ if (!string.IsNullOrEmpty(endtime))
|
|
|
697
|
+ sql += " and SendTime <='" + endtime.Trim() + "'";
|
|
|
698
|
+
|
|
692
|
699
|
if (!string.IsNullOrEmpty(creatname))
|
|
693
|
700
|
sql += $" and ( MID like '%" + creatname.Trim() + "%'or MName like '%" + creatname.Trim() + "%') ";
|
|
694
|
701
|
dt.Columns.Add("编号");
|
|
|
@@ -791,7 +798,7 @@ namespace CallCenterApi.Interface.Controllers
|
|
791
|
798
|
/// 获取短信记录列表
|
|
792
|
799
|
/// </summary>
|
|
793
|
800
|
/// <returns></returns>
|
|
794
|
|
- public ActionResult GetSMSList(string name, string phone, string creatname ,int SendWay=-1, int IsSend=-1, int page = 1, int pagesize = 10)
|
|
|
801
|
+ public ActionResult GetSMSList(string name, string phone, string creatname, string starttime, string endtime, int SendWay = -1, int IsSend=-1, int page = 1, int pagesize = 10)
|
|
795
|
802
|
{
|
|
796
|
803
|
DataTable dt = new DataTable();
|
|
797
|
804
|
int userId = CurrentUser.UserData.F_UserId;
|
|
|
@@ -813,8 +820,19 @@ namespace CallCenterApi.Interface.Controllers
|
|
813
|
820
|
sql += " and SendWay=" + SendWay;
|
|
814
|
821
|
if (IsSend >= 0)
|
|
815
|
822
|
sql += " and IsSend=" + IsSend;
|
|
|
823
|
+
|
|
|
824
|
+
|
|
|
825
|
+ if (!string.IsNullOrEmpty(starttime))
|
|
|
826
|
+ sql += " and SendTime >'" + starttime.Trim() + "'";
|
|
|
827
|
+
|
|
|
828
|
+ if (!string.IsNullOrEmpty(endtime))
|
|
|
829
|
+ sql += " and SendTime <='" + endtime.Trim() + "'";
|
|
|
830
|
+
|
|
816
|
831
|
if (!string.IsNullOrEmpty(creatname))
|
|
817
|
832
|
sql += $" and ( MID like '%" + creatname.Trim() + "%'or MName like '%" + creatname.Trim() + "%') ";
|
|
|
833
|
+
|
|
|
834
|
+
|
|
|
835
|
+
|
|
818
|
836
|
int recordCount = 0;
|
|
819
|
837
|
if (!string.IsNullOrWhiteSpace(sql))
|
|
820
|
838
|
{
|