更新定责导出，定流程，转办支持选人

web/BaseCallCenter.BLL/Order/T_Wo_WorkOrderNotice.cs

@@ -38,7 +38,7 @@ namespace YTSoft.BaseCallCenter.BLL
         /// <summary>
         /// 更新定责次数
         /// </summary>
-        public bool updatenum(int orderid)
+        public int updatenum(int orderid)
         {
             return dal.updatenum(orderid);
         }

web/BaseCallCenter.BLL/T_Wo_WorkOrderBase.cs

@@ -25,7 +25,7 @@ namespace YTSoft.BaseCallCenter.BLL
         /// <summary>
         /// 增加一条数据
         /// </summary>
-        public bool AddWbgd(YTSoft.BaseCallCenter.Model.T_Wo_WorkOrderBase model)
+        public int AddWbgd(YTSoft.BaseCallCenter.Model.T_Wo_WorkOrderBase model)
         {
             return dal.AddWbgd(model);
         }

web/BaseCallCenter.DAL/COM/T_Com_Class.cs

@@ -392,7 +392,7 @@ namespace YTSoft.BaseCallCenter.DAL
                 model.code = 0;
                 model.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
                 model.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
-                model.open = "true";
+                model.open = "true";                
                 model.children = modelList;
             }
             else
@@ -412,6 +412,7 @@ namespace YTSoft.BaseCallCenter.DAL
                     model.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
                     model.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
                     model.open = "true";
+                    model.IsOrPrivate = 0;
                     model.children = modelList;
                 }
             }
@@ -432,19 +433,21 @@ namespace YTSoft.BaseCallCenter.DAL
         /// <returns></returns>
         public TreeNodeModel GetTreeModel(DataTable table, TreeNodeModel model, int type)
         {
-            DataRow[] rows = table.Select("Parentid=" + model.code);
+            DataRow[] rows = table.Select("Parentid=" + model.id);
             if (rows != null && rows.Length > 0)
             {
                 foreach (DataRow row in rows)
                 {
+                    
                     List<TreeNodeModel> modelList = new List<TreeNodeModel>();
                     TreeNodeModel childModel = new TreeNodeModel();
                     childModel.id = int.Parse(row["Classid"].ToString());
                     childModel.name = row["Classname"].ToString();
-                    childModel.code = int.Parse(row["Classid"].ToString());
+                    childModel.code = row["Remark"].ToInt32();
                     childModel.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
                     childModel.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
                     childModel.open = "false";
+                    childModel.IsOrPrivate = 1;
                     childModel.children = modelList;
                     model.children.Add(childModel);
                     GetTreeModel(table, childModel, type);

web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderBase.cs

@@ -355,7 +355,7 @@ F_RETURNVISITID,F_RETURNVISITOPINION,F_RETURNVISITPROBLEM,F_CallId,F_CREATEBYids
         /// <summary>
         /// 增加一条手工微博工单数据
         /// </summary>
-        public bool AddWbgd(YTSoft.BaseCallCenter.Model.T_Wo_WorkOrderBase model)
+        public int AddWbgd(YTSoft.BaseCallCenter.Model.T_Wo_WorkOrderBase model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_WorkOrderBase(");
@@ -539,11 +539,11 @@ F_RETURNVISITOPINION,F_RETURNVISITPROBLEM,F_CallId,F_CREATEBYids)");
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
-                return false;
+                return 0;
             }
             else
             {
-                return true;
+                return Convert.ToInt32(obj);
             }
         }
         /// <summary>
@@ -1838,7 +1838,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                     EditStatus = true;
                     if (n == 0)
                     {
-                        LogAciton.AddAction(model.F_UserName, model.F_OPTUSERID.ToInt32(), "历史工单模块调用工单模块", "模块调用", "DAL/T_Wo_WorkOrderBase/SubmitOrder", "DAL/T_Wo_WorkOrderBase/UpdateOrderToHF");
+                        LogAciton.AddAction(eidthistoryModel.F_UserName, eidthistoryModel.F_OPTUSERID.ToInt32(), "历史工单模块调用工单模块", "模块调用", "DAL/T_Wo_WorkOrderBase/SubmitOrder", "DAL/T_Wo_WorkOrderBase/UpdateOrderToHF");
                         UpdateOrderToHF(eidthistoryModel.F_INSTANCEID.ToInt32());
                     }
                     //如果有转办信息插入转办信息
@@ -2293,20 +2293,20 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             historyModel.F_TASKFLAG = 2;
             historyModel.F_REMARK = "已撤消";
             historyId = InsertWorkOrderHistoryModel(historyModel);
-            if (historyId > 0)
-            {
-                StringBuilder strSql = new StringBuilder();
-                strSql.Append("update T_Wo_WorkOrderBase set ");
-                strSql.Append("F_FORMID=@F_FORMID");
-                strSql.Append(" where F_WORKORDERID=@F_WORKORDERID");
-                SqlParameter[] parameters = {
-                    new SqlParameter("@F_FORMID",  SqlDbType.Int,4),
-                    new SqlParameter("@F_WORKORDERID", SqlDbType.Int,4)};
-                parameters[0].Value = historyId;
-                parameters[1].Value = workOrderId;
-                bool EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters) > 0;
-
-            }
+            //if (historyId > 0)
+            //{
+            //    StringBuilder strSql = new StringBuilder();
+            //    strSql.Append("update T_Wo_WorkOrderBase set ");
+            //    strSql.Append("F_FORMID=@F_FORMID");
+            //    strSql.Append(" where F_WORKORDERID=@F_WORKORDERID");
+            //    SqlParameter[] parameters = {
+            //        new SqlParameter("@F_FORMID",  SqlDbType.Int,4),
+            //        new SqlParameter("@F_WORKORDERID", SqlDbType.Int,4)};
+            //    parameters[0].Value = historyId;
+            //    parameters[1].Value = workOrderId;
+            //    bool EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters) > 0;
+
+            //}
             return historyId;
 
         }

web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderNotice.cs

@@ -215,26 +215,23 @@ namespace YTSoft.BaseCallCenter.DAL
         /// <summary>
         /// 更新定责次数
         /// </summary>
