Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_Api

RMYY_CallCenter_Api.Dal/T_Cus_Customer.cs

@@ -254,7 +254,7 @@ namespace RMYY_CallCenter_Api.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_CustomerId,F_CustomerName,F_CustomerCode,F_Layer,F_Province,F_City,F_County,F_Address,F_Telephone,F_Mobile,F_Fax,F_Email,F_PostCode,F_Sex,F_IdCard,F_CreateBy,F_CreatedOn,F_ModifyBy,F_ModifiedOn,F_DeleteFlag,F_DeleteBy,F_DeleteOn,F_Remark from T_Cus_Customer ");
+            strSql.Append("select  top 1 F_CustomerId,F_CustomerName,F_CustomerCode,F_Layer,F_Province,F_City,F_County,F_Address,F_Telephone,F_Mobile,F_Fax,F_Email,F_PostCode,F_Sex,F_IdCard,F_CreateBy,F_CreatedOn,F_ModifyBy,F_ModifiedOn,F_DeleteFlag,F_DeleteBy,F_DeleteOn,F_Remark,F_AboutLinkMan from T_Cus_Customer ");
             strSql.Append(" where F_CustomerId=@F_CustomerId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4)
@@ -282,6 +282,11 @@ namespace RMYY_CallCenter_Api.Dal
             RMYY_CallCenter_Api.Model.T_Cus_Customer model = new RMYY_CallCenter_Api.Model.T_Cus_Customer();
             if (row != null)
             {
+
+                if (row["F_AboutLinkMan"] != null)
+                {
+                    model.F_AboutLinkMan = row["F_AboutLinkMan"].ToString();
+                }
                 if (row["F_CustomerId"] != null && row["F_CustomerId"].ToString() != "")
                 {
                     model.F_CustomerId = int.Parse(row["F_CustomerId"].ToString());

RMYY_CallCenter_Api.Model/T_IntegratedScheduling_Base.cs

@@ -75,7 +75,9 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_accepttime = value; }
             get { return _f_accepttime; }
         }
-
+        /// <summary>
+        /// 红处方数量
+        /// </summary>
         public int? F_CFNum
         {
             set { _f_cfnum = value; }

RMYY_CallCenter_Api.Model/T_Sys_DictionaryValue.cs

@@ -74,7 +74,7 @@ namespace RMYY_CallCenter_Api.Model
             get { return _f_describe; }
         }
         /// <summary>
-        /// 
+        /// 是否有效 0无效 1 有效
         /// </summary>
         public bool F_State
         {

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -402,7 +402,7 @@ namespace RMYY_CallCenter_Api
                 #region 故障报修  报修列表页面，如果已经挂起,所有的按钮删除，只留下处理人的完成按钮；挂起的工单 其他页面没有按钮
                 if (menuName == MENUENUM.报修列表)
                 {
-                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1 && (Convert.ToInt32( dr["F_Status"].ToString())<3 || Convert.ToInt32(dr["F_Status"].ToString()) ==6))
+                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1 && (Convert.ToInt32( dr["F_WorkOrderState"].ToString())<3 || Convert.ToInt32(dr["F_WorkOrderState"].ToString()) ==6))
                     {
                         var hasButton = allButtons.Where(p => p.value == "完成").FirstOrDefault();
                         allButtons.Clear();

RMYY_CallCenter_Api/Controllers/CarManage/T_Car_MessageController.cs

@@ -37,7 +37,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             date = Bll.PagerBll.GetListPager
                                 ("T_Car_Message aa",
                                   "F_Id",
-                                  "F_Id,dbo.GetDictionaryName(F_CarType) F_CarTypeName,F_CarName,F_CarType,F_CarDeptId,F_Responser,F_Phon,F_Remark,F_CreateTime,F_State,(select F_DeptName from T_Sys_Department where F_DeptId=aa.F_CarDeptId )F_DeptName,(select F_UserName from T_Sys_UserAccount where F_UserCode=aa.F_Responser)F_ResponserName",
+                                  "F_Id,dbo.GetDictionaryName(F_CarType) F_CarTypeName,F_CarName,F_CarType,F_CarDeptId,F_Responser,F_Phon,F_Remark,F_CreateTime,F_State,(select F_DeptName from T_Sys_Department where F_DeptId=aa.F_CarDeptId )F_DeptName,(select top 1 F_UserName from T_Sys_UserAccount where F_UserCode=aa.F_Responser)F_ResponserName",
                                  where,
                                   "order by F_Id desc",
                                   pagesize,

RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -339,7 +339,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// <returns></returns>
         public ActionResult AddWorkOrder(int type,int hosid,string content,   
             int detpid,string startplace,string endplace,string needman,string phon,
-            int cartype,string remark, string EmergencyTypes, string source,string usertime,int birth,string callid ="",int LeaveRecordId=0)
+            int cartype,string remark, string EmergencyTypes, string source,string usertime,int birth=0,string callid ="",int LeaveRecordId=0)
         {
             if (User!=null)
             {

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -2601,11 +2601,11 @@ namespace RMYY_CallCenter_Api.Controllers
                 }
                 else
                 {
-                    return Error("已超过规定延迟次数");
+                    return Error("已超过设定延迟次数");
                 }
 
             }
-            return Error("工单类型设置的可延期次数为0");
+            return Error("已超过设定延期次数");
 
         }
 

RMYY_CallCenter_Api/Controllers/SMSController.cs

@@ -151,14 +151,14 @@ namespace RMYY_CallCenter_Api.Controllers
             string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
             string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
             string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
-            int type = RequestString.GetInt("type", 0);
-            int State = RequestString.GetInt("state", 0);
-            int acceptance = RequestString.GetInt("acceptance", 0);
+            //int type = RequestString.GetInt("type", 0);
+             int State = RequestString.GetInt("state", 0);
+            //int acceptance = RequestString.GetInt("acceptance", 0);
             string strpageindex = RequestString.GetQueryString("page");
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
-            sql += " and State= '" + State + "' ";
+             sql += " and State=  0  ";
             if (strtel.Trim() != "" && strtel != "undefined")
             {
                 sql += " and CallerNum= '" + strtel.Trim() + "' ";
@@ -171,18 +171,18 @@ namespace RMYY_CallCenter_Api.Controllers
             {
                 sql += " and RecvTime <= '" + Convert.ToDateTime(strendtime.Trim()) + "' ";
             }
-            if (type > 0)
-            {
-                if (type == 1)
-                {
-                    sql += " and F_CustomerID=1 ";
-                }
-                else
-                {
-                    sql += " and F_CustomerID is null ";
+            //if (type > 0)
+            //{
+            //    if (type == 1)
+            //    {
+            //        sql += " and F_CustomerID=1 ";
+            //    }
+            //    else
+            //    {
+            //        sql += " and F_CustomerID is null ";
 
-                }
-            }
+            //    }
+            //}
 
             if (strpageindex.Trim() != "")
             {
@@ -193,17 +193,17 @@ namespace RMYY_CallCenter_Api.Controllers
             {
                 pagesize = Convert.ToInt32(strpagesize);
             }
-            if (acceptance > 0)
-            {
-                if (acceptance == 1)
-                {
-                    sql += " and F_Name   !=''";
-                }
-                else
-                {
-                    sql += " and (F_Name ='' or F_Name is null )";
-                }
-            }
+            //if (acceptance > 0)
+            //{
+            //    if (acceptance == 1)
+            //    {
+            //        sql += " and F_Name   !=''";
+            //    }
+            //    else
+            //    {
+            //        sql += " and (F_Name ='' or F_Name is null )";
+            //    }
+            //}
             int recordCount = 0;
             dt = Bll.PagerBll.GetListPager(
                 "T_SMS_RecvSMS",

RMYY_CallCenter_Api/Models/Input/T_FaultRepairBaseinput.cs

@@ -7,7 +7,7 @@ namespace RMYY_CallCenter_Api.Models.Input
 {
     public class T_FaultRepairBaseinput
     {
-       
+      
         public int? CallRecordsId { get; set; }
         public int? LeaveRecordId { get; set; }
 
@@ -33,7 +33,7 @@ namespace RMYY_CallCenter_Api.Models.Input
         /// </summary>
         public string  Phone { get; set; }
         /// <summary>
-        /// 工单类别
+        /// 工单类别 
         /// </summary>
         public string  WorkOrderCategory { get; set; } = "";
         /// <summary>