Просмотр исходного кода

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

1550076451 лет назад: 3
Родитель
Сommit
59c0a099b4

+ 6 - 1
RMYY_CallCenter_Api.Dal/T_Cus_Customer.cs

254
         {
254
         {
255
 
255
 
256
             StringBuilder strSql = new StringBuilder();
256
             StringBuilder strSql = new StringBuilder();
257
-            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 ");
257
+            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 ");
258
             strSql.Append(" where F_CustomerId=@F_CustomerId");
258
             strSql.Append(" where F_CustomerId=@F_CustomerId");
259
             SqlParameter[] parameters = {
259
             SqlParameter[] parameters = {
260
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4)
260
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4)
282
             RMYY_CallCenter_Api.Model.T_Cus_Customer model = new RMYY_CallCenter_Api.Model.T_Cus_Customer();
282
             RMYY_CallCenter_Api.Model.T_Cus_Customer model = new RMYY_CallCenter_Api.Model.T_Cus_Customer();
283
             if (row != null)
283
             if (row != null)
284
             {
284
             {
285
+
286
+                if (row["F_AboutLinkMan"] != null)
287
+                {
288
+                    model.F_AboutLinkMan = row["F_AboutLinkMan"].ToString();
289
+                }
285
                 if (row["F_CustomerId"] != null && row["F_CustomerId"].ToString() != "")
290
                 if (row["F_CustomerId"] != null && row["F_CustomerId"].ToString() != "")
286
                 {
291
                 {
287
                     model.F_CustomerId = int.Parse(row["F_CustomerId"].ToString());
292
                     model.F_CustomerId = int.Parse(row["F_CustomerId"].ToString());

+ 3 - 1
RMYY_CallCenter_Api.Model/T_IntegratedScheduling_Base.cs

75
             set { _f_accepttime = value; }
75
             set { _f_accepttime = value; }
76
             get { return _f_accepttime; }
76
             get { return _f_accepttime; }
77
         }
77
         }
78
-
78
+        /// <summary>
79
+        /// 红处方数量
80
+        /// </summary>
79
         public int? F_CFNum
81
         public int? F_CFNum
80
         {
82
         {
81
             set { _f_cfnum = value; }
83
             set { _f_cfnum = value; }

+ 1 - 1
RMYY_CallCenter_Api.Model/T_Sys_DictionaryValue.cs

74
             get { return _f_describe; }
74
             get { return _f_describe; }
75
         }
75
         }
76
         /// <summary>
76
         /// <summary>
77
-        /// 
77
+        /// 是否有效 0无效 1 有效
78
         /// </summary>
78
         /// </summary>
79
         public bool F_State
79
         public bool F_State
80
         {
80
         {

+ 1 - 1
RMYY_CallCenter_Api/Common/WorkOrderBase.cs

402
                 #region 故障报修  报修列表页面,如果已经挂起,所有的按钮删除,只留下处理人的完成按钮;挂起的工单 其他页面没有按钮
402
                 #region 故障报修  报修列表页面,如果已经挂起,所有的按钮删除,只留下处理人的完成按钮;挂起的工单 其他页面没有按钮
403
                 if (menuName == MENUENUM.报修列表)
403
                 if (menuName == MENUENUM.报修列表)
404
                 {
404
                 {
405
-                    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))
405
+                    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))
406
                     {
406
                     {
407
                         var hasButton = allButtons.Where(p => p.value == "完成").FirstOrDefault();
407
                         var hasButton = allButtons.Where(p => p.value == "完成").FirstOrDefault();
408
                         allButtons.Clear();
408
                         allButtons.Clear();

+ 1 - 1
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_MessageController.cs

37
             date = Bll.PagerBll.GetListPager
37
             date = Bll.PagerBll.GetListPager
38
                                 ("T_Car_Message aa",
38
                                 ("T_Car_Message aa",
39
                                   "F_Id",
39
                                   "F_Id",
40
-                                  "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",
40
+                                  "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",
41
                                  where,
41
                                  where,
42
                                   "order by F_Id desc",
42
                                   "order by F_Id desc",
43
                                   pagesize,
43
                                   pagesize,

+ 1 - 1
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

339
         /// <returns></returns>
339
         /// <returns></returns>
340
         public ActionResult AddWorkOrder(int type,int hosid,string content,   
340
         public ActionResult AddWorkOrder(int type,int hosid,string content,   
341
             int detpid,string startplace,string endplace,string needman,string phon,
341
             int detpid,string startplace,string endplace,string needman,string phon,
342
-            int cartype,string remark, string EmergencyTypes, string source,string usertime,int birth,string callid ="",int LeaveRecordId=0)
342
+            int cartype,string remark, string EmergencyTypes, string source,string usertime,int birth=0,string callid ="",int LeaveRecordId=0)
343
         {
343
         {
344
             if (User!=null)
344
             if (User!=null)
345
             {
345
             {

+ 2 - 2
RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

2601
                 }
2601
                 }
2602
                 else
2602
                 else
2603
                 {
2603
                 {
2604
-                    return Error("已超过定延迟次数");
2604
+                    return Error("已超过定延迟次数");
2605
                 }
2605
                 }
2606
 
2606
 
2607
             }
2607
             }
2608
-            return Error("工单类型设置的可延期次数为0");
2608
+            return Error("已超过设定延期次数");
2609
 
2609
 
2610
         }
2610
         }
2611
 
2611
 

+ 26 - 26
RMYY_CallCenter_Api/Controllers/SMSController.cs

151
             string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
151
             string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
152
             string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
152
             string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
153
             string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
153
             string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
154
-            int type = RequestString.GetInt("type", 0);
155
-            int State = RequestString.GetInt("state", 0);
156
-            int acceptance = RequestString.GetInt("acceptance", 0);
154
+            //int type = RequestString.GetInt("type", 0);
155
+             int State = RequestString.GetInt("state", 0);
156
+            //int acceptance = RequestString.GetInt("acceptance", 0);
157
             string strpageindex = RequestString.GetQueryString("page");
157
             string strpageindex = RequestString.GetQueryString("page");
158
             int pageindex = 1;
158
             int pageindex = 1;
159
             string strpagesize = RequestString.GetQueryString("pagesize");
159
             string strpagesize = RequestString.GetQueryString("pagesize");
160
             int pagesize = 10;
160
             int pagesize = 10;
161
-            sql += " and State= '" + State + "' ";
161
+             sql += " and State=  0  ";
162
             if (strtel.Trim() != "" && strtel != "undefined")
162
             if (strtel.Trim() != "" && strtel != "undefined")
163
             {
163
             {
164
                 sql += " and CallerNum= '" + strtel.Trim() + "' ";
164
                 sql += " and CallerNum= '" + strtel.Trim() + "' ";
171
             {
171
             {
172
                 sql += " and RecvTime <= '" + Convert.ToDateTime(strendtime.Trim()) + "' ";
172
                 sql += " and RecvTime <= '" + Convert.ToDateTime(strendtime.Trim()) + "' ";
173
             }
173
             }
174
-            if (type > 0)
175
-            {
176
-                if (type == 1)
177
-                {
178
-                    sql += " and F_CustomerID=1 ";
179
-                }
180
-                else
181
-                {
182
-                    sql += " and F_CustomerID is null ";
174
+            //if (type > 0)
175
+            //{
176
+            //    if (type == 1)
177
+            //    {
178
+            //        sql += " and F_CustomerID=1 ";
179
+            //    }
180
+            //    else
181
+            //    {
182
+            //        sql += " and F_CustomerID is null ";
183
 
183
 
184
-                }
185
-            }
184
+            //    }
185
+            //}
186
 
186
 
187
             if (strpageindex.Trim() != "")
187
             if (strpageindex.Trim() != "")
188
             {
188
             {
193
             {
193
             {
194
                 pagesize = Convert.ToInt32(strpagesize);
194
                 pagesize = Convert.ToInt32(strpagesize);
195
             }
195
             }
196
-            if (acceptance > 0)
197
-            {
198
-                if (acceptance == 1)
199
-                {
200
-                    sql += " and F_Name   !=''";
201
-                }
202
-                else
203
-                {
204
-                    sql += " and (F_Name ='' or F_Name is null )";
205
-                }
206
-            }
196
+            //if (acceptance > 0)
197
+            //{
198
+            //    if (acceptance == 1)
199
+            //    {
200
+            //        sql += " and F_Name   !=''";
201
+            //    }
202
+            //    else
203
+            //    {
204
+            //        sql += " and (F_Name ='' or F_Name is null )";
205
+            //    }
206
+            //}
207
             int recordCount = 0;
207
             int recordCount = 0;
208
             dt = Bll.PagerBll.GetListPager(
208
             dt = Bll.PagerBll.GetListPager(
209
                 "T_SMS_RecvSMS",
209
                 "T_SMS_RecvSMS",

+ 2 - 2
RMYY_CallCenter_Api/Models/Input/T_FaultRepairBaseinput.cs

7
 {
7
 {
8
     public class T_FaultRepairBaseinput
8
     public class T_FaultRepairBaseinput
9
     {
9
     {
10
-       
10
+      
11
         public int? CallRecordsId { get; set; }
11
         public int? CallRecordsId { get; set; }
12
         public int? LeaveRecordId { get; set; }
12
         public int? LeaveRecordId { get; set; }
13
 
13
 
33
         /// </summary>
33
         /// </summary>
34
         public string  Phone { get; set; }
34
         public string  Phone { get; set; }
35
         /// <summary>
35
         /// <summary>
36
-        /// 工单类别
36
+        /// 工单类别 
37
         /// </summary>
37
         /// </summary>
38
         public string  WorkOrderCategory { get; set; } = "";
38
         public string  WorkOrderCategory { get; set; } = "";
39
         /// <summary>
39
         /// <summary>