-        public bool updatenum(int orderid)
+        public int updatenum(int orderid)
         {
 
             StringBuilder strSql = new StringBuilder();
             strSql.Append(" update T_Wo_WorkOrderNotice ");
             strSql.Append(" set NoticeState=0,DZNumber=DZNumber+1 ");
-            strSql.Append(" where OrderId=@OrderId");
+            strSql.Append(" where OrderId=@OrderId;");
             SqlParameter[] parameters = {
                     new SqlParameter("@OrderId",orderid)
             };
 
-            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
-            if (rows > 0)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
+            DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            strSql.Clear();
+            strSql.Append(" select top 1 DZNumber from  T_Wo_WorkOrderNotice ");
+            strSql.Append(" where OrderId=@OrderId Order by DZNumber desc; ");
+            int rows = DbHelperSQL.GetSingle(strSql.ToString(), parameters).ToInt32();
+            return rows;
         }
 
         /// <summary>

web/BaseCallCenter.Model/Order/T_Wo_WorkOrderNotice.cs

@@ -279,6 +279,8 @@ namespace YTSoft.BaseCallCenter.Model
         // 定性定责结果
         public string F_SERVICENATURE { get; set; }
 
+        public string DeptIds { get; set; }
+
 
         public int orderid { get; set; }
 

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/HW/CallRecordController.cs

@@ -162,7 +162,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             callScreenModel.AgeModelList = GetCodeType("NLD");
             //获取部门列表
             callScreenModel.DepartmentList = deptBll.GetModelList("F_ParentId=0");
-            callScreenModel.HistoryOrderList = historyBll.GetModelList("F_INSTANCEID=" + int.Parse(workOrderNum.ToString()));
+            callScreenModel.HistoryOrderList = historyBll.GetModelList("F_INSTANCEID=" + workOrderNum.ToInt32());
 
             return View(callScreenModel);
         }
@@ -287,19 +287,18 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         public bool ResetWorkOrder(int workOrderId)
         {
             bool result = false;;
-            int byid = F_UserID;
             string bycode = F_UserCode; 
             string byname =F_UserName;
             int bmid = F_DeptId;
             string bmmc = "";
-            if (byid>0) {
+            if (F_UserID > 0) {
                 YTSoft.BaseCallCenter.BLL.T_Sys_Department depBll = new BLL.T_Sys_Department();
                 List<Model.T_Sys_Department> list = new List<T_Sys_Department>();
                 list = depBll.GetModelList("F_DeptId=" + bmid);
                 if (list.Count>0)
                 {
                     bmmc = list[0].F_DeptName.ToString();
-                    result= orderBLL.ResetWorkOrder(workOrderId, byid, byname, bmid, bmmc);
+                    result= orderBLL.ResetWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc);
                 }
             } 
             return result;
@@ -553,18 +552,26 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Post)]
         public bool workOrderAddData(T_Wo_WorkOrderBase workOrderBaseModel)
         {
-            //工单来源
-            //workOrderBaseModel.F_REPAIRMANID = 1;
-            //workOrderBaseModel.F_WORKORDERFROM = "语音";
-
-
-            ////当前用户信息
-            workOrderBaseModel.F_USERID = F_UserID;
+            if (workOrderBaseModel.F_REPAIRMANID == 4)
+            {
+                workOrderBaseModel.F_WORKORDERFROM = "微博工单";
+                string wbh = workOrderBaseModel.CustomerBaseModel.F_CustomerEName.Trim();
+                if (!string.IsNullOrEmpty(wbh))
+                {
+                    workOrderBaseModel.F_EMPCODE = wbh;
+                    workOrderBaseModel.CustomerBaseModel.F_PostCode = wbh;
+                }
+                ////客户等级
+                workOrderBaseModel.CustomerBaseModel.F_ScaleResume = "1";
+                workOrderBaseModel.CustomerBaseModel.F_CustomerClass = "一般客户";
+            }
+            workOrderBaseModel.F_USERID = F_UserID;//id
+            workOrderBaseModel.F_LINKMAN = F_UserCode;//工号
+            workOrderBaseModel.F_REPAIRMANNAME = F_UserName;//姓名
+            workOrderBaseModel.F_LINKMANTELEPHONE = workOrderBaseModel.CustomerBaseModel.F_Mobile;
             workOrderBaseModel.F_USERNAME = F_UserName;
-            //workOrderBaseModel.F_LINKMAN = F_UserCode;//工号
-            //workOrderBaseModel.F_REPAIRMANNAME = "12";//姓名
-
             workOrderBaseModel.F_DEPTID = F_DeptId;
+
             T_Sys_Department deptmodel = deptBll.GetModel(F_DeptId);
             if (deptmodel != null)
             {
@@ -599,10 +606,6 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 workOrderBaseModel.CustomerBaseModel.F_IndustryId = workOrderBaseModel.F_REPAIRLEVEL;
                 workOrderBaseModel.CustomerBaseModel.F_Url = workOrderBaseModel.F_ADSLACCOUNT;
 
-                ////客户等级
-                //workOrderBaseModel.CustomerBaseModel.F_ScaleResume = "1";
-                //workOrderBaseModel.CustomerBaseModel.F_CustomerClass = "一般客户";
-
                 //修改客户基础信息
                 int cusid = cusBLL.EditCusInfoModel(workOrderBaseModel.CustomerBaseModel);
                 if (cusid > 1)
@@ -617,6 +620,31 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 if (workOrderBaseModel.F_HOUSING == "表扬" || workOrderBaseModel.F_HOUSING == "咨询" || workOrderBaseModel.F_HOUSING == "挂失")
                 {
                     workOrderBaseModel.F_WORKORDERTYPEID = 3;
+                    if (workOrderBaseModel.HistoryOrderList != null && workOrderBaseModel.HistoryOrderList.Count > 0)
+                    {
+                        Dictionary<int, string> dict = new Dictionary<int, string>() { };
+
+                        for (int i = workOrderBaseModel.HistoryOrderList.Count - 1; i >= 0; i--)
+                        {
+                            T_Wo_WorkOrderHistory modelhis = workOrderBaseModel.HistoryOrderList[i];
+
+
+                            Model.T_Sys_Department model = new BLL.T_Sys_Department().GetModel(string.Format("F_DeptId=(select top 1 F_DeptId from T_Sys_UserAccount where F_UserId={0})", modelhis.F_OPTUSERID));
+                            if (model != null && model.F_DeptId > 0)
+                            {
+                                if (dict.ContainsKey(model.F_DeptId))
+                                {
+                                    workOrderBaseModel.HistoryOrderList.Remove(workOrderBaseModel.HistoryOrderList[i]);
+                                    continue;
+                                }
+                                modelhis.F_OPTBTNID = model.F_DeptId;
+                                modelhis.F_NEXTOWNERARRID = model.F_DeptName;
+                                dict.Add(model.F_DeptId, "1");
+                            }
+
+                           
+                        }
+                    }
                 }
                 else if (workOrderBaseModel.F_WORKORDERTYPEID == 3)
                 {
@@ -639,17 +667,28 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 {
                     if (workOrderBaseModel.HistoryOrderList != null && workOrderBaseModel.HistoryOrderList.Count > 0)
                     {
-                        foreach (T_Wo_WorkOrderHistory modelhis in workOrderBaseModel.HistoryOrderList)
+                        Dictionary<int, string> dict = new Dictionary<int, string>() { };
+                       
+                        for (int i= workOrderBaseModel.HistoryOrderList.Count-1; i>=0;i--)
                         {
-                          Model.T_Sys_Department model=  new BLL.T_Sys_Department().GetModel(string.Format("F_DeptId=(select top 1 F_DeptId from T_Sys_UserAccount where F_UserId={0})", modelhis.F_OPTUSERID));
+                            T_Wo_WorkOrderHistory modelhis = workOrderBaseModel.HistoryOrderList[i];
+                            if (dict.ContainsKey(modelhis.F_OPTUSERID.ToInt32()))
+                            {
+                                workOrderBaseModel.HistoryOrderList.Remove(workOrderBaseModel.HistoryOrderList[i]);
+                                continue;
+                            }
+
+                            Model.T_Sys_Department model=  new BLL.T_Sys_Department().GetModel(string.Format("F_DeptId=(select top 1 F_DeptId from T_Sys_UserAccount where F_UserId={0})", modelhis.F_OPTUSERID));
                             if (model != null && model.F_DeptId > 0)
                             {
                                 modelhis.F_OPTBTNID = model.F_DeptId;
                                 modelhis.F_NEXTOWNERARRID = model.F_DeptName; 
                             }
+                            dict.Add(modelhis.F_OPTUSERID.ToInt32(), "1");
                         }
                     }
                 }
+                return false;
                 if (workOrderBaseModel.F_WORKORDERTYPEID == 1)
                 {
                     AddAction("t_wo_workorderbase", workOrderBaseModel.F_WORKORDERID.ToMyString(), "转单处理工单", workOrderBaseModel.F_CODE);
@@ -662,6 +701,18 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             else
             { workOrderBaseModel.F_CODE = ""; }
 
+            if (workOrderBaseModel.F_WORKORDERID == 0&& workOrderBaseModel.F_REPAIRMANID == 4)
+            {
+                workOrderBaseModel.F_CREATEDATE = DateTime.Now;
+                workOrderBaseModel.F_HASTENCOUNTS = 0;
+                int workid = orderBLL.AddWbgd(workOrderBaseModel);
+                if (workid==0)
+                {
+                    return false;
+                }
+                workOrderBaseModel.F_WORKORDERID = workid;
+            }
+
             return orderBLL.UpdateWorkOrderInfoModel(workOrderBaseModel);
         }
 
@@ -728,7 +779,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 if (workOrderBaseModel.F_WORKORDERID == 0)
                 {
                     workOrderBaseModel.F_CREATEDATE = DateTime.Now;
-                    bl = orderBLL.AddWbgd(workOrderBaseModel);
+                    workOrderBaseModel.F_HASTENCOUNTS = 0;
+                    bl = orderBLL.AddWbgd(workOrderBaseModel)>0;
                 }
                 else
                 {

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Order/OrderController.cs

@@ -429,22 +429,129 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             modelorder.F_SERVICENATURE = modelinput.F_SERVICENATURE;
             modelorder.F_SERVICETYPE = modelinput.F_SERVICETYPE;
             #endregion
+            int DZNumber=noticeBLL.updatenum(modelinput.orderid);
 
-            #region 通知
-            if (modelorder.F_WORKORDERTYPEID == 1)
+            if (string.IsNullOrEmpty(modelinput.DeptIds)&&false)
             {
-                List<T_Wo_WorkOrderHistory> modelhisList = historyBll.GetModelList(string.Format(" F_INSTANCEID={0}", modelinput.orderid));
-                if (modelhisList.Count > 0)
+                #region 通知  定责相关处理部门
+                if (modelorder.F_WORKORDERTYPEID == 1)
                 {
+                    List<T_Wo_WorkOrderHistory> modelhisList = historyBll.GetModelList(string.Format(" F_INSTANCEID={0}", modelinput.orderid));
+                    if (modelhisList.Count > 0)
+                    {
+
+                        Dictionary<int, string> dict = new Dictionary<int, string>() { };
 
-                    Dictionary<int, string> dict = new Dictionary<int, string>() { };
+                        foreach (T_Wo_WorkOrderHistory modelhis in modelhisList)
+                        {
+                            if (dict.ContainsKey(modelhis.F_OPTBTNID.ToInt32()))
+                            {
+                                continue;
+                            }
+                            T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
+                            modeladd.OrderId = modelinput.orderid;
+                            modeladd.DealAdvise = modelinput.F_SERVICETYPE;
+                            modeladd.DealResult = modelinput.F_SERVICENATURE;
+
+                            modeladd.Class1 = modelorder.F_PROVINCE;
+                            modeladd.Class2 = modelorder.F_CITY;
+                            modeladd.Class3 = modelorder.F_AREA;
+
+                            modeladd.DZNumber = DZNumber;
+                            modeladd.NoticeState = 1;
+                            modeladd.NoticeType = 1;
+                            modeladd.Userid = F_UserID;
+                            modeladd.Username = F_UserName;
+
+                            modeladd.NoticeUserid = modelhis.F_OPTUSERID.ToInt32();
+                            modeladd.NoticeUsername = modelhis.F_UserName;
+                            modeladd.NoticeDeptId = modelhis.F_OPTBTNID.ToInt32();
+                            modeladd.NoticeDeptName = modelhis.F_NEXTOWNERARRID;
+                            modeladd.NoticeDeptContent = modelhis.F_NEXTOWNERARRID + " 调查情况：\n";
+                            modeladd.NoticeDeptAdvise = modelhis.F_NEXTOWNERARRID + " 处理意见和整改措施：\n";
+                            foreach (T_Wo_WorkOrderHistory modelhistemp in modelhisList)
+                            {
+                                if (string.IsNullOrEmpty(modelhistemp.F_REMARK))
+                                {
+                                    continue;
+                                }
+                                int tempint = modelhistemp.F_REMARK.IndexOf("|");
+                                if (tempint == -1)
+                                {
+                                    modeladd.NoticeDeptContent += modelhistemp.F_REMARK;
+                                    modeladd.NoticeDeptAdvise += modelhistemp.F_REMARK;
+                                }
+                                else
+                                {
+                                    string[] arrystr = modelhistemp.F_REMARK.Split('|');
+
+                                    modeladd.NoticeDeptContent += arrystr[0];
+                                    modeladd.NoticeDeptContent += "\n";
+                                    modeladd.NoticeDeptAdvise += arrystr[1];
+                                    modeladd.NoticeDeptAdvise += "\n";
+                                }
+                            }
+                            dict.Add(modelhis.F_OPTBTNID.ToInt32(), "1");
+                            noticeBLL.Add(modeladd);
+                        }
 
-                    foreach (T_Wo_WorkOrderHistory modelhis in modelhisList)
+                    }
+                }
+                else
+                {
+                    T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
+                    modeladd.OrderId = modelinput.orderid;
+                    modeladd.DealAdvise = modelinput.F_SERVICETYPE;
+                    modeladd.DealResult = modelinput.F_SERVICENATURE;
+
+                    modeladd.Class1 = modelorder.F_PROVINCE;
+                    modeladd.Class2 = modelorder.F_CITY;
+                    modeladd.Class3 = modelorder.F_AREA;
+
+                    modeladd.DZNumber = DZNumber;
+                    modeladd.NoticeState = 1;
+                    modeladd.NoticeType = 1;
+                    modeladd.Userid = F_UserID;
+                    modeladd.Username = F_UserName;
+
+                    modeladd.NoticeUserid = modelorder.F_USERID.ToInt32();
+                    modeladd.NoticeUsername = modelorder.F_USERNAME;
+                    modeladd.NoticeDeptId = modelorder.F_DEPTID.ToInt32();
+                    modeladd.NoticeDeptName = modelorder.F_DEPTCODE;
+
+                    modeladd.NoticeDeptContent = modelorder.F_DEPTCODE + " 调查情况：\n";
+                    modeladd.NoticeDeptAdvise = modelorder.F_DEPTCODE + " 处理意见和整改措施：\n";
+                    if (!string.IsNullOrEmpty(modelorder.F_RETURNVISITCONTENT))
                     {
-                        if (dict.ContainsKey(modelhis.F_OPTBTNID.ToInt32()))
+                        int tempint = modelorder.F_RETURNVISITCONTENT.IndexOf("|");
+                        if (tempint == -1)
                         {
-                            continue;
+                            modeladd.NoticeDeptContent += modelorder.F_RETURNVISITCONTENT;
+                            modeladd.NoticeDeptAdvise += modelorder.F_RETURNVISITCONTENT;
                         }
+                        else
+                        {
+                            string[] arrystr = modelorder.F_RETURNVISITCONTENT.Split('|');
+
+                            modeladd.NoticeDeptContent += arrystr[0];
+                            modeladd.NoticeDeptContent += "\n";
+                            modeladd.NoticeDeptAdvise += arrystr[1];
+                            modeladd.NoticeDeptAdvise += "\n";
+                        }
+                    }
+                    noticeBLL.Add(modeladd);
+                }
+
+                #endregion
+            }
+            #region 通知 自选部门
+            if (!string.IsNullOrEmpty(modelinput.DeptIds))
+            {
+                List<T_Sys_Department> modelhisList = deptBll.GetModelList(string.Format(" F_DeptId in ({0})", modelinput.DeptIds));
+                if (modelhisList.Count > 0)
+                {
+                    foreach (T_Sys_Department modeldept in modelhisList)
+                    {
                         T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
                         modeladd.OrderId = modelinput.orderid;
                         modeladd.DealAdvise = modelinput.F_SERVICETYPE;
@@ -454,126 +561,28 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                         modeladd.Class2 = modelorder.F_CITY;
                         modeladd.Class3 = modelorder.F_AREA;
 
-
+                        modeladd.DZNumber = DZNumber + 1;
                         modeladd.NoticeState = 1;
                         modeladd.NoticeType = 1;
                         modeladd.Userid = F_UserID;
                         modeladd.Username = F_UserName;
 
-                        modeladd.NoticeUserid = modelhis.F_OPTUSERID.ToInt32();
-                        modeladd.NoticeUsername = modelhis.F_UserName;
-                        modeladd.NoticeDeptId = modelhis.F_OPTBTNID.ToInt32();
-                        modeladd.NoticeDeptName = modelhis.F_NEXTOWNERARRID;
-                        modeladd.NoticeDeptContent = modelhis.F_NEXTOWNERARRID + " 调查情况：\n";
-                        modeladd.NoticeDeptAdvise = modelhis.F_NEXTOWNERARRID + " 处理意见和整改措施：\n";
-                        foreach (T_Wo_WorkOrderHistory modelhistemp in modelhisList)
-                        {
-                            if (string.IsNullOrEmpty(modelhistemp.F_REMARK))
-                            {
-                                continue;
-                            }
-                            int tempint = modelhistemp.F_REMARK.IndexOf("|");
-                            if (tempint == -1)
-                            {
-                                modeladd.NoticeDeptContent += modelhistemp.F_REMARK;
-                                modeladd.NoticeDeptAdvise += modelhistemp.F_REMARK;
-                            }
-                            else
-                            {
-                                string[] arrystr = modelhistemp.F_REMARK.Split('|');
-
-                                modeladd.NoticeDeptContent += arrystr[0];
-                                modeladd.NoticeDeptContent += "\n";
-                                modeladd.NoticeDeptAdvise += arrystr[1];
-                                modeladd.NoticeDeptAdvise += "\n";
-                            }
-                        }
-                        dict.Add(modelhis.F_OPTBTNID.ToInt32(), "1");
+                        modeladd.NoticeUserid = 0;
+                        modeladd.NoticeUsername = "";
+                        modeladd.NoticeDeptId = modeldept.F_DeptId;
+                        modeladd.NoticeDeptName = modeldept.F_DeptName;
+                        modeladd.NoticeDeptContent = "";
+                        modeladd.NoticeDeptAdvise = "";
+                        //modeladd.NoticeDeptContent = modelhis.F_NEXTOWNERARRID + " 调查情况：\n";
+                        //modeladd.NoticeDeptAdvise = modelhis.F_NEXTOWNERARRID + " 处理意见和整改措施：\n";
                         noticeBLL.Add(modeladd);
                     }
 
                 }
             }
-            else
-            {
-                T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
-                modeladd.OrderId = modelinput.orderid;
-                modeladd.DealAdvise = modelinput.F_SERVICETYPE;
-                modeladd.DealResult = modelinput.F_SERVICENATURE;
-
-                modeladd.Class1 = modelorder.F_PROVINCE;
-                modeladd.Class2 = modelorder.F_CITY;
-                modeladd.Class3 = modelorder.F_AREA;
-
-
-                modeladd.NoticeState = 1;
-                modeladd.NoticeType = 1;
-                modeladd.Userid = F_UserID;
-                modeladd.Username = F_UserName;
-
-                modeladd.NoticeUserid = modelorder.F_USERID.ToInt32();
-                modeladd.NoticeUsername = modelorder.F_USERNAME;
-                modeladd.NoticeDeptId = modelorder.F_DEPTID.ToInt32();
-                modeladd.NoticeDeptName = modelorder.F_DEPTCODE;
-
-                modeladd.NoticeDeptContent = modelorder.F_DEPTCODE + " 调查情况：\n";
-                modeladd.NoticeDeptAdvise = modelorder.F_DEPTCODE + " 处理意见和整改措施：\n";
-                if (!string.IsNullOrEmpty(modelorder.F_RETURNVISITCONTENT))
-                {
-                    int tempint = modelorder.F_RETURNVISITCONTENT.IndexOf("|");
-                    if (tempint == -1)
-                    {
-                        modeladd.NoticeDeptContent += modelorder.F_RETURNVISITCONTENT;
-                        modeladd.NoticeDeptAdvise += modelorder.F_RETURNVISITCONTENT;
-                    }
-                    else
-                    {
-                        string[] arrystr = modelorder.F_RETURNVISITCONTENT.Split('|');
-
-                        modeladd.NoticeDeptContent += arrystr[0];
-                        modeladd.NoticeDeptContent += "\n";
-                        modeladd.NoticeDeptAdvise += arrystr[1];
-                        modeladd.NoticeDeptAdvise += "\n";
-                    }
-                }
-                noticeBLL.Add(modeladd);
-            }
 
             #endregion
-            //if (modelinput.Noticelist != null && modelinput.Noticelist.Count > 0)
-            //{
-            //    noticeBLL.updatenum(modelinput.orderid);
-            //    foreach (T_Wo_WorkOrderNotice model in modelinput.Noticelist)
-            //    {
-            //        T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
-
-            //        #region 前端传入参数
-            //        modeladd.OrderId = modelinput.orderid;
-            //        modeladd.DealAdvise = model.DealAdvise;
-            //        modeladd.DealResult = model.DealResult;
-            //        modeladd.NoticeDeptId = model.NoticeDeptId;
-            //        modeladd.NoticeDeptName = model.NoticeDeptName;
-            //        modeladd.Class1 = modelorder.F_PROVINCE;
-            //        modeladd.Class2 = modelorder.F_CITY;
-            //        modeladd.Class3 = modelorder.F_AREA;
-            //        #endregion
-
-            //        modeladd.NoticeState = 1;
-            //        modeladd.NoticeType = 1;
-            //        modeladd.Userid = F_UserID;
-            //        modeladd.Username = F_UserName;
-            //        List<T_Wo_WorkOrderHistory> modelhisList = historyBll.GetModelList(string.Format(" F_INSTANCEID={0} AND F_OPTBTNID={1}", modeladd.OrderId, model.NoticeDeptId));
-            //        foreach (T_Wo_WorkOrderHistory modelhis in modelhisList)
-            //        {
-            //            modeladd.NoticeDeptContent += modelhis.F_REMARK;
-            //            modeladd.NoticeDeptAdvise += modelhis.F_REMARK;
-            //            modeladd.NoticeUserid = modelhis.F_OPTUSERID.ToInt32();
-            //            modeladd.NoticeUsername = modelhis.F_UserName;
-            //        }
-            //        noticeBLL.Add(modeladd);
 
-            //    }
-            //}
             AddAction("t_wo_workorderbase", modelorder.F_WORKORDERID.ToMyString(), "提交定责工单", modelorder.F_CODE);
             AddAction("t_wo_workorderbase", modelorder.F_WORKORDERID.ToMyString(), "提交定责工单", "数据：" + JsonConvert.SerializeObject(modelorder), "关键信息");
             return orderBLL.UpdateDZClass(modelorder);
@@ -751,59 +760,59 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             return View(model);
         }
 
-        /// <summary>
-        /// 录入定责结果
-        /// </summary>
-        /// <param name="workOrderBaseModel"></param>
-        /// <returns></returns>
-        [AcceptVerbs(HttpVerbs.Post)]
-        public bool SubmitOrderDZ1(T_Wo_WorkOrderNoticeInput modelinput)
-        {
-            if (modelinput.orderid == 0)
-            {
-                return false;
-            }
-            #region 处理工单事件分类
-            Model.T_Wo_WorkOrderBase modelorder = new T_Wo_WorkOrderBase();
-            modelorder.F_WORKORDERID = modelinput.orderid;
-            modelorder.F_PROVINCE = modelinput.ClassName1;
-            modelorder.F_CITY = modelinput.ClassName2;
-            modelorder.F_AREA = modelinput.ClassName3;
-            #endregion
-            if (modelinput.Noticelist != null)
-            {
-                noticeBLL.updatenum(modelinput.orderid);
-                foreach (T_Wo_WorkOrderNotice model in modelinput.Noticelist)
-                {
-                    T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
-
-                    #region 前端传入参数
-                    modeladd.OrderId = modelinput.orderid;
-                    modeladd.DealAdvise = model.DealAdvise;
-                    modeladd.DealResult = model.DealResult;
-                    modeladd.NoticeDeptId = model.NoticeDeptId;
-                    modeladd.NoticeDeptName = model.NoticeDeptName;
-
-                    #endregion
-
-                    modeladd.NoticeState = 1;
-                    modeladd.NoticeType = 1;
-                    modeladd.Userid = F_UserID;
-                    modeladd.Username = F_UserName;
-                    List<T_Wo_WorkOrderHistory> modelhisList = historyBll.GetModelList(string.Format(" F_INSTANCEID={0} AND F_OPTBTNID={1}", model.OrderId, model.NoticeDeptId));
-                    foreach (T_Wo_WorkOrderHistory modelhis in modelhisList)
-                    {
-                        modeladd.NoticeDeptContent += modelhis.F_REMARK;
-                        modeladd.NoticeDeptAdvise += modelhis.F_REMARK;
-                        modeladd.NoticeUserid = modelhis.F_OPTUSERID.ToInt32();
-                        modeladd.NoticeUsername = modelhis.F_UserName;
-                    }
-                    noticeBLL.Add(modeladd);
-
-                }
-            }
-            return orderBLL.UpdateDZClass(modelorder);
-        }
+        ///// <summary>
+        ///// 录入定责结果
+        ///// </summary>
+        ///// <param name="workOrderBaseModel"></param>
+        ///// <returns></returns>
+        //[AcceptVerbs(HttpVerbs.Post)]
+        //public bool SubmitOrderDZ1(T_Wo_WorkOrderNoticeInput modelinput)
+        //{
+        //    if (modelinput.orderid == 0)
+        //    {
+        //        return false;
+        //    }
+        //    #region 处理工单事件分类
+        //    Model.T_Wo_WorkOrderBase modelorder = new T_Wo_WorkOrderBase();
+        //    modelorder.F_WORKORDERID = modelinput.orderid;
+        //    modelorder.F_PROVINCE = modelinput.ClassName1;
+        //    modelorder.F_CITY = modelinput.ClassName2;
+        //    modelorder.F_AREA = modelinput.ClassName3;
+        //    #endregion
+        //    if (modelinput.Noticelist != null)
+        //    {
+        //        noticeBLL.updatenum(modelinput.orderid);
+        //        foreach (T_Wo_WorkOrderNotice model in modelinput.Noticelist)
+        //        {
+        //            T_Wo_WorkOrderNotice modeladd = new T_Wo_WorkOrderNotice();
+
+        //            #region 前端传入参数
+        //            modeladd.OrderId = modelinput.orderid;
+        //            modeladd.DealAdvise = model.DealAdvise;
+        //            modeladd.DealResult = model.DealResult;
+        //            modeladd.NoticeDeptId = model.NoticeDeptId;
+        //            modeladd.NoticeDeptName = model.NoticeDeptName;
+
+        //            #endregion
+
+        //            modeladd.NoticeState = 1;
+        //            modeladd.NoticeType = 1;
+        //            modeladd.Userid = F_UserID;
+        //            modeladd.Username = F_UserName;
+        //            List<T_Wo_WorkOrderHistory> modelhisList = historyBll.GetModelList(string.Format(" F_INSTANCEID={0} AND F_OPTBTNID={1}", model.OrderId, model.NoticeDeptId));
+        //            foreach (T_Wo_WorkOrderHistory modelhis in modelhisList)
+        //            {
+        //                modeladd.NoticeDeptContent += modelhis.F_REMARK;
+        //                modeladd.NoticeDeptAdvise += modelhis.F_REMARK;
+        //                modeladd.NoticeUserid = modelhis.F_OPTUSERID.ToInt32();
+        //                modeladd.NoticeUsername = modelhis.F_UserName;
+        //            }
+        //            noticeBLL.Add(modeladd);
+
+        //        }
+        //    }
+        //    return orderBLL.UpdateDZClass(modelorder);
+        //}
 
 
         /// <summary>
@@ -1153,7 +1162,12 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             //F_REPAIRMANID 接入渠道 1语音 2留言  3微信 4微博 FromType
             //string sql = string.Format(" and F_WORKORDERTYPEID=1 and F_WORKORDERSTATEID=1 and F_WORKORDERID in (select F_INSTANCEID from T_Wo_WorkOrderHistory where F_WORKORDERSTATEID=0 and F_OPTUSERID={0})", F_UserID);
 
-            string sql = " and F_WORKORDERTYPEID=3 and F_WORKORDERSTATEID in (2,5) ";
+            string sql = string.Format(" and F_WORKORDERTYPEID=3 and F_WORKORDERSTATEID in (2,5) and T2.NoticeDeptId={0} AND NoticeType={1} AND  NoticeState=1", F_DeptId, NoticeType);
+            if (NoticeType == 1)
+            {
+                sql = string.Format(" and F_HOUSING='投诉'  and F_WORKORDERSTATEID=5 and T2.NoticeDeptId={0} AND NoticeType={1} AND  NoticeState=1", F_DeptId, NoticeType);
+            }
+
 
             //工单编号
             if (!string.IsNullOrEmpty(workorderNum))
@@ -1237,17 +1251,16 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             DataTable dt = new DataTable();
             int recordCount = 0;
             Model.PageData<Model.T_Wo_WorkOrderBase> pageModel = new Model.PageData<Model.T_Wo_WorkOrderBase>();
-            dt = BLL.PagerBLL.GetListPager(
-                string.Format(" T_Wo_WorkOrderBase T1 Inner join T_Wo_WorkOrderNotice T2 On T1.F_WORKORDERID=T2.OrderId AND T2.NoticeDeptId={0} AND NoticeType={1} AND  NoticeState=1", F_DeptId, NoticeType),
+            dt = BLL.PagerBLL.GetTableList(
+                " T_Wo_WorkOrderBase T1 Inner join T_Wo_WorkOrderNotice T2 On T1.F_WORKORDERID=T2.OrderId  ",
                 "F_WORKORDERID",
-              "*,CONVERT(varchar,F_CREATEDATE, 120 ) as F_CREATEDATENew,NoticeDeptId,NoticeDeptName"
+              "T1.*,CONVERT(varchar,F_CREATEDATE, 120 ) as F_CREATEDATENew,NoticeDeptId,NoticeDeptName"
               + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
                 //+ " ,(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END ) as FilePath",
                 sql,
-                "ORDER BY F_CREATEDATE desc",
+                " F_CREATEDATE desc",
                 limit,
                 page,
-                true,
                 out recordCount);
 
 
@@ -1838,64 +1851,64 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             //工单编号
             if (!string.IsNullOrEmpty(paramModel.workorderNum))
             {
-                sql += " and t.F_CODE like '%" + paramModel.workorderNum.Trim() + "%'";
+                sql += " and F_CODE like '%" + paramModel.workorderNum.Trim() + "%'";
             }
             //客户姓名
             if (!string.IsNullOrEmpty(paramModel.cusName))
             {
-                sql += " and t.F_CUSTOMERNAME like '%" + paramModel.cusName.Trim() + "%'";
+                sql += " and F_CUSTOMERNAME like '%" + paramModel.cusName.Trim() + "%'";
             }
             //客户电话
             if (!string.IsNullOrEmpty(paramModel.phoneNumber))
             {
-                sql += " and t.F_CUSTOMERTELEPHONE like '%" + paramModel.phoneNumber.Trim() + "%'";
+                sql += " and F_CUSTOMERTELEPHONE like '%" + paramModel.phoneNumber.Trim() + "%'";
             }
-            
+
             //坐席工号
             if (!string.IsNullOrEmpty(paramModel.userInfo))
             {
-                sql += " and t.F_LINKMAN like '%" + paramModel.userInfo.Trim() + "%'";
+                sql += " and F_LINKMAN like '%" + paramModel.userInfo.Trim() + "%'";
             }
             //状态
             if (paramModel.status != null)
             {
-                sql += " and t.F_WORKORDERSTATEID =" + paramModel.status;
+                sql += " and F_WORKORDERSTATEID =" + paramModel.status;
             }
             //业务类别
             if (paramModel.bussType != null && paramModel.bussType > 0)
             {
-                sql += " and t.F_FILEFLAG =" + paramModel.bussType;
+                sql += " and F_FILEFLAG =" + paramModel.bussType;
             }
             //业务类型
             if (paramModel.detailType != null && paramModel.detailType > 0)
             {
-                sql += " and t.F_REPAIRLEVEL =" + paramModel.detailType;
+                sql += " and F_REPAIRLEVEL =" + paramModel.detailType;
             }
             //内容
             if (!string.IsNullOrEmpty(paramModel.Content))
             {
-                sql += " and t.F_CONTENT like '%" + paramModel.Content.Trim() + "%'";
+                sql += " and F_CONTENT like '%" + paramModel.Content.Trim() + "%'";
             }
             //处理方式
             if (paramModel.GoType != null && paramModel.GoType > 0)
             {
-                sql += " and t.F_WORKORDERTYPEID =" + paramModel.GoType;
+                sql += " and F_WORKORDERTYPEID =" + paramModel.GoType;
             }
             //渠道
             if (paramModel.FromType != null && paramModel.FromType > 0)
             {
-                sql += " and t.F_REPAIRMANID =" + paramModel.FromType;
+                sql += " and F_REPAIRMANID =" + paramModel.FromType;
             }
             //处理方式
             if (paramModel.F_HASTENCOUNTS != null && paramModel.F_HASTENCOUNTS > -1)
             {
                 if (paramModel.F_HASTENCOUNTS == 0)
                 {
-                    sql += " and t.F_HASTENCOUNTS =0";
+                    sql += " and F_HASTENCOUNTS =0";
                 }
                 else
                 {
-                    sql += " and t.F_HASTENCOUNTS >0";
+                    sql += " and F_HASTENCOUNTS >0";
                 }
 
             }
@@ -1914,18 +1927,18 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
                 string startDate = paramModel.dateParty.Substring(0, 10);
                 string endDate = paramModel.dateParty.Substring(12);
-                sql += " and t.F_CREATEDATE>= '" + startDate + " 00:00:00" + "'";
-                sql += " and t.F_CREATEDATE<= '" + endDate + " 23:59:59" + "'";
+                sql += " and F_CREATEDATE>= '" + startDate + " 00:00:00" + "'";
+                sql += " and F_CREATEDATE<= '" + endDate + " 23:59:59" + "'";
 
             }
             else
             {
                 string endDate = DateTime.Now.ToString("yyyy-MM-dd");
                 string startDate = DateTime.Now.ToString("yyyy-MM-dd");
-                sql += " and t.F_CREATEDATE>= '" + startDate + " 00:00:00" + "'";
-                sql += " and t.F_CREATEDATE<= '" + endDate + " 23:59:59" + "'";
+                sql += " and F_CREATEDATE>= '" + startDate + " 00:00:00" + "'";
+                sql += " and F_CREATEDATE<= '" + endDate + " 23:59:59" + "'";
             }
-            
+
 
 
 
@@ -1935,70 +1948,133 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             dt = BLL.PagerBLL.GetListPager(
                 "T_Wo_WorkOrderBase",
                 " F_WORKORDERID",
-                " 0 as 序号"
-                 + ", F_CODE as 工单编号"
-                 + ", F_UserName as 受理人"
-                   + ",CONVERT(varchar,  F_CREATEDATE, 120) as 受理时间"
-                     + ", F_WORKORDERFROM as 事件来源"
-                          + ", F_RETURNVISITPROBLEM as 事件概况"
-                               + ", F_PROVINCE as 一级内容分类"
-                                  + " ,  F_CITY as 二级内容分类"
-                                    + ",  F_AREA as 三级内容分类"
-                                         + ", '' as 责任部门"
-                                           + ", '' as 责任部门调查情况"
-                                           + ", '' as 责任部门处理意见和整改措施"
-                                            + ", F_SERVICETYPE as 计划经营部处理意见"
-                                             + ", F_SERVICENATURE as 定性定责结果"
-                                               + ",case when F_WORKORDERSTATEID=0 then '未处理' when F_WORKORDERSTATEID=1 then '处理中' else '已处理' END AS 办理状态"
-                                                 + " ,'-' as 风险点"
-                                                   + ",'-' as 风险等级"
-                                                     + ",'-' as 风险概率"
-                                                       + ",'-' as 风险评估 "
-
+                " F_WORKORDERID as 序号"
+                + ", F_CODE as 工单编号"
+                + ", F_UserName as 受理人"
+                + ",CONVERT(varchar,  F_CREATEDATE, 120) as 受理时间"
+                + ", F_WORKORDERFROM as 事件来源"
+                + ", F_RETURNVISITPROBLEM as 事件概况"
+                + ", F_PROVINCE as 一级内容分类"
+                + " ,  F_CITY as 二级内容分类"
+                + ",  F_AREA as 三级内容分类"
+                + ", '' as 责任部门"
+                + ", '' as 责任部门调查情况"
+                + ", '' as 责任部门处理意见和整改措施"
+                + ", F_SERVICETYPE as 计划经营部处理意见"
+                + ", F_SERVICENATURE as 定性定责结果"
+                + ",case when F_WORKORDERSTATEID=0 then '未处理' when F_WORKORDERSTATEID=1 then '处理中' else '已处理' END AS 办理状态"
+                + " ,'-' as 风险点"
+                + ",'-' as 风险等级"
+                + ",'-' as 风险概率"
+                + ",'-' as 风险评估"
+                + ",F_WORKORDERTYPEID,F_RETURNVISITCONTENT"
                 ,
                 sql,
-                "ORDER BY t.F_CREATEDATE desc",
+                "ORDER BY F_CREATEDATE desc",
                 100000,
                 1,
                 true,
                 out recordCount);
 
-
+            #region 通知  定责相关处理部门
+           
+           
+            #endregion
             if (recordCount > 0)
             {
-                string tempCode = "";
                 int tempn = 0;
                 foreach (DataRow dr in dt.Rows)
                 {
-                    //if (tempCode != dr["工单编号"].ToMyString())
-                    //{
-                    //    tempn += 1;
-                    //}
-                    tempn += 1;
-                    List<T_Wo_WorkOrderNotice> modellist=  noticeBLL.GetModelList(string.Format(" orderid={0} and NoticeType=1 AND  NoticeState=1", dr["F_WORKORDERID"].ToInt32()));
                     string temp1 = "";
                     string temp2 = "";
                     string temp3 = "";
-                    if (modellist.Count > 0)
+
+                    #region 责任部门
+
+                    List<T_Wo_WorkOrderNotice> modellistnotice = noticeBLL.GetModelList(string.Format(" orderid={0} and NoticeType=1 AND  NoticeState=1", dr["序号"].ToInt32()));
+                    if (modellistnotice.Count > 0)
                     {
-                        foreach (T_Wo_WorkOrderNotice modelnotice in modellist)
+                        foreach (T_Wo_WorkOrderNotice modelnotice in modellistnotice)
                         {
-                            temp1 += modelnotice.NoticeDeptName;
-                            temp2 += modelnotice.NoticeDeptContent;
-                            temp3 += modelnotice.NoticeDeptAdvise;
+                            temp1 += modelnotice.NoticeDeptName + "\n";
                         }
-                        
+                    }
+                    dr["责任部门"] = temp1;
+                    #endregion
 
-                        dr["责任部门"] = temp1;
-                        dr["责任部门调查情况"] = temp2;
-                        dr["责任部门处理意见和整改措施"] = temp3;
+                    if (dr["F_WORKORDERTYPEID"].ToInt32() == 1)
+                    {
+                        List<T_Wo_WorkOrderHistory> modelhisList = historyBll.GetModelList(string.Format(" F_INSTANCEID={0}", dr["序号"].ToInt32()));
+                        if (modelhisList.Count > 0)
+                        {
+                            foreach (T_Wo_WorkOrderHistory modelhistemp in modelhisList)
+                            {
+                                temp2 += modelhistemp.F_NEXTOWNERARRID + " 调查情况：\n";
+                                temp3 += modelhistemp.F_NEXTOWNERARRID + " 处理意见和整改措施：\n";
+                          
+                                if (string.IsNullOrEmpty(modelhistemp.F_REMARK))
+                                {
+                                    continue;
+                                }
+                                int tempint = modelhistemp.F_REMARK.IndexOf("|");
+                                if (tempint == -1)
+                                {
+                                    temp2 += modelhistemp.F_REMARK;
+                                    temp3 += modelhistemp.F_REMARK;
+                                }
+                                else
+                                {
+                                    string[] arrystr = modelhistemp.F_REMARK.Split('|');
+
+                                    temp2 += arrystr[0];
+                                    temp2 += "\n";
+                                    temp3 += arrystr[1];
+                                    temp3 += "\n";
+                                }                                
+                            }
+                        }
+                    }
+                    else
+                    {
+                        temp2 += dr["F_RETURNVISITCONTENT"].ToMyString();
+                        temp3 += "客服即时处理工单";
+                        //if (!string.IsNullOrEmpty(dr["F_RETURNVISITCONTENT"].ToMyString()))
+                        //{
+                        //    int tempint = dr["F_RETURNVISITCONTENT"].ToMyString().IndexOf("|");
+                        //    if (tempint == -1)
+                        //    {
+                        //        temp2 += dr["F_RETURNVISITCONTENT"].ToMyString();
+                        //        temp3 += dr["F_RETURNVISITCONTENT"].ToMyString();
+                        //    }
+                        //    else
+                        //    {
+                        //        string[] arrystr = dr["F_RETURNVISITCONTENT"].ToMyString().Split('|');
+
+                        //        temp2 += arrystr[0];
+                        //        temp2 += "\n";
+                        //        temp3 += arrystr[1];
+                        //        temp3 += "\n";
+                        //    }
+                        //}
                     }
 
+                    dr["责任部门调查情况"] = temp2;
+                    dr["责任部门处理意见和整改措施"] = temp3;
+
+                    tempn += 1;
                     dr["序号"] = tempn;
                     //tempCode = dr["工单编号"].ToMyString();
                 }
             }
 
+            DataTable dataTable = dt.Copy();
+            foreach (DataColumn dc in dataTable.Columns)
+            {
+                if (dc.ColumnName.Equals("F_RETURNVISITCONTENT"))
+                    dt.Columns.Remove(dc.ColumnName);
+                if (dc.ColumnName.Equals("F_WORKORDERTYPEID"))
+                    dt.Columns.Remove(dc.ColumnName);
+            }
             ResponseDataModel NewData = new ResponseDataModel();
 
             ExcelReadWrite erw = new ExcelReadWrite();

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/WXInterFaceController.cs

@@ -521,7 +521,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 if (workOrderBaseModel.F_WORKORDERID == 0)
                 { 
                     workOrderBaseModel.F_CREATEDATE = DateTime.Now;
-                    bl =orderBLL.AddWbgd(workOrderBaseModel); 
+                    bl =orderBLL.AddWbgd(workOrderBaseModel)>0; 
                 }
                 else
                 {