多工单操作记录修改

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -8812,9 +8812,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else
                             {
                                     string newids = ""; string errdeptid = ""; string deptname = "";
+                                foreach (var deptmasinfo in deptlist)
+                                {
+                                    deptname += deptmasinfo.F_DeptName + ",";
+                                }
                                     foreach (var deptinfo in deptlist)
                                     {
-                                        deptname += deptinfo.F_DeptName + ",";
+                                       
                                         #region 新增工单
                                         Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
                                         modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
@@ -8872,7 +8876,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                             }
                                             #endregion
                                             #region 插入操作记录
-                                            var msgss = userinfo + " 交办了工单，主办单位：" + deptinfo.F_DeptName;
+                                            var msgss = userinfo + " 交办了工单，主办单位：" + deptname;
                                             if (!string.IsNullOrEmpty(otherdeptids))
                                             {
                                                 string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";
@@ -8910,8 +8914,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                             #endregion
                                         }
                                         newids += modelT_Bus_WorkOrder1.F_WorkOrderId + ",";
-
-                                    }
+                                        //deptname += deptinfo.F_DeptName + ",";
+                                }
                                     newids = newids.Trim(','); deptname = deptname.Trim(',');
                                     var msgs = "";
                                     if (errdeptid == "")
@@ -9108,10 +9112,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                               
+                                foreach (var deptmasinfo in deptlist)
+                                {
+                                    deptname += deptmasinfo.F_DeptName + ",";
+                                }
+
                                 foreach (var deptinfo in deptlist)
                                 {
-                                    deptname += deptinfo.F_DeptName + ",";
+                                    //deptname += deptinfo.F_DeptName + ",";
                                     #region 新增工单
                                     Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
                                     modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
@@ -9160,7 +9168,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                        
                                         #endregion
                                         #region 插入操作记录
-                                        var msgss = userinfo + " 交办了工单，主办单位：" + deptinfo.F_DeptName;
+                                        var msgss = userinfo + " 交办了工单，主办单位：" + deptname;
                                         if (!string.IsNullOrEmpty(otherdeptids))
                                         {
                                             string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";
@@ -9202,20 +9210,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 newids = newids.Trim(','); deptname = deptname.Trim(',');
                                 var msgs = "";
-                                //if (errdeptid == "")
-                                //{
-                                //    modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;//待查收
-                                //    modelT_Bus_WorkOrder.F_CloseTime = DateTime.Now;
-                                //    modelT_Bus_WorkOrder.F_CloseUser = userModel.F_UserCode;
-                                //    modelT_Bus_WorkOrder.F_IsDelete = 1;//删除旧工单
-                                //    workorderBLL.Update(modelT_Bus_WorkOrder);
-                                //    msgs = userinfo + " 交办多单位，工单编号为：" + newids;
-                                //}
-                                //else
-                                //{
-                                //    errdeptid = errdeptid.Trim(',');
-                                //    msgs = userinfo + " 交办的单位有" + deptname + "，部分操作成功，新工单编号为：" + newids + "，交办失败的部门为：" + errdeptid;
-                                //}
+                                if (errdeptid == "")
+                                {
+                                    //modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;//待查收
+                                    //modelT_Bus_WorkOrder.F_CloseTime = DateTime.Now;
+                                    //modelT_Bus_WorkOrder.F_CloseUser = userModel.F_UserCode;
+                                    //modelT_Bus_WorkOrder.F_IsDelete = 1;//删除旧工单
+                                    //workorderBLL.Update(modelT_Bus_WorkOrder);
+                                    msgs = userinfo + " 交办多单位，工单编号为：" + newids;
+                                }
+                                else
+                                {
+                                    errdeptid = errdeptid.Trim(',');
+                                    msgs = userinfo + " 交办的单位有" + deptname + "，部分操作成功，新工单编号为：" + newids + "，交办失败的部门为：" + errdeptid;
+                                }
                                 #region 插入操作记录
                                 addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgs, userModel.F_UserCode);
                                 var WorkOrder = newids.Split(',');
@@ -13718,9 +13726,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 #region 多单位
                                 string newids = ""; string errdeptid = ""; string deptname = "";
+                                foreach (var deptmasinfo in deptlist)
+                                {
+                                    deptname += deptmasinfo.F_DeptName + ",";
+                                }
                                 foreach (var deptinfo in deptlist)
                                 {
-                                    deptname += deptinfo.F_DeptName + ",";
+                                    //deptname += deptinfo.F_DeptName + ",";
                                     #region 新增工单
                                    var  modelT_Bus_WorkOrder1 = modelT_Bus_WorkOrder;
                                     modelT_Bus_WorkOrder1.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(modelT_Bus_WorkOrder.F_CreateUser);