zhaozhiqiang лет назад: 3
Родитель
Сommit
4fddd5890d

+ 34 - 22
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

8812
                             else
8812
                             else
8813
                             {
8813
                             {
8814
                                     string newids = ""; string errdeptid = ""; string deptname = "";
8814
                                     string newids = ""; string errdeptid = ""; string deptname = "";
8815
+                                foreach (var deptmasinfo in deptlist)
8816
+                                {
8817
+                                    deptname += deptmasinfo.F_DeptName + ",";
8818
+                                }
8815
                                     foreach (var deptinfo in deptlist)
8819
                                     foreach (var deptinfo in deptlist)
8816
                                     {
8820
                                     {
8817
-                                        deptname += deptinfo.F_DeptName + ",";
8821
+                                       
8818
                                         #region 新增工单
8822
                                         #region 新增工单
8819
                                         Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
8823
                                         Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
8820
                                         modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
8824
                                         modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
8872
                                             }
8876
                                             }
8873
                                             #endregion
8877
                                             #endregion
8874
                                             #region 插入操作记录
8878
                                             #region 插入操作记录
8875
-                                            var msgss = userinfo + " 交办了工单,主办单位:" + deptinfo.F_DeptName;
8879
+                                            var msgss = userinfo + " 交办了工单,主办单位:" + deptname;
8876
                                             if (!string.IsNullOrEmpty(otherdeptids))
8880
                                             if (!string.IsNullOrEmpty(otherdeptids))
8877
                                             {
8881
                                             {
8878
                                                 string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";
8882
                                                 string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";
8910
                                             #endregion
8914
                                             #endregion
8911
                                         }
8915
                                         }
8912
                                         newids += modelT_Bus_WorkOrder1.F_WorkOrderId + ",";
8916
                                         newids += modelT_Bus_WorkOrder1.F_WorkOrderId + ",";
8913
-
8914
-                                    }
8917
+                                        //deptname += deptinfo.F_DeptName + ",";
8918
+                                }
8915
                                     newids = newids.Trim(','); deptname = deptname.Trim(',');
8919
                                     newids = newids.Trim(','); deptname = deptname.Trim(',');
8916
                                     var msgs = "";
8920
                                     var msgs = "";
8917
                                     if (errdeptid == "")
8921
                                     if (errdeptid == "")
9108
                             }
9112
                             }
9109
                             else
9113
                             else
9110
                             {
9114
                             {
9111
-                               
9115
+                                foreach (var deptmasinfo in deptlist)
9116
+                                {
9117
+                                    deptname += deptmasinfo.F_DeptName + ",";
9118
+                                }
9119
+
9112
                                 foreach (var deptinfo in deptlist)
9120
                                 foreach (var deptinfo in deptlist)
9113
                                 {
9121
                                 {
9114
-                                    deptname += deptinfo.F_DeptName + ",";
9122
+                                    //deptname += deptinfo.F_DeptName + ",";
9115
                                     #region 新增工单
9123
                                     #region 新增工单
9116
                                     Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
9124
                                     Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
9117
                                     modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
9125
                                     modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
9160
                                        
9168
                                        
9161
                                         #endregion
9169
                                         #endregion
9162
                                         #region 插入操作记录
9170
                                         #region 插入操作记录
9163
-                                        var msgss = userinfo + " 交办了工单,主办单位:" + deptinfo.F_DeptName;
9171
+                                        var msgss = userinfo + " 交办了工单,主办单位:" + deptname;
9164
                                         if (!string.IsNullOrEmpty(otherdeptids))
9172
                                         if (!string.IsNullOrEmpty(otherdeptids))
9165
                                         {
9173
                                         {
9166
                                             string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";
9174
                                             string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";
9202
                                 }
9210
                                 }
9203
                                 newids = newids.Trim(','); deptname = deptname.Trim(',');
9211
                                 newids = newids.Trim(','); deptname = deptname.Trim(',');
9204
                                 var msgs = "";
9212
                                 var msgs = "";
9205
-                                //if (errdeptid == "")
9206
-                                //{
9207
-                                //    modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;//待查收
9208
-                                //    modelT_Bus_WorkOrder.F_CloseTime = DateTime.Now;
9209
-                                //    modelT_Bus_WorkOrder.F_CloseUser = userModel.F_UserCode;
9210
-                                //    modelT_Bus_WorkOrder.F_IsDelete = 1;//删除旧工单
9211
-                                //    workorderBLL.Update(modelT_Bus_WorkOrder);
9212
-                                //    msgs = userinfo + " 交办多单位,工单编号为:" + newids;
9213
-                                //}
9214
-                                //else
9215
-                                //{
9216
-                                //    errdeptid = errdeptid.Trim(',');
9217
-                                //    msgs = userinfo + " 交办的单位有" + deptname + ",部分操作成功,新工单编号为:" + newids + ",交办失败的部门为:" + errdeptid;
9218
-                                //}
9213
+                                if (errdeptid == "")
9214
+                                {
9215
+                                    //modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;//待查收
9216
+                                    //modelT_Bus_WorkOrder.F_CloseTime = DateTime.Now;
9217
+                                    //modelT_Bus_WorkOrder.F_CloseUser = userModel.F_UserCode;
9218
+                                    //modelT_Bus_WorkOrder.F_IsDelete = 1;//删除旧工单
9219
+                                    //workorderBLL.Update(modelT_Bus_WorkOrder);
9220
+                                    msgs = userinfo + " 交办多单位,工单编号为:" + newids;
9221
+                                }
9222
+                                else
9223
+                                {
9224
+                                    errdeptid = errdeptid.Trim(',');
9225
+                                    msgs = userinfo + " 交办的单位有" + deptname + ",部分操作成功,新工单编号为:" + newids + ",交办失败的部门为:" + errdeptid;
9226
+                                }
9219
                                 #region 插入操作记录
9227
                                 #region 插入操作记录
9220
                                 addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgs, userModel.F_UserCode);
9228
                                 addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgs, userModel.F_UserCode);
9221
                                 var WorkOrder = newids.Split(',');
9229
                                 var WorkOrder = newids.Split(',');
13718
                             {
13726
                             {
13719
                                 #region 多单位
13727
                                 #region 多单位
13720
                                 string newids = ""; string errdeptid = ""; string deptname = "";
13728
                                 string newids = ""; string errdeptid = ""; string deptname = "";
13729
+                                foreach (var deptmasinfo in deptlist)
13730
+                                {
13731
+                                    deptname += deptmasinfo.F_DeptName + ",";
13732
+                                }
13721
                                 foreach (var deptinfo in deptlist)
13733
                                 foreach (var deptinfo in deptlist)
13722
                                 {
13734
                                 {
13723
-                                    deptname += deptinfo.F_DeptName + ",";
13735
+                                    //deptname += deptinfo.F_DeptName + ",";
13724
                                     #region 新增工单
13736
                                     #region 新增工单
13725
                                    var  modelT_Bus_WorkOrder1 = modelT_Bus_WorkOrder;
13737
                                    var  modelT_Bus_WorkOrder1 = modelT_Bus_WorkOrder;
13726
                                     modelT_Bus_WorkOrder1.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(modelT_Bus_WorkOrder.F_CreateUser);
13738
                                     modelT_Bus_WorkOrder1.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(modelT_Bus_WorkOrder.F_CreateUser);