Procházet zdrojové kódy

文档中的问题

liyuanyuan %!s(int64=3) %!d(string=před) roky
rodič
revize
7f8ea6267e

+ 1 - 0
.gitignore

@@ -21,3 +21,4 @@ RMYY_CallCenter_Api/obj/
21 21
 RMYY_CallCenter_Api/Upload/Pic/
22 22
 packages/
23 23
 /RMYY_CallCenter_Api/Upload/Files/2022/09/01
24
+/RMYY_CallCenter_Api/Upload/Files/2022/10/24

+ 1 - 0
RMYY_CallCenter_Api/Controllers/DictionaryType/DictionaryController.cs

@@ -67,6 +67,7 @@ namespace RMYY_CallCenter_Api.Controllers
67 67
                     {
68 68
                         name = baseModel.F_DictionaryName,
69 69
                         flag = baseModel.F_DictionaryFlag,
70
+                        desc=baseModel.F_Describe,
70 71
                         sort = baseModel.F_Sort
71 72
                     });
72 73
                 else

+ 1 - 0
RMYY_CallCenter_Api/Controllers/DictionaryType/GongDanTypeController.cs

@@ -126,6 +126,7 @@ namespace RMYY_CallCenter_Api.Controllers
126 126
                     cstime = entity_ModuleInfo.F_TimeOut,
127 127
                     fxtime = entity_ModuleInfo.F_RepairTimeLimit,
128 128
                     autodept = entity_ModuleInfo.F_AutoDept,
129
+                    canreplaycount=entity_ModuleInfo.F_CanReplayCount,
129 130
                     tid =entity_ModuleInfo.F_TypeId
130 131
                 });
131 132
             }

+ 11 - 3
RMYY_CallCenter_Api/Controllers/EquipmentController.cs

@@ -43,9 +43,17 @@ namespace RMYY_CallCenter_Api.Controllers
43 43
                PageIndex,
44 44
               true,
45 45
               out recordCount);
46
-             
47
-           
48
-            return Success("设备列表读取成功",dt);
46
+
47
+            var obj = new
48
+            {
49
+                state = "success",
50
+                message = "成功",
51
+                rows = dt,
52
+                total = recordCount
53
+            };
54
+
55
+            return Content(obj.ToJson());
56
+           // return Success("设备列表读取成功",dt);
49 57
         }
50 58
 
51 59
 

+ 9 - 3
RMYY_CallCenter_Api/Controllers/GroupClassController.cs

@@ -166,7 +166,13 @@ namespace RMYY_CallCenter_Api.Controllers
166 166
             var groupclasslist = new Bll.T_Sys_GroupClass().GetModelList("F_ClassCode='" + classcode + "' and F_Date>='" + stime + "' and   F_Date<='" + lasttime + "' and F_DeptId='" + deptid + "' and F_IsDelete=0 ");
167 167
 
168 168
             var T_Sys_WorkOFFDayslist = new Bll.T_Sys_WorkOffDays().GetModelList("F_OffDate>='" + starttime.ToString("yyyy-MM-dd") + "' and F_OffDate<='" + lasttime.ToString("yyyy-MM-dd") + "'and F_OffState=0");
169
-
169
+            List<string> userlist = new List<string>();
170
+            if (usercode.Contains(","))
171
+            {
172
+                userlist = usercode.Split(',').ToList();
173
+            }
174
+            else
175
+            { userlist.Add(usercode); }
170 176
             //固定
171 177
             if (type == 0)
