工单流程增加人员名称

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -1979,8 +1979,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and F_IsDelete=0";
                     list = workOrder.GetModelList(sql);
                 }
-                var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
-
+                 var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
+                 
                 if (list.Count > 0)
                 {
                     List<WorkOrderNewInput> Input = modeltooip(list);
@@ -1991,7 +1991,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             state = "success",
                             message = "成功",
                             rows = Input,
-                            total= itemlasts,
+                            total= ItemList( itemlasts),
                         };
 
                         return Content(obj.ToJson()); 
@@ -2010,6 +2010,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("无操作权限！");
             }
         }
+        private List <Model .T_Wo_WorkOrderItem_New > ItemList(List<Model.T_Wo_WorkOrderItem_New> list)
+        {
+            List<Model.T_Wo_WorkOrderItem_New> Modellist = new List<T_Wo_WorkOrderItem_New>();
+          
+            foreach (var it in list)
+            {
+                string username = "";
+                if (!string.IsNullOrEmpty (it .F_CreateUser ))
+                {
+                    username = sysUserAccountBll.GetModel(it.F_CreateUser).F_UserName;
+                    it.F_CreateUser = it.F_CreateUser + "(" + username + ")";
+                }
+                Modellist.Add(it);
+            }
+            return Modellist;
+        }
         /// <summary>
         /// 查询工单记录列表
         /// </summary>
@@ -3464,7 +3480,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_ID = model1[i].F_ID;//
                     model.F_WorkOrderCode = model1[i].F_WorkOrderCode;//工单编号
                     #region
-                    model.F_Source =int .Parse ( model1[i].F_Source);//工单来源
+                    if (!string .IsNullOrEmpty(model1[i].F_Source))
+                    {
+                        model.F_Source = int.Parse(model1[i].F_Source);//工单来源
+                    }
+                    else
+                    {
+                        model1[i].F_Source = "1";
+                        model.F_Source = int.Parse(model1[i].F_Source);//工单来源
+                    }
                     if (model1[i].F_Source=="1")
                     {
                         model.F_SourceName = "电话";