Przeglądaj źródła

工单流程增加人员名称

duhongyu 6 lat temu
rodzic
commit
123c6dc9a7

+ 28 - 4
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

1979
                     sql += " and F_IsDelete=0";
1979
                     sql += " and F_IsDelete=0";
1980
                     list = workOrder.GetModelList(sql);
1980
                     list = workOrder.GetModelList(sql);
1981
                 }
1981
                 }
1982
-                var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
1983
-
1982
+                 var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
1983
+                 
1984
                 if (list.Count > 0)
1984
                 if (list.Count > 0)
1985
                 {
1985
                 {
1986
                     List<WorkOrderNewInput> Input = modeltooip(list);
1986
                     List<WorkOrderNewInput> Input = modeltooip(list);
1991
                             state = "success",
1991
                             state = "success",
1992
                             message = "成功",
1992
                             message = "成功",
1993
                             rows = Input,
1993
                             rows = Input,
1994
-                            total= itemlasts,
1994
+                            total= ItemList( itemlasts),
1995
                         };
1995
                         };
1996
 
1996
 
1997
                         return Content(obj.ToJson()); 
1997
                         return Content(obj.ToJson()); 
2010
                 return Error("无操作权限!");
2010
                 return Error("无操作权限!");
2011
             }
2011
             }
2012
         }
2012
         }
2013
+        private List <Model .T_Wo_WorkOrderItem_New > ItemList(List<Model.T_Wo_WorkOrderItem_New> list)
2014
+        {
2015
+            List<Model.T_Wo_WorkOrderItem_New> Modellist = new List<T_Wo_WorkOrderItem_New>();
2016
+          
2017
+            foreach (var it in list)
2018
+            {
2019
+                string username = "";
2020
+                if (!string.IsNullOrEmpty (it .F_CreateUser ))
2021
+                {
2022
+                    username = sysUserAccountBll.GetModel(it.F_CreateUser).F_UserName;
2023
+                    it.F_CreateUser = it.F_CreateUser + "(" + username + ")";
2024
+                }
2025
+                Modellist.Add(it);
2026
+            }
2027
+            return Modellist;
2028
+        }
2013
         /// <summary>
2029
         /// <summary>
2014
         /// 查询工单记录列表
2030
         /// 查询工单记录列表
2015
         /// </summary>
2031
         /// </summary>
3464
                     model.F_ID = model1[i].F_ID;//
3480
                     model.F_ID = model1[i].F_ID;//
3465
                     model.F_WorkOrderCode = model1[i].F_WorkOrderCode;//工单编号
3481
                     model.F_WorkOrderCode = model1[i].F_WorkOrderCode;//工单编号
3466
                     #region
3482
                     #region
3467
-                    model.F_Source =int .Parse ( model1[i].F_Source);//工单来源
3483
+                    if (!string .IsNullOrEmpty(model1[i].F_Source))
3484
+                    {
3485
+                        model.F_Source = int.Parse(model1[i].F_Source);//工单来源
3486
+                    }
3487
+                    else
3488
+                    {
3489
+                        model1[i].F_Source = "1";
3490
+                        model.F_Source = int.Parse(model1[i].F_Source);//工单来源
3491
+                    }
3468
                     if (model1[i].F_Source=="1")
3492
                     if (model1[i].F_Source=="1")
3469
                     {
3493
                     {
3470
                         model.F_SourceName = "电话";
3494
                         model.F_SourceName = "电话";