1550076451 %!s(int64=2) %!d(string=hace) años
padre
commit
3fb6e07f5b

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -444,7 +444,7 @@
444 444
           <AutoAssignPort>True</AutoAssignPort>
445 445
           <DevelopmentServerPort>63662</DevelopmentServerPort>
446 446
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
447
-          <IISUrl>http://localhost:63661/</IISUrl>
447
+          <IISUrl>http://localhost:63663/</IISUrl>
448 448
           <NTLMAuthentication>False</NTLMAuthentication>
449 449
           <UseCustomServer>False</UseCustomServer>
450 450
           <CustomServerUrl>

+ 16 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HomeController.cs

@@ -1,13 +1,16 @@
1 1
 
2 2
 using CallCenter.Utility;
3 3
 using CallCenterApi.Common;
4
+using CallCenterApi.DB;
4 5
 using CallCenterApi.Interface.Controllers.Base;
5 6
 using CallCenterApi.Interface.Models.Common;
7
+using Newtonsoft.Json;
6 8
 using System;
7 9
 using System.Collections;
8 10
 using System.Collections.Generic;
9 11
 using System.Data;
10 12
 using System.Data.SqlTypes;
13
+using System.IO;
11 14
 using System.Linq;
12 15
 using System.Text;
13 16
 using System.Threading;
@@ -17,12 +20,14 @@ using System.Web.Mvc;
17 20
 
18 21
 namespace CallCenterApi.Interface.Controllers
19 22
 {
20
-    [Authority]
23
+   // [Authority]
21 24
     public class HomeController : BaseController
22 25
     {
23 26
         // GET: Home
24 27
         public ActionResult Index()
25 28
         {
29
+            
30
+
26 31
             return Success("成功");
27 32
         }
28 33
         [Authorize]
@@ -36,6 +41,16 @@ namespace CallCenterApi.Interface.Controllers
36 41
             };
37 42
             return Json(person, JsonRequestBehavior.AllowGet);
38 43
         }
44
+        public class workorderlist
45
+        {
46
+            public string staffCode { set; get; }
47
+            public string noDept { set; get; }
48
+            public string staffName { set; get; }
49
+        }
50
+        
51
+
52
+       
53
+
39 54
 
40 55
         public string json2()
