Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/GXQGWH_API

codegit/CallCenterApi/CallCenterApi.DAL/T_Rec_RegRecords.cs

@@ -41,9 +41,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Rec_RegRecords(");
-            strSql.Append("F_RecCode,F_CusID,F_Type,F_Direction,F_Complained,F_Content,F_Remark,F_CreateBy,F_CreateOn,F_IsDelete,F_DeleteOn,F_DeleteBy)");
+            strSql.Append("F_RecCode,F_CusID,F_Type,F_Direction,F_Complained,F_Content,F_Remark,F_CreateBy,F_CreateOn,F_IsDelete,F_DeleteOn,F_DeleteBy,F_Tel,F_CallId)");
             strSql.Append(" values (");
-            strSql.Append("@F_RecCode,@F_CusID,@F_Type,@F_Direction,@F_Complained,@F_Content,@F_Remark,@F_CreateBy,@F_CreateOn,@F_IsDelete,@F_DeleteOn,@F_DeleteBy)");
+            strSql.Append("@F_RecCode,@F_CusID,@F_Type,@F_Direction,@F_Complained,@F_Content,@F_Remark,@F_CreateBy,@F_CreateOn,@F_IsDelete,@F_DeleteOn,@F_DeleteBy,@F_Tel,@F_CallId)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_RecCode", SqlDbType.NVarChar,50),
@@ -57,7 +57,11 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
                     new SqlParameter("@F_DeleteOn", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_DeleteBy", SqlDbType.DateTime)};
+                    new SqlParameter("@F_DeleteBy", SqlDbType.DateTime),
+                     new SqlParameter("@F_Tel", SqlDbType.VarChar,200),
+                      new SqlParameter("@F_CallId", SqlDbType.VarChar,50)
+                     
+            };
             parameters[0].Value = model.F_RecCode;
             parameters[1].Value = model.F_CusID;
             parameters[2].Value = model.F_Type;
@@ -70,7 +74,8 @@ namespace CallCenterApi.DAL
             parameters[9].Value = model.F_IsDelete;
             parameters[10].Value = model.F_DeleteOn;
             parameters[11].Value = model.F_DeleteBy;
-
+            parameters[12].Value = model.F_Tel;
+            parameters[13].Value = model.F_CallId;
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -99,7 +104,9 @@ namespace CallCenterApi.DAL
             strSql.Append("F_CreateOn=@F_CreateOn,");
             strSql.Append("F_IsDelete=@F_IsDelete,");
             strSql.Append("F_DeleteOn=@F_DeleteOn,");
-            strSql.Append("F_DeleteBy=@F_DeleteBy");
+            strSql.Append("F_DeleteBy=@F_DeleteBy,");
+            strSql.Append("F_Tel=@F_Tel,");
+            strSql.Append("F_CallId=@F_CallId");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_RecCode", SqlDbType.NVarChar,50),
@@ -114,6 +121,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
                     new SqlParameter("@F_DeleteOn", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DeleteBy", SqlDbType.DateTime),
+                      new SqlParameter("@F_Tel", SqlDbType.VarChar,200),
+                       new SqlParameter("@F_CallId", SqlDbType.VarChar,50),
+                      
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_RecCode;
             parameters[1].Value = model.F_CusID;
@@ -127,8 +137,10 @@ namespace CallCenterApi.DAL
             parameters[9].Value = model.F_IsDelete;
             parameters[10].Value = model.F_DeleteOn;
             parameters[11].Value = model.F_DeleteBy;
-            parameters[12].Value = model.F_ID;
-
+            parameters[12].Value = model.F_Tel;
+            parameters[13].Value = model.F_CallId;
+            parameters[14].Value = model.F_ID;
+            
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
             {
@@ -270,6 +282,15 @@ namespace CallCenterApi.DAL
                 {
                     model.F_DeleteBy = DateTime.Parse(row["F_DeleteBy"].ToString());
                 }
+                if (row["F_Tel"] != null && row["F_Tel"].ToString() != "")
+                {
+                    model.F_Tel = row["F_Tel"].ToString();
+                }
+                if (row["F_CallId"] != null && row["F_CallId"].ToString() != "")
+                {
+                    model.F_CallId = row["F_CallId"].ToString();
+                }
+                
 
             }
             return model;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RegRecords/RegRecordsController.cs

@@ -13,7 +13,7 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
     public class RegRecordsController : BaseController
     {
         //获取列表
-        public ActionResult GetList(string key, string starttime,string endtime,string usercode, int direction=-1, int type=0, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetList(string key,string tel, string starttime,string endtime,string usercode, int direction=-1, int type=0, int pageindex = 1, int pagesize = 10)
         {
             if (!Request.IsAuthenticated)
                 return NoToken("未知错误，请重新登录");
@@ -28,6 +28,11 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             {
                 sql += " and (F_RecCode like '%" + key.Trim() + "%' or F_Complained like '%" + key.Trim() + "%' or F_Content like '%" + key.Trim() + "%' or F_Remark like '%" + key.Trim() + "%')";
             }
+            if (!string.IsNullOrWhiteSpace(tel))
+            {
+                sql += " and F_Tel like '%" + tel.Trim() + "%' ";
+            }
+            
             if (!string.IsNullOrWhiteSpace(usercode))
                 sql += " and F_CreateBy='"+usercode+"'";
             if(type>0)
@@ -94,9 +99,35 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             return Success("获取成功", newobj);
            
         }
+        /// <summary>
+        /// 查询工单详情
+        /// </summary>
+        public ActionResult GetCallidDetails(string callid)
+        {
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
 
+
+            if (string.IsNullOrEmpty(callid))
+                {
+                    return Error("请输入正确的id");
+                }
+            BLL.T_Rec_RegRecords dBLL = new BLL.T_Rec_RegRecords();
+            var model = dBLL.GetModelList("F_CallId='" + callid + "'").FirstOrDefault();
+            if (model == null)
+                return Error("获取登记信息失败");
+            var cusmodel = new BLL.T_Cus_Customer().GetModel(model.F_CusID);
+            if (cusmodel == null)
+                return Error("获取档案信息失败");
+            var newobj = new
+            {
+                model = model,
+                cusmodel
+            };
+            return Success("获取成功", newobj);
+        }
         //添加
-        public ActionResult Save(int cusid,int type,int direction,string complained, string content, string remark, int id=0)
+        public ActionResult Save(string tel,string callid,int cusid,int type,int direction,string complained, string content, string remark, int id=0)
         {
             if (!Request.IsAuthenticated)
                 return NoToken("未知错误，请重新登录");
@@ -115,17 +146,19 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
                 if (dModel == null)
                     return Error("获取信息失败");   
             }
+            dModel.F_Tel = tel;
             dModel.F_CusID = cusid;
             dModel.F_Type = type;
             dModel.F_Direction = direction;
             dModel.F_Complained = complained;
             dModel.F_Content = content;
             dModel.F_Remark = remark;
-
+            dModel.F_CallId = callid;
             var res = false;
             if(id>0)
             {
                 res = dBLL.Update(dModel);
+                
             }
             else
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -84,7 +84,7 @@ namespace CallCenterApi.Interface.Controllers.tel
             DataTable dt = BLL.PagerBLL.GetListPager(
                 "T_Call_CallRecords WITH(NOLOCK) left join T_Sys_UserAccount on UserCode=F_UserCode  ",
                 "CallRecordsId",
-                "T_Call_CallRecords.*,T_Sys_UserAccount.F_UserName as UserName,T_Sys_UserAccount.F_SeartGroup,T_Sys_UserAccount.F_DeptId,(select d.f_deptName from T_Sys_UserAccount u,[dbo].[T_Sys_Department] d where u.F_DeptId=d.F_DeptId and u.F_UserCode= UserCode) AS CusDepName",
+                "T_Call_CallRecords.*,T_Sys_UserAccount.F_UserName as UserName,T_Sys_UserAccount.F_SeartGroup,T_Sys_UserAccount.F_DeptId,(select d.f_deptName from T_Sys_UserAccount u,[dbo].[T_Sys_Department] d where u.F_DeptId=d.F_DeptId and u.F_UserCode= UserCode) AS CusDepName,(select COUNT(1) from dbo.T_Rec_RegRecords where F_CallId = T_Call_CallRecords.CallId) as IsWorkeorder",
                 sql,
                 "ORDER BY CallRecordsId desc",
                 pagesize,

codegit/CallCenterApi/CallCenterApi.Model/T_Rec_RegRecords.cs

@@ -28,6 +28,8 @@ namespace CallCenterApi.Model
         private int? _f_isdelete;
         private string _f_deleteon;
         private DateTime? _f_deleteby;
+        private string _f_tel;
+        private string _f_callid;
         /// <summary>
         /// 
         /// </summary>
@@ -36,6 +38,17 @@ namespace CallCenterApi.Model
             set { _f_id = value; }
             get { return _f_id; }
         }
+        
+        public string F_CallId
+        {
+            set { _f_callid = value; }
+            get { return _f_callid; }
+        }
+        public string F_Tel
+        {
+            set { _f_tel = value; }
+            get { return _f_tel; }
+        }
         /// <summary>
         /// 登记编号
         /// </summary>