Sfoglia il codice sorgente

大屏,处理增加附件

duhongyu 6 anni fa
parent
commit
de2f6fa39a

+ 1 - 3
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

3414
                                     if (it.F_State == 10 || it.F_State == 11)
3414
                                     if (it.F_State == 10 || it.F_State == 11)
3415
                                     {
3415
                                     {
3416
                                         efficiency++;
3416
                                         efficiency++;
3417
-                                        System.TimeSpan id = DateTime.Parse(it.F_DealTime.ToString()) - DateTime.Parse(it.F_CreateOn.ToString());
3418
-                                        double t = id.TotalHours;
3419
-                                        timehource.Add((float)t);
3417
+                                   
3420
                                     }
3418
                                     }
3421
                                     if (it.F_IsOver == 1)
3419
                                     if (it.F_IsOver == 1)
3422
                                     {
3420
                                     {

+ 1 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

347
                 }
347
                 }
348
 
348
 
349
                 dt = new BLL.T_Call_CallRecords().GetListExpt(sql).Tables[0];
349
                 dt = new BLL.T_Call_CallRecords().GetListExpt(sql).Tables[0];
350
-
350
+               
351
                 NPOIHelper npoi = new NPOIHelper();
351
                 NPOIHelper npoi = new NPOIHelper();
352
                 if (npoi.ExportToExcel("通话记录数据", dt, col()) == "")
352
                 if (npoi.ExportToExcel("通话记录数据", dt, col()) == "")
353
                 {
353
                 {

+ 6 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

4337
                 #region 处理工单
4337
                 #region 处理工单
4338
                 model.F_State = wostate;
4338
                 model.F_State = wostate;
4339
                 if (!string.IsNullOrEmpty(F_Files))
4339
                 if (!string.IsNullOrEmpty(F_Files))
4340
-                    model.F_Files = F_Files;
4340
+                {
4341
+                    if (!string.IsNullOrEmpty(model.F_Files))
4342
+                        model.F_Files = model.F_Files + "," + F_Files;
4343
+                    else
4344
+                        model.F_Files = F_Files;
4345
+                }
4341
                 //处理内容
4346
                 //处理内容
4342
                 if (!string.IsNullOrEmpty(cont))
4347
                 if (!string.IsNullOrEmpty(cont))
4343
                     model.F_DealContent += cont + ";";
4348
                     model.F_DealContent += cont + ";";

+ 10 - 3
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

5638
         /// <returns></returns>
5638
         /// <returns></returns>
5639
         [Authority]
5639
         [Authority]
5640
         public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
5640
         public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
5641
-            string uncont="",
5641
+     string   F_Files, string uncont="",
5642
           int isvisit=1,  int isover = 0)
5642
           int isvisit=1,  int isover = 0)
5643
         {
5643
         {
5644
             int userId = CurrentUser.UserData.F_UserId;
5644
             int userId = CurrentUser.UserData.F_UserId;
5716
                         else
5716
                         else
5717
                         {
5717
                         {
5718
 
5718
 
5719
-                            var res = DealWO(ua, model, input, cont, isover, uncont);
5719
+                            var res = DealWO(ua, model, input, cont, F_Files, isover,  uncont);
5720
 
5720
 
5721
                             if (res)
5721
                             if (res)
5722
                                 return Success("处理成功");
5722
                                 return Success("处理成功");
6279
         /// <summary>
6279
         /// <summary>
6280
         /// 处理工单
6280
         /// 处理工单
6281
         /// </summary>
6281
         /// </summary>
6282
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input,string cont,int isover = 0,string uncont="")
6282
+        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input,string cont, string F_Files, int isover = 0,string uncont="")
6283
         {
6283
         {
6284
             #region 工单处理
6284
             #region 工单处理
6285
            int   sms = 0;
6285
            int   sms = 0;
6331
                 #region 处理工单
6331
                 #region 处理工单
6332
                 model.F_State  = wostate;
6332
                 model.F_State  = wostate;
6333
                 //处理内容
6333
                 //处理内容
6334
+                if (!string.IsNullOrEmpty(F_Files))
6335
+                {
6336
+                    if (!string.IsNullOrEmpty(model.F_Files))
6337
+                        model.F_Files = model.F_Files + "," + F_Files;
6338
+                    else
6339
+                        model.F_Files = F_Files;
6340
+                }
6334
                 if (!string.IsNullOrEmpty(cont))
6341
                 if (!string.IsNullOrEmpty(cont))
6335
                     model.F_DealContent += cont + ";";
6342
                     model.F_DealContent += cont + ";";
6336
                 model.F_DealTime = DateTime.Now;
6343
                 model.F_DealTime = DateTime.Now;