41 56
         {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 4 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs


+ 16 - 5
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

@@ -29,10 +29,14 @@ using System.Web.Mvc;
29 29
 
30 30
 namespace CallCenterApi.Interface.Controllers.workorder
31 31
 {
32
-    [Authority]
32
+ //[Authority]
33 33
     public class AffairsController : BaseController
34 34
     {
35 35
 
36
+    
37
+
38
+
39
+
36 40
 
37 41
         private BLL.T_Sys_Department deptBLL = new BLL.T_Sys_Department();
38 42
 
@@ -798,10 +802,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
798 802
                     jsonList.VISIT_CONTENT = "无";
799 803
                 else
800 804
                     jsonList.VISIT_CONTENT = model.F_Result;
801
-                if (model.F_IsSatisfie == 0)
805
+                if (model.F_IsSatisfie ==-1)
806
+                    jsonList.VISIT_SATISFY = "1";
807
+                else if (model.F_IsSatisfie == 0)
802 808
                     jsonList.VISIT_SATISFY = "2";
803
-                else
809
+                else if (model.F_IsSatisfie == 1)
804 810
                     jsonList.VISIT_SATISFY = "4";
811
+                else if (model.F_IsSatisfie == 2)
812
+                    jsonList.VISIT_SATISFY = "3";
813
+                else if (model.F_IsSatisfie == 3)
814
+                    jsonList.VISIT_SATISFY = "4";
815
+               
805 816
 
806 817
                 jsonList.VISIT_NUMBER = int.Parse(DbHelperSQL.GetSingle(" select count(1) from T_Bus_VisitResult  where F_WorkOrderId ='" + model.F_WorkOrderId + "'").ToString());
807 818
                 paras.jsonList.Add(jsonList);
@@ -2546,7 +2557,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
2546 2557
                         var resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
2547 2558
                         resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + delay.F_OldTime.Value.ToString("HH:mm:ss");
2548 2559
 
2549
-                        delay.F_NewTime = delay.F_OldTime.Value.AddDays(newlimittime);
2560
+                        delay.F_NewTime = Convert.ToDateTime(resdatetime);
2550 2561
 
2551 2562
                         delay.F_Reason = reason;
2552 2563
                         //delay.F_State = 1;
@@ -2612,7 +2623,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
2612 2623
                                             string resdates = delaynew.F_OldTime.Value.ToString("yyyy-MM-dd");
2613 2624
                                             DataTable dt1 = DbHelperSQL.Query("select top " + newlimittime + " " +
2614 2625
                                                 "F_OffDate from  T_Sys_WorkOFFDays  with(nolock) where F_OffState = 1   " +
2615
-                                                "and F_OffDate>'" + newlimittime + "' order by F_OffDate").Tables[0];
2626
+                                                "and F_OffDate>'" + resdates + "' order by F_OffDate").Tables[0];
2616 2627
                                             var resdatetime1 = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
2617 2628
                                             resdatetime1 = Convert.ToDateTime(resdatetime1).ToString("yyyy-MM-dd") + " " +
2618 2629
                                                 delaynew.F_OldTime.Value.ToString("HH:mm:ss");

+ 58 - 15
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -2321,7 +2321,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
2321 2321
             int issms = RequestString.GetInt("issms", -1);
2322 2322
             int smspy = RequestString.GetInt("smspy", -1);//0未发送短信1
2323 2323
             int db = RequestString.GetInt("db", 0);
2324
-            int visit = RequestString.GetInt("visit", -1);//0满意1一评不满意2二评不满意
2324
+            int visit = RequestString.GetInt("visit", -2);//0满意1一评不满意2二评不满意
2325 2325
             string strpageindex = RequestString.GetQueryString("page");
2326 2326
             int pageindex = 1;
2327 2327
             string strpagesize = RequestString.GetQueryString("pagesize");
@@ -2477,7 +2477,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
2477 2477
                         //sql += " and F_WorkState = '" + strstate.Trim() + "' ";
2478 2478
                     }
2479 2479
                     sql += "and F_SpotCheck=1";
2480
-                    if (visit > -1)
2480
+                    if (visit > -2)
2481 2481
                     {
2482 2482
                         sql += "and F_WorkOrderId in(select F_WorkOrderId from T_Bus_VisitResult WITH(NOLOCK) where F_Id in (select max(F_Id) " +
2483 2483
                             "from T_Bus_VisitResult WITH(NOLOCK) group by F_WorkOrderId ) and F_IsSatisfie = '" + visit + "' ";
@@ -16467,7 +16467,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
16467 16467
                                     modelT_Bus_WorkOrder.F_LimitTime = modelT_Bus_WorkOrder.F_LimitTime
16468 16468
                                          .Value.AddHours(tss);
16469 16469
                                     keyValuePairs.Add("F_LimitTime", modelT_Bus_WorkOrder.F_LimitTime);
16470
-
16470
+                                    keyValuePairs.Add("F_WorkState", workstate);
16471 16471
                                     // modelT_Bus_WorkOrder.F_LimitTime = modelT_Bus_WorkOrder.F_LimitTime
16472 16472
                                     //  .Value.AddHours(tss);
16473 16473
                                     workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs);
@@ -20116,11 +20116,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
20116 20116
                 string visituser = RequestString.GetFormString("visituser");//回访人
20117 20117
                 int type = RequestString.GetInt("type", -1);//回访方式
20118 20118
                 int spotcheck = RequestString.GetInt("spotcheck", -1);//是否抽查0否1是
20119
-                int issatisfie = RequestString.GetInt("issatisfie", -1);//0不满意 1满意2基本满意
20119
+                int issatisfie = RequestString.GetInt("issatisfie", 0);//0不满意 1满意2基本满意
20120 20120
                 int state = RequestString.GetInt("state", 1);//0保存 1保存并下一步
20121 20121
                 int visitid = RequestString.GetInt("visitid", 0);
20122 20122
                 int limittimes = RequestString.GetInt("limittimes", 6);
20123
-
20123
+                int statistics = RequestString.GetInt("statistics", 0);//是否进行退回统计0否1是
20124
+                int groupstatistics = RequestString.GetInt("groupstatistics", 0);
20124 20125
                 string result = RequestString.GetFormString("result");//回访情况
20125 20126
                 int nexttype = RequestString.GetInt("nexttype", 0);//1重办 2退回重办3仅回访4已办未果
20126 20127
                 string cbreason = RequestString.GetFormString("cbreason");//重办原因
@@ -20329,6 +20330,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
20329 20330
                                             keyValuePairs3.Add("F_WorkState", (int)EnumWorkState.backaudit);
20330 20331
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.backaudit;//重办审核
20331 20332
                                             keyValuePairs3.Add("F_SpotCheck", spotcheck);
20333
+                                            if (statistics > 0)
20334
+                                            {
20335
+                                                if (modelT_Bus_AssignedInfo.F_IsPerform == 1)
20336
+                                                    modelT_Bus_AssignedInfo.F_IsPerform = 2;
20337
+                                                else
20338
+                                                    modelT_Bus_AssignedInfo.F_IsPerform = 3;
20339
+                                                if (groupstatistics > 0)
20340
+                                                    modelT_Bus_AssignedInfo.F_GroupStatistics = groupstatistics.ToString();
20341
+
20342
+
20343
+                                                new BLL.T_Bus_AssignedInfo().Update(modelT_Bus_AssignedInfo);
20344
+                                            }
20332 20345
                                             if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs3))
