1550076451 1 год назад
Родитель
Сommit
5f309578a8

+ 27 - 81
CallCenterApi/CallCenterApi.BLL/T_Sys_WorkOFFDays.cs

@@ -23,7 +23,6 @@ namespace CallCenterApi.BLL
23 23
         /// </summary>
24 24
         public int Add(CallCenterApi.Model.T_Sys_WorkOFFDays model)
25 25
         {
26
-            OutRedis();
27 26
             return dal.Add(model);
28 27
         }
29 28
 
@@ -32,12 +31,10 @@ namespace CallCenterApi.BLL
32 31
         /// </summary>
33 32
         public bool Update(CallCenterApi.Model.T_Sys_WorkOFFDays model)
34 33
         {
35
-            OutRedis();
36 34
             return dal.Update(model);
37 35
         }
38 36
         public bool UpdateState(CallCenterApi.Model.T_Sys_WorkOFFDays model)
39 37
         {
40
-            OutRedis();
41 38
             return dal.UpdateState(model);
42 39
         }
43 40
 
@@ -46,12 +43,10 @@ namespace CallCenterApi.BLL
46 43
         /// </summary>
47 44
         public bool Delete(int F_OffID)
48 45
         {
49
-            OutRedis();
50 46
             return dal.Delete(F_OffID);
51 47
         }
52 48
         public bool DeleteByDate(string date, string usercode, DateTime nowdate)
53 49
         {
54
-            OutRedis();
55 50
             return dal.DeleteByDate(date, usercode,nowdate);
56 51
         }
57 52
         /// <summary>
@@ -59,7 +54,6 @@ namespace CallCenterApi.BLL
59 54
         /// </summary>
60 55
         public bool DeleteList(string F_OffIDlist)
61 56
         {
62
-            OutRedis();
63 57
             return dal.DeleteList(F_OffIDlist);
64 58
         }
65 59
 
@@ -68,43 +62,11 @@ namespace CallCenterApi.BLL
68 62
         /// </summary>
69 63
         public CallCenterApi.Model.T_Sys_WorkOFFDays GetModel(int F_OffID)
70 64
         {
71
-            var dt = GetRedis();
72
-            if (dt != null)
73
-            {
74
-                var dr = dt.Select("F_OffID=" + F_OffID);
75
-                if (dr != null && dr.Count() > 0)
76
-                {
77
-                    return dal.DataRowToModel(dr[0]);
78
-                }
79
-                else
80
-                {
81
-                    return null;
82
-                }
83
-            }
84
-            else
85
-            {
86
-                return dal.GetModel(F_OffID);
87
-            }
65
+            return dal.GetModel(F_OffID);
88 66
         }
89 67
         public CallCenterApi.Model.T_Sys_WorkOFFDays GetModel(string date)
90 68
         {
91
-            var dt = GetRedis();
92
-            if (dt != null)
93
-            {
94
-                var dr = dt.Select("F_OffDate='" + date + "'");
95
-                if (dr != null && dr.Count() > 0)
96
-                {
97
-                    return dal.DataRowToModel(dr[0]);
98
-                }
99
-                else
100
-                {
101
-                    return null;
102
-                }
103
-            }
104
-            else
105
-            {
106
-                return dal.GetModel(date);
107
-            }
69
+            return dal.GetModel(date);
108 70
         }
109 71
 
110 72
         /// <summary>
@@ -115,23 +77,7 @@ namespace CallCenterApi.BLL
115 77
         /// <returns></returns>
116 78
         public int GetDays(string strWhere)
117 79
         {
118
-            var dt = GetRedis();
119
-            if (dt != null)
120
-            {
121
-                var dr = dt.Select(strWhere);
122
-                if (dr != null && dr.Count() > 0)
123
-                {
124
-                    return dr.Count();
125
-                }
126
-                else
127
-                {
128
-                    return 0;
129
-                }
130
-            }
131
-            else
132
-            {
133
-                return dal.GetRecordCount(strWhere);
134
-            }
80
+            return dal.GetRecordCount(strWhere);
135 81
         }