172 178
             {
@@ -175,7 +181,7 @@ namespace RMYY_CallCenter_Api.Controllers
175 181
                 {
176 182
                     for (DateTime time= starttime; time <=lasttime; time=time.AddDays(1) )
177 183
                     {
178
-                        List<string> userlist = usercode.Split(',').ToList();
184
+                        
179 185
 
180 186
                         foreach (string strusercode in userlist)
181 187
                         {
@@ -226,7 +232,7 @@ namespace RMYY_CallCenter_Api.Controllers
226 232
                             continue;
227 233
                         }
228 234
 
229
-                        List<string> userlist = usercode.Split(',').ToList();
235
+                      //  List<string> userlist = usercode.Split(',').ToList();
230 236
 
231 237
                         foreach (string strusercode in userlist)
232 238
                         {

+ 4 - 2
RMYY_CallCenter_Api/Controllers/Quality/IndexCategoryController.cs

@@ -5,7 +5,7 @@ using System.Data;
5 5
 using System.Linq;
6 6
 using System.Web;
7 7
 using System.Web.Mvc;
8
-
8
+using RMYY_CallCenter_Api.DB;
9 9
 namespace RMYY_CallCenter_Api.Controllers.Quality
10 10
 {
11 11
     public class IndexCategoryController : BaseController
@@ -75,8 +75,10 @@ namespace RMYY_CallCenter_Api.Controllers.Quality
75 75
             {
76 76
                 dModel.F_CategoryName = WebHelper.UrlDecode(categoryName.Trim());
77 77
             }
78
+          int ppid= (int) DbHelperSQL.GetSingle("select  F_CategoryId from T_QC_IndexCategory where F_DeleteFlag=0 and  F_CategoryName='指标分类' ");
79
+
78 80
             dModel.F_Sort = sort;
79
-            dModel.F_ParentId = pid;
81
+            dModel.F_ParentId = ppid;
80 82
             dModel.F_Score = 0;
81 83
             dModel.F_CreateOn = DateTime.Now;
82 84
             dModel.F_CreateBy = User.F_UserId;

+ 3 - 3
RMYY_CallCenter_Api/Controllers/Quality/QCManageController.cs

@@ -306,7 +306,7 @@ namespace RMYY_CallCenter_Api.Controllers.Quality
306 306
             List<object> list = new List<object>();
307 307
             int allscore = 0;
308 308
             int allpf = 0;
309
-            foreach (DataRow dr in dt.Select("F_ParentId=0"))
309
+            foreach (DataRow dr in dt.Select("F_ParentId>0"))
310 310
             {
311 311
                 string categoryid = dr["F_CategoryId"].ToString().Trim();
312 312
                 DataRow[] drcs = dtindex.Select("F_CategoryId=" + categoryid);
@@ -602,7 +602,7 @@ namespace RMYY_CallCenter_Api.Controllers.Quality
602 602
                     "T_Call_CallRecords",
603 603
                     "CallId",
604 604
                     "F_QCUserName, UserCode, dbo.GetUserName(UserCode) name, CallRecordsId, CallNumber,F_QCTime",
605
-                    " and F_QCState=1 " + strsql + sqltimeCallRecords,// and UserCode != 0
605
+                    " and F_QCState=1 and CallState=1" + strsql + sqltimeCallRecords,// and UserCode != 0
606 606
                     "order by F_QCTime desc",
607 607
                     pagesize,
608 608
                     pageindex,
@@ -713,7 +713,7 @@ namespace RMYY_CallCenter_Api.Controllers.Quality
713 713
 
714 714
             }
715 715
 
716
-            DataTable dtcallrecorddata = DbHelperSQL.Query("select  F_QCUserName,UserCode,dbo.GetUserName(UserCode) name ,CallRecordsId,CallNumber,F_QCtime from T_Call_CallRecords where F_QCState=1  " + strsql + sqltimeCallRecords + "order by F_QCTime desc").Tables[0]; //and UserCode != 0
716
+            DataTable dtcallrecorddata = DbHelperSQL.Query("select  F_QCUserName,UserCode,dbo.GetUserName(UserCode) name ,CallRecordsId,CallNumber,F_QCtime from T_Call_CallRecords where F_QCState=1 and CallState=1 " + strsql + sqltimeCallRecords + "order by F_QCTime desc").Tables[0]; //and UserCode != 0
717 717
 
718 718
             foreach (DataRow dr in dtcallrecorddata.Rows)
719 719
             {