20333 20346
                                             {
20334 20347
                                                 #region 插入操作记录
@@ -20344,13 +20357,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
20344 20357
                                         }
20345 20358
                                         else
20346 20359
                                         {
20360
+                                          
20361
+
20362
+
20347 20363
                                             keyValuePairs3.Add("F_WorkState", (int)EnumWorkState.reload);
20348 20364
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.reload;//重办中
20349 20365
                                             int n = Int32.Parse(DbHelperSQL.GetSingle("select count(1) from T_Bus_AssignedInfo WITH(NOLOCK) where F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "' and  F_State=1 and F_IsSure=1 and F_IsDelete=0 and isnull(F_IsReload,0)>0").ToString());
20350 20366
                                             Model.T_Bus_AssignedInfo newmodelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
20351 20367
                                             newmodelT_Bus_AssignedInfo.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
20368
+                                            if (statistics > 0)
20369
+                                            {
20370
+                                                newmodelT_Bus_AssignedInfo.F_IsPerform = 1;
20371
+                                                if (groupstatistics > 0)
20372
+                                                    newmodelT_Bus_AssignedInfo.F_GroupStatistics = groupstatistics.ToString();
20373
+                                            }
20352 20374
 
20353
-                                          
20354 20375
                                             DataTable dt = DbHelperSQL.Query("select top "+ limittimes + " F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and " +
20355 20376
                                                 "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];
20356 20377
                                             var resdatetime = dt.Rows[limittimes-1]["F_OffDate"].ToString();
@@ -20509,15 +20530,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
20509 20530
                                 oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
20510 20531
                                 string userinfo = User.depname + "(" + User.F_UserCode + ")";
20511 20532
                                 string satisfie = "";
20512
-                                if (issatisfie > -1)
20513
-                                {
20514
-                                    satisfie = ",结果:满意";
20515
-                                    if (issatisfie == 0)
20516
-                                        satisfie = ",结果:不满意";
20517
-                                    else if (issatisfie == 2)
20518
-                                        satisfie = ",结果:基本满意";
20519
-                                }
20520
-                              
20533
+                                satisfie = ",结果:满意";
20534
+                                if (issatisfie == 0)
20535
+                                    satisfie = ",结果:不满意";
20536
+                                else if (issatisfie == 1)
20537
+                                    satisfie = ",结果:基本满意";
20538
+                                else if (issatisfie == 2)
20539
+                                    satisfie = ",结果:非常满意";
20540
+                                else if (issatisfie == -1)
20541
+                                    satisfie = ",结果:非常不满意";
20542
+
20521 20543
                                 oper.F_Message = userinfo + " " + opt + "了工单" + satisfie + cbreasons;
20522 20544
                                 oper.F_CreateUser = User.F_UserCode;
20523 20545
                                 oper.F_CreateTime = DateTime.Now;
@@ -21592,6 +21614,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
21592 21614
             string otherdeptids = RequestString.GetFormString("otherdeptids");
21593 21615
             int limittime = RequestString.GetInt("limittime", 6);
21594 21616
             string assignedopinion = RequestString.GetFormString("assignedopinion");
21617
+            int statistics = RequestString.GetInt("statistics", 0);//是否进行退回统计0否1是
21618
+            int groupstatistics = RequestString.GetInt("groupstatistics", 0);
21595 21619
             if (User.F_RoleCode == "ZJZY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
21596 21620
             {
21597 21621
                 if (!string.IsNullOrEmpty(ids))
@@ -21745,6 +21769,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
21745 21769
                                             keyValuePairs3.Add("F_WorkState", (int)EnumWorkState.backaudit);
21746 21770
                                             keyValuePairs3.Add("F_Note", "");
21747 21771
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.backaudit;//重办审核
21772
+                                            if (statistics > 0)
21773
+                                            {
21774
+                                                if (modelT_Bus_AssignedInfo.F_IsPerform == 1)
21775
+                                                    modelT_Bus_AssignedInfo.F_IsPerform = 2;
21776
+                                                else
21777
+                                                    modelT_Bus_AssignedInfo.F_IsPerform = 3;
21778
+                                                if (groupstatistics > 0)
21779
+                                                    modelT_Bus_AssignedInfo.F_GroupStatistics = groupstatistics.ToString();
21780
+
21781
+
21782
+                                                new BLL.T_Bus_AssignedInfo().Update(modelT_Bus_AssignedInfo);
21783
+                                            }
21784
+
21748 21785
                                             if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs3))
21749 21786
                                             {
21750 21787
                                                 #region 插入操作记录
@@ -21832,6 +21869,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
21832 21869
                                             newmodelT_Bus_AssignedInfo.F_ReloadUser = User.F_UserCode;
21833 21870
                                             newmodelT_Bus_AssignedInfo.F_ReloadTime = DateTime.Now;
21834 21871
                                             newmodelT_Bus_AssignedInfo.F_IsNext = 0;
21872
+                                            if (statistics > 0)
21873
+                                            {
21874
+                                                newmodelT_Bus_AssignedInfo.F_IsPerform = 1;
21875
+                                                if (groupstatistics > 0)
21876
+                                                    newmodelT_Bus_AssignedInfo.F_GroupStatistics = groupstatistics.ToString();
21877
+                                            }
21835 21878
                                             newmodelT_Bus_AssignedInfo.F_Id = assignBLL.Add(newmodelT_Bus_AssignedInfo);
21836 21879
                                             if (newmodelT_Bus_AssignedInfo.F_Id > 0)
21837 21880
                                             {

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

@@ -28,7 +28,7 @@ using System.Web;
28 28
 using System.Web.Mvc;
29 29
 namespace CallCenterApi.Interface.Controllers.workorder
30 30
 {
31
-    [Authority]
31
+    //[Authority]
32 32
     public class hb_affairsController : BaseController
33 33
     {
34 34
         private BLL.T_Bus_WorkOrder workorderBLL = new BLL.T_Bus_WorkOrder();