136 82
 
137 83
         /// <summary>
@@ -232,33 +178,33 @@ namespace CallCenterApi.BLL
232 178
 
233 179
         #endregion  Method
234 180
 
235
-        private DataTable GetRedis()
236
-        {
237
-            var strList = RedisHelper.StringGet("T_Sys_WorkOFFDays");
238
-            if (strList != null)
239
-            {
240
-                return strList.ToString().ToObject<DataTable>();
241
-            }
242
-            else
243
-            {
244
-                return InRedis();
245
-            }
246
-        }
181
+        //private DataTable GetRedis()
182
+        //{
183
+        //    var strList = RedisHelper.StringGet("T_Sys_WorkOFFDays");
184
+        //    if (strList != null)
185
+        //    {
186
+        //        return strList.ToString().ToObject<DataTable>();
187
+        //    }
188
+        //    else
189
+        //    {
190
+        //        return InRedis();
191
+        //    }
192
+        //}
247 193
 
248
-        private DataTable InRedis()
249
-        {
250
-            var startdate = "2022-01-01";
251
-            var enddate = DateTime.Now.AddYears(+1).ToString("yyyy") + "-12-31";
252
-            var dt = dal.GetList("F_OffDate>'"+ startdate + "' and F_OffDate<'"+ enddate + "'").Tables[0];
194
+        //private DataTable InRedis()
195
+        //{
196
+        //    var startdate = "2022-01-01";
197
+        //    var enddate = DateTime.Now.AddYears(+1).ToString("yyyy") + "-12-31";
198
+        //    var dt = dal.GetList("F_OffDate>'"+ startdate + "' and F_OffDate<'"+ enddate + "'").Tables[0];
253 199
 
254
-            RedisHelper.StringSet("T_Sys_WorkOFFDays", dt.ToJson(), new TimeSpan(24, 0, 0));
200
+        //    RedisHelper.StringSet("T_Sys_WorkOFFDays", dt.ToJson(), new TimeSpan(24, 0, 0));
255 201
 
256
-            return dt;
257
-        }
202
+        //    return dt;
203
+        //}
258 204
 
259
-        private void OutRedis()
260
-        {
261
-            RedisHelper.KeyDelete("T_Sys_WorkOFFDays");
262
-        }
205
+        //private void OutRedis()
206
+        //{
207
+        //    RedisHelper.KeyDelete("T_Sys_WorkOFFDays");
208
+        //}
263 209
     }
264 210
 }

+ 2 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -14590,7 +14590,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
14590 14590
                                             //  DataTable dt = DbHelperSQL.Query("select top 6 F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and " +
14591 14591
                                             //   "F_OffDate> (select top 1 F_OffDate from T_Sys_WorkOFFDays  where F_OffDate >= '" + DateTime .Now  + "'  and   F_OffState = 1  order by F_OffDate asc) order by F_OffDate ").Tables[0];
14592 14592
                                             // var resdatetime = dt.Rows[5]["F_OffDate"].ToString();
14593
-                                            var resdatetime = GetLimittime(6);
14593
+                                            var resdatetime = GetLimittime(2);
14594 14594
                                             if (!string.IsNullOrEmpty(resdatetime))
14595 14595
                                             {
14596 14596
                                                 //                     resdatetime = resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss");
@@ -21503,6 +21503,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
21503 21503
                                 keyValuePairs.Add("F_Note", "");
21504 21504
                                 keyValuePairs.Add("F_SpotCheck", 0);
21505 21505
                                 keyValuePairs.Add("F_FinalOpinion", "");
21506
+                                keyValuePairs.Add("F_Contentment", 2);
21506 21507
                                 modelT_Bus_WorkOrder.F_SpotCheck = 0;
21507 21508
                                 modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;//已回访
21508 21509
                                 bool n= workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs);