微信工单，回访

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -306,6 +306,17 @@ namespace CallCenterApi.Interface.Controllers.customer
                             Input1.F_BranchName = pdModel1.F_DeptName.ToString();
                         }
                     }
+                    if (!string .IsNullOrEmpty (model[i].F_Gender) )
+                    {
+                        if (model[i].F_Gender=="1")
+                        {
+                            Input1.F_Gender = "男";
+                        }
+                        else
+                        {
+                            Input1.F_Gender = "女";
+                        }
+                    }
                     Input1.F_Salesman = model[i].F_Salesman;//业务员
                     Input1.F_SalesPhone = model[i].F_SalesPhone;//业务员电话
                     Input1.F_CustomerNature = model[i].F_CustomerNature;//客户性质
@@ -363,6 +374,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             #region 基本字段
             model.F_AreaID = input.F_AreaID;//大区ID
             model.F_BranchID = input.F_BranchID;//分公司ID
+            model.F_Gender = input.F_Gender ;//分公司ID
             model.F_Salesman = input.F_Salesman;//业务员
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话
             model.F_CustomerNature = input.F_CustomerNature;//客户性质
@@ -566,7 +578,19 @@ namespace CallCenterApi.Interface.Controllers.customer
                                 dModel.F_Channel = dr["渠道类型"].ToString();
                                 dModel.F_Credit = dr["信用等级"].ToString();
                                 dModel.F_Legal = dr["法人"].ToString();
-                                dModel.F_LegalPhone = dr["法人电话"].ToString();
+                                    if (!string.IsNullOrEmpty(dr["性别"].ToString()))
+                                    {
+                                        if (dr["性别"].ToString() == "女")
+                                        {
+                                            dModel.F_Gender = "2";
+                                        }
+                                        else
+                                        {
+                                            dModel.F_Gender = "1";
+                                        }
+                                    }
+                                   
+                                    dModel.F_LegalPhone = dr["法人电话"].ToString();
                                 dModel.F_AddressProvince = dr["省"].ToString();
                                 dModel.F_AddressCity = dr["市"].ToString();
                                 dModel.F_AddressCountry = dr["县"].ToString();

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

@@ -74,13 +74,64 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 switch (state)
                 {
                     case 0://待指派的
-                        if (ro.F_RoleCode == "YWY" ||  ro.F_RoleCode == "JDYPTZX" )
+                        if (ro.F_RoleCode == "GC"   )
                         {
-                            sql += $" and F_DealBy like '%" + ua.F_UserCode + "%'";
+                            sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
                         }
+                        else if (ro.F_RoleCode == "JDYPTZX"|| ro.F_RoleCode == "JDYBZZX")
+                        {
+                            uwhere="";
+                        }
+                        #region 获取部门工单列表
+                        else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                        {
+                            string detpid = "";
+                            var deparmentlist = new List<Model.T_Sys_Department>();
+                            Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                            if (dModel != null)
+                            {
+                                if (dModel.F_Layer == 1)
+                                {
+                                    deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                    if (deparmentlist.Count > 0)
+                                    {
+                                        foreach (var it in deparmentlist)
+                                        {
+                                            if (detpid != "")
+                                            {
+                                                detpid += "," + it.F_DeptId;
+                                            }
+                                            else
+                                            {
+                                                detpid = "" + it.F_DeptId; ;
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    detpid = ua.F_DeptId.ToString();
+                                }
+                                if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "") != "")
+                                {
+                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "") + ") "; ;
+                                }
+                                else
+                                {
+
+                                    return Success("暂无工单"); ;
+                                }
+
+                            }
+                            else
+                            {
+                                return Error("加载失败");
+                            }
+                        }
+                        #endregion
                         else
                         {
-                            uwhere = "";
+                            sql += $" and F_CreateBy like '%" + ua.F_UserCode + "%'";;
                         }
                         sql += $" and F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign +")"+ " " + uwhere;
                     //    sql +=  "and T_Wo_WorkOrder.F_ID in (" + GetBackWorkOrderID(ua.F_UserCode) + ") ";
@@ -106,6 +157,84 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     case 3://我参与的
                         sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
                         break;
+                    case 4://待回访
+                        if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
+                        {
+                            uwhere = "";
+                        }
+                        else
+                        {
+                            return Success("无操作权限"); ;
+                        }
+                        sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" +"1" +"' "+ uwhere; ;
+                        break;
+                    case 6://已回访
+                        if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
+                        {
+                            sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
+                        }
+                        else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                        {
+                            string detpid = "";
+                            var deparmentlist = new List<Model.T_Sys_Department>();
+                            Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                            if (dModel != null)
+                            {
+                                if (dModel.F_Layer == 1)
+                                {
+                                    deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                    if (deparmentlist.Count > 0)
+                                    {
+                                        foreach (var it in deparmentlist)
+                                        {
+                                            if (detpid != "")
+                                            {
+                                                detpid += "," + it.F_DeptId;
+                                            }
+                                            else
+                                            {
+                                                detpid = "" + it.F_DeptId; ;
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    detpid = ua.F_DeptId.ToString();
+                                }
+                                if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") != "")
+                                {
+                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") + ") "; ;
+                                }
+                                else
+                                {
+
+                                    return Success("暂无工单"); ;
+                                }
+
+                            }
+                            else
+                            {
+                                return Error("加载失败");
+                            }
+                        }
+                        else
+                        {
+                            return Success("无操作权限"); ;
+                        }
+                        sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate ;
+                        break;
+                    case 7://待完结
+                        if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
+                        {
+                            uwhere = ""; ;
+                        }
+                        else
+                        {
+                            return Success("无操作权限"); ;
+                        }
+                        sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "0" + "' "; ;
+                        break;
                 }
                 #endregion
                 int recordCount = 0;
@@ -148,99 +277,30 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("无操作权限！");
             }
             #region 
-            // if (ro.F_RoleCode  == "JDYPTZX" || ro.F_RoleCode == "YWY" )
-            // {
-
-            //     if (modlelist.Count >0)
-            //     {
-            //         foreach (var it in modlelist)
-            //         {
-            //             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + it.F_ID  + "' order by F_CreateTime desc").FirstOrDefault();
-            //             if (itemlast != null)
-
-            //             if (it.F_DealBy == ua.F_UserCode)
-            //             {
-            //                 list.Add(it);
-            //                 total++;
-            //             }
-            //         }
-            //     }
-
-            // }
-            //else  if (ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
-            // { 
-            //     List<int> detpid = new List<int>();
-            //     var deparmentlist = new List<Model.T_Sys_Department>();
-            //     Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
-            //     if (dModel != null)
-            //     {
-
-            //         if (dModel.F_Layer == 1)
-            //         {
-            //             deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
-            //             if (deparmentlist.Count > 0)
-            //             {
-            //                 foreach (var it in deparmentlist)
-            //                 {
-            //                     detpid.Add(it.F_DeptId);
-
-            //                 }
-            //             }
-            //         }
-            //         detpid.Add(dModel.F_DeptId);
-            //         var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' " + " ");
-            //         if (itemlast.Count > 0)
-            //         {
-            //             foreach (var it in itemlast)
-            //             {
-            //                 for (int i = 0; i < detpid.Count; i++)
-            //                 {
-            //                     if (it.F_NextDept == detpid[i])
-            //                     {
-            //                         woid.Add(it.F_WoID);
-            //                     }
-            //                 }
-            //             }
-            //         }
-            //         if (modlelist.Count >0 && woid.Count > 0)
-            //         {
-            //             foreach (var it in modlelist)
-            //             {
-            //                 for (int i = 0; i < woid.Count; i++)
-            //                 {
-            //                     if (it.F_ID == woid[i])
-            //                     {
-            //                         list.Add(it);
-            //                         total++;
-            //                     }
-            //                 }
-            //             }
-            //         }
-
-            //     }
-            //     else
-            //     {
-            //         return Error("加载失败");
-            //     }
-            // }
-            // else if (ro.F_RoleCode == "QTJS")
-            // {
-            //     return Error("无操作权限！");
-            // }
-            // else
-            // {
-            //     if (modlelist.Count > 0 )
-            //     {
-            //         foreach (var it in modlelist)
-            //         {
-            //            list.Add(it);
-            //             total++;
-            //         }
-            //     }
-            // }
             #endregion
 
         }
+        public ActionResult ExportVisitList(string []ids)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                DataTable dt = new DataTable();
+                string sql = $" and F_IsDelete=0";
+                sql += " and T_Wo_WorkOrder.F_ID in ( " + ids + ")) ";
+                NPOIHelper npoi = new NPOIHelper();
+                if (npoi.ExportToExcel("工单列表", dt) == "")
+                {
+                    return Success("导出成功");
+                }
+                else
+                {
+                    return Error("导出失败");
+
+                }
+            }
+            return Error("无操作权限");
+        }
         /// <summary>
         /// 获取异常
         /// </summary>
@@ -283,20 +343,47 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             return str;
         }
+  
         /// <summary>
         /// 根据部门获取工单号
         /// </summary>
         /// <returns></returns>
-        public string GetDeptWorkOrderID(string user)
+        public string GetDeptWorkOrderID(string user,string F_ItemType)
         {
+            string sql = " ";
+            string ua = "";
+            DataTable dt = new DataTable();
+            if (user != "")
+            {
+                sql += " and F_DeptId in ( "+ user + ") ";
+            }
+            int recordCount;
+            dt = BLL.PagerBLL.GetListPager(
+                                     "T_Sys_UserAccount",
+                                     "F_UserId",
+                                     "*",
+                                     sql,
+                                     "ORDER BY F_UserId desc",
+                                      10000,
+                                      1,
+                                     true,
+                                     out recordCount);
+            List<Model.UserAccount> modelList = new BLL.UserAccount().DataTableToList(dt);
+            if (modelList!=null )
+            {
+                foreach (var it in modelList)
+                {
+                    if (ua != "")
+                        ua += "," + it.F_UserCode;
+                    else
+                        ua += it.F_UserCode;
+                }
+            }
             string str = string.Empty;
-           
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType in(" + (int)EnumItemType.deal + "," + (int)EnumItemType.urge + ")"
-                + " and "
-                    + "F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")"+ " and  "
-                     + "F_NextDept in(" + user+ ")"
-                + " and isnull(F_IsUsed,'0')='0' ";
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_OptType in(" + F_ItemType + ")"
+                + " and  "
+                     + "F_CreateUser in(" + ua + ")"
+               ;
 
             return str;
         }
@@ -434,7 +521,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 筛选条件
                 if (type > 0 && type < 5)//工单类型
                     sql += $" and F_Type=" + type;
-              if (state >= 0)//工单状态
+              if (state >= 0)//
                    sql += $" and F_State=" + state;
                 if (source > 0)//工单来源
                     sql += $" and F_Source=" + source;
@@ -499,15 +586,37 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             detpid = ua.F_DeptId.ToString();
                         }
-                        if (GetDeptWorkOrderID(detpid) != "")
+                        if (state>=0)
                         {
-                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
+                            if (GetDeptWorkOrderID(detpid,""+state+"" ) != "")
+                            {
+
+                                sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + state + "") + ") ";
+                            }
+                            else
+                            {
+
+                                return Success("暂无工单"); ;
+                            }
                         }
                         else
                         {
+                            if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
+                (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback+ "," + (int)EnumWorkOrderState.finish
+                + "," + (int)EnumWorkOrderState.evaluate+"") != "")
+                            {
 
-                            return Success("暂无工单"); ;
+                                sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
+                (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish
+                + "," + (int)EnumWorkOrderState.evaluate + "") + ") ";
+                            }
+                            else
+                            {
+
+                                return Success("暂无工单"); ;
+                            }
                         }
+                      
                     }
                     else
                     {
@@ -632,9 +741,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             detpid = ua.F_DeptId.ToString ();
                         }
-                        if (GetDeptWorkOrderID(detpid) != "")
+                        if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.dealing + ", " + (int)EnumWorkOrderState.receive + "," +
+                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "") != "")
                         {
-                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
+                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "") + ") "; ;
                         }
                         else
                         {
@@ -1079,8 +1190,35 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 添加验证判断
                 if (!(input.F_Type> 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
-                if (input .F_State ==2&&!vaBatchNumber(input .F_BatchNumber ))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
+                {
                     return Error("请输入正确的工单批次号！");
+                }
+                else
+                {
+                    if (!string.IsNullOrEmpty(input.F_BatchNumber))
+                    {
+                        var prono = input.F_BatchNumber.Substring(0, 6);
+                        try
+                        {
+                            var pronos = DateTime.ParseExact(prono, "yyMMdd", null).ToString("yyyy-MM-dd");
+                            var protime = Convert.ToDateTime(pronos);
+                            if (DateTime.Parse(pronos) > DateTime.Now)
+                            {
+                                return Error("工单批次号错误，生产日期不能大于当前时间！");
+                            }
+
+                        }
+                        catch
+                        {
+                            return Error("工单批次号错误，日期格式错误！");
+                        }
+                    }
+                }
+                if (input.F_CustomerID > 0 && !valcode(input.F_CustomerID.ToString(), 10))
+                    return Error("客户编号为10为纯数字！");
+                if (input.F_MaterialID > 0 && !valcode(input.F_CustomerID.ToString(), 11))
+                    return Error("物料编码为11为纯数字！");
                 #endregion
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
@@ -1096,6 +1234,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         deptname = deptmodel.F_DeptName + "-";
                     }
+                    DataTable dt = new DataTable();
+                    dt = new BLL.T_Wo_WorkOrder().GetList(1, "", "F_ID desc").Tables[0];
+                    List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
+                    AddLog(modlelist[0].F_ID, modlelist[0].F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                     return Success("添加成功！");
 
                 }
@@ -1178,26 +1320,35 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("参数错误！");
                 if (!(input.F_Type> 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
-                if (input.F_State== 2 && !vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
+                {
                     return Error("请输入正确的工单批次号！");
-                if (input.F_Type == 1 || input.F_Type == 3)
+                }
+                else
                 {
-                    if (input.F_CustomerID > 0)
+                    if (!string.IsNullOrEmpty(input.F_BatchNumber))
                     {
-                        if (!valcode(input.F_CustomerID.ToString(), 10))
+                        var prono = input.F_BatchNumber.Substring(0, 6);
+                        try
                         {
-                            return Error("客户编号为10为纯数字！");
+                            var pronos = DateTime.ParseExact(prono, "yyMMdd", null).ToString("yyyy-MM-dd");
+                            var protime = Convert.ToDateTime(pronos);
+                            if (DateTime.Parse(pronos) > DateTime.Now)
+                            {
+                                return Error("工单批次号错误，生产日期不能大于当前时间！");
+                            }
+
                         }
-                    }
-                    if (input.F_MaterialID > 0)
-                    {
-                        if (!valcode(input.F_MaterialID.ToString(), 11))
+                        catch
                         {
-                            return Error("物料编码为11为纯数字！");
+                            return Error("工单批次号错误，日期格式错误！");
                         }
                     }
-
                 }
+                if (input.F_CustomerID > 0 && !valcode(input.F_CustomerID.ToString(), 10))
+                    return Error("客户编号为10为纯数字！");
+                if (input.F_MaterialID > 0 && !valcode(input.F_CustomerID.ToString(), 11))
+                    return Error("物料编码为11为纯数字！");
                 #endregion
                 var model = workOrder.GetModel(input.F_ID);
                 #region 保存客户基本信息
@@ -1232,9 +1383,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private bool vaBatchNumber(string code)
         {
             var res = false;
-            //11位数字
             if (code.Length == 15)
-                res = true;
+            {
+                char chr = code[12];
+                if (chr > 'A' && chr < 'Z')
+                {
+                 string code1= code.Substring(0, 12);
+                string code2 = code.Substring(15 - 2, 2);
+                 if (Regex.IsMatch(code1, @"^\d{12}$") && Regex.IsMatch(code2, @"^\d{2}$"))
+                        res = true;
+                }
+                else
+                {
+                    res = false;
+                }
+              
+              
+            }
             return res;
         }
         /// <summary>
@@ -1248,7 +1413,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 res = true;
             return res;
         }
-      
+       
         /// <summary>
         /// 根据model返回CustomerBaseNewInput对象
         /// </summary>
@@ -1450,6 +1615,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_ZL_CJ_IsRecord = model1[i].F_ZL_CJ_IsRecord;//质量管理科-抽检-未备案、已备案
                     model.F_IsVisit  = model1[i].F_IsVisit;//质量管理科-抽检-未备案、已备案
                     model.RemainingTime = TimeToOver(model1[i].F_ID);
+
+                    model.F_VisitOn = model1[i].F_VisitOn;//回访时间
+                    model.F_VisitBy = model1[i].F_VisitBy;//回访人
+                    model.F_VisitResult = model1[i].F_VisitResult;//回访结果：非常满意、满意、一般、不满意
+                    model.F_VisitReason = model1[i].F_VisitReason;// 回访不满意原因
+                    model.F_Callresults = model1[i].F_Callresults;//呼叫结果
+
+
+
                     model.F_IsOver = model1[i].F_IsOver;
                  
                     if (userId >0)
@@ -1793,8 +1967,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else
                         {
-                            var deptmodel = departmentBLL.GetModel(clbm);
-                            if (deptmodel != null)
+                        var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
+                        if (deptmodel != null)
                             {
                                 if (modlelist != null&& modlelist.Count >0)
                                 {
@@ -1857,7 +2031,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                         if (modlelist[0] != null&& modlelist.Count >0)
                         {
-                            var res = AssignWO(ua, modlelist[0], input, cont, clbm, clid, overtime, sms);
+                            var res = AssignWO(ua, modlelist[0], inputs, cont, clbm, clid, overtime, sms);
                             if (res)
                                 return Success("转派成功");
                             else
@@ -1905,7 +2079,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else
                     {
-                        var deptmodel = departmentBLL.GetModel(clbm);
+                        var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel != null)
                         {
                             if (model != null)
@@ -2155,6 +2329,64 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return Error("无操作权限");
         }
         /// <summary>
+        /// 工单回访
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [Authority]
+        public ActionResult ReturnvisitOrder(long orderid, string cont, string reason, string call )
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (ua != null)
+                {
+                    Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
+                    //验证信息
+                    if (model != null)
+                    {
+                        var res = Retu(ua, model, cont, reason, call);
+                        if (res)
+                            return Success("回访成功");
+                        else
+                            return Error("回访失败！");
+                    }
+                    return Error("工单不存在");
+                }
+            }
+            return Error("无操作权限");
+        }
+        /// <summary>
+        /// 工单完结
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [Authority]
+        public ActionResult EndOrder(long orderid, int isover=0 )
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (ua != null)
+                {
+                    Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
+                    //验证信息
+                    if (model != null)
+                    {
+                        var res = Overorder(ua, model, isover);
+                        if (res)
+                            return Success("完结成功");
+                        else
+                            return Error("完结失败！");
+                    }
+                    return Error("工单不存在");
+                }
+            }
+            return Error("无操作权限");
+        }
+        /// <summary>
         ///延期工单
         /// </summary>
         /// <returns></returns>
@@ -2301,9 +2533,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             return true;
         }
-         
-          
-        
         /// <summary>
         /// 退回工单
         /// </summary>
@@ -2378,6 +2607,135 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #endregion
         }
         /// <summary>
+        /// 回访工单
+        /// </summary>
+        public bool Retu(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont,string reason, string call)
+        {
+            #region 工单处理
+            int overtime = 0, sms = 0;
+            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.visit + " and  F_WoID=" + model.F_ID + " ");
+            if (itemlasts.Count > 0)
+            {
+                foreach (var it in itemlasts)
+                {
+                    if (it.F_WoState == 1)
+                    {
+                        overtime = int.Parse(it.F_LimitTime);
+                        sms = int.Parse(it.F_IsSMS.ToString());
+                    }
+                }
+            }
+            var opt = "回访";
+            int optbut = (int)EnumItemOpt.visit;
+            int wostate = (int)EnumWorkOrderState.evaluate;
+            #region 读取当前登录人部门
+            string deptname = "";
+            var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
+            if (deptmodel != null)
+            {
+                deptname = deptmodel.F_DeptName + "-";
+            }
+            #endregion
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单:回访结果：" + cont+" , " + "工单:呼叫结果：" + call;
+           
+            var touser = "";
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+            if (itemlast != null)
+                touser = itemlast.F_CreateUser;
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, overtime, sms);
+            if (itemid > 0)
+            {
+                #region 处理工单
+                model.F_VisitOn = DateTime .Now ;
+                model.F_VisitResult = cont ;
+                model.F_VisitReason = reason;
+                model.F_Callresults = call ;
+                workOrder.Update(model);
+                #endregion
+                #region 推送消息
+                #region 向上一级操作人员推送消息
+                if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
+                {//排除上一级指派人是自己
+                    sendsysmsg(model, nowUser, touser, (int)itemid, opt);
+                    var lastUser = sysUserAccountBll.GetModel(touser);
+                    if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
+                        sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
+                }
+                #endregion
+                #endregion
+                return true;
+            }
+            else
+                return false;
+            #endregion
+        }
+        /// <summary>
+        /// 完结工单
+        /// </summary>
+        public bool Overorder(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model,int isOver=0)
+        {
+            #region 工单处理
+            int overtime = 0, sms = 0;
+            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.visit + " and  F_WoID=" + model.F_ID + " ");
+            if (itemlasts.Count > 0)
+            {
+                foreach (var it in itemlasts)
+                {
+                    if (it.F_WoState == 1)
+                    {
+                        overtime = int.Parse(it.F_LimitTime);
+                        sms = int.Parse(it.F_IsSMS.ToString());
+                    }
+                }
+            }
+            var opt = "完结";
+             int optbut = (int)EnumItemOpt.end;
+              int wostate = (int)EnumWorkOrderState.evaluate;
+           if (isOver==0)
+            {
+                wostate = (int)EnumWorkOrderState.finish;
+            }
+           
+            #region 读取当前登录人部门
+            string deptname = "";
+            var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
+            if (deptmodel != null)
+            {
+                deptname = deptmodel.F_DeptName + "-";
+            }
+            #endregion
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "完结工单";
+
+            var touser = "";
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+            if (itemlast != null)
+                touser = itemlast.F_CreateUser;
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, overtime, sms);
+            if (itemid > 0)
+            {
+                #region 处理工单
+                model.F_VisitOn = DateTime.Now;
+                
+                workOrder.Update(model);
+                #endregion
+                #region 推送消息
+                #region 向上一级操作人员推送消息
+                if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
+                {//排除上一级指派人是自己
+                    sendsysmsg(model, nowUser, touser, (int)itemid, opt);
+                    var lastUser = sysUserAccountBll.GetModel(touser);
+                    if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
+                        sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
+                }
+                #endregion
+                #endregion
+                return true;
+            }
+            else
+                return false;
+            #endregion
+        }
+        /// <summary>
         /// 处理工单
         /// </summary>
         public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont,int isover = 0,string uncont="")
@@ -2559,25 +2917,44 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private Model.T_Wo_WorkOrder InToworkModel(Model.T_Wo_WorkOrder model, WorkOrderNewInput input)
 
         {
+            if (!string .IsNullOrEmpty (input.F_SC_ProductBase))
             model.F_SC_ProductBase = input.F_SC_ProductBase;//市场管理科-生产基地（新乡、新疆、九江、东北、贴牌、无法确定）
-            model.F_SC_PreliminaryOpinion = input.F_SC_PreliminaryOpinion;// 市场管理科-初审意见:退货、换货、补偿、自行处理
-            model.F_SC_QualityMonth = input.F_SC_QualityMonth;//市场管理科-超出质保期限（算法：工单创建日期-生产日期，生产日期根据生产批次号获取，单位：月）
-            model.F_SC_CJ_SpotResult = input.F_SC_CJ_SpotResult;/// 市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
-            model.F_SC_CJ_SelfResult = input.F_SC_CJ_SelfResult;//市场管理科-抽检-自检结果
-            model.F_SC_CJ_ApprovalNo = input.F_SC_CJ_ApprovalNo;// 市场管理科-抽检-对应审批工作流单号
-            model.F_SC_CJ_ReturnAccount = input.F_SC_CJ_ReturnAccount;//市场管理科-抽检-确认返账金额（元）
-            model.F_ZL_QualityEventLevel = input.F_ZL_QualityEventLevel;// 质量管理科-质量事件等级（未遂、一般、较大、重大）
-            model.F_ZL_ClaimAmount = input.F_ZL_ClaimAmount;//质量管理科-索赔金额（单位元，对应责任单位）
-            model.F_ZL_ResponsibleUnit = input.F_ZL_ResponsibleUnit;//质量管理科-责任单位（需列出，可选多个）
-            model.F_ZL_ApprovalOpinions = input.F_ZL_ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
-            model.F_ZL_ApprovalDisagree = input.F_ZL_ApprovalDisagree;// 质量管理科-审批不同意意见
-            model.F_ZL_CompensationMethod =input.F_ZL_CompensationMethod;//质量管理科-补偿方式（实物、钱款【单位元】，若选择钱款，增加输入框输入补充内容）
-            model.F_ZL_CompensationMoney = input.F_ZL_CompensationMoney;// 质量管理科-补偿钱款
-            model.F_ZL_CResponsibleUnits = input.F_ZL_CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
-            model.F_ZL_Fquantity = input.F_ZL_Fquantity;// 质量管理科-确认实收数量（吨）
-            model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
-            model.F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
-            model.F_ZL_CJ_IsRecord = input.F_ZL_CJ_IsRecord;//质量管理科-抽检-未备案、已备案
+            if (!string.IsNullOrEmpty(input.F_SC_PreliminaryOpinion))
+                model.F_SC_PreliminaryOpinion = input.F_SC_PreliminaryOpinion;// 市场管理科-初审意见:退货、换货、补偿、自行处理
+            if (!string.IsNullOrEmpty(input.F_SC_QualityMonth))
+                model.F_SC_QualityMonth = input.F_SC_QualityMonth;//市场管理科-超出质保期限（算法：工单创建日期-生产日期，生产日期根据生产批次号获取，单位：月）
+            if (!string.IsNullOrEmpty(input.F_SC_CJ_SpotResult))
+                model.F_SC_CJ_SpotResult = input.F_SC_CJ_SpotResult;/// 市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
+            if (!string.IsNullOrEmpty(input.F_SC_CJ_SelfResult))
+                model.F_SC_CJ_SelfResult = input.F_SC_CJ_SelfResult;//市场管理科-抽检-自检结果
+            if (!string.IsNullOrEmpty(input.F_SC_CJ_ApprovalNo))
+                model.F_SC_CJ_ApprovalNo = input.F_SC_CJ_ApprovalNo;// 市场管理科-抽检-对应审批工作流单号
+            if (!string.IsNullOrEmpty(input.F_SC_CJ_ReturnAccount))
+                model.F_SC_CJ_ReturnAccount = input.F_SC_CJ_ReturnAccount;//市场管理科-抽检-确认返账金额（元）
+            if (!string.IsNullOrEmpty(input.F_ZL_QualityEventLevel))
+                model.F_ZL_QualityEventLevel = input.F_ZL_QualityEventLevel;// 质量管理科-质量事件等级（未遂、一般、较大、重大）
+            if (!string.IsNullOrEmpty(input.F_ZL_ClaimAmount))
+                model.F_ZL_ClaimAmount = input.F_ZL_ClaimAmount;//质量管理科-索赔金额（单位元，对应责任单位）
+            if (!string.IsNullOrEmpty(input.F_ZL_ResponsibleUnit))
+                model.F_ZL_ResponsibleUnit = input.F_ZL_ResponsibleUnit;//质量管理科-责任单位（需列出，可选多个）
+            if (!string.IsNullOrEmpty(input.F_ZL_ApprovalOpinions))
+                model.F_ZL_ApprovalOpinions = input.F_ZL_ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
+            if (!string.IsNullOrEmpty(input.F_ZL_ApprovalDisagree))
+                model.F_ZL_ApprovalDisagree = input.F_ZL_ApprovalDisagree;// 质量管理科-审批不同意意见
+            if (!string.IsNullOrEmpty(input.F_ZL_CompensationMethod))
+                model.F_ZL_CompensationMethod =input.F_ZL_CompensationMethod;//质量管理科-补偿方式（实物、钱款【单位元】，若选择钱款，增加输入框输入补充内容）
+            if (!string.IsNullOrEmpty(input.F_ZL_CompensationMoney))
+                model.F_ZL_CompensationMoney = input.F_ZL_CompensationMoney;// 质量管理科-补偿钱款
+            if (!string.IsNullOrEmpty(input.F_ZL_CResponsibleUnits))
+                model.F_ZL_CResponsibleUnits = input.F_ZL_CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
+            if (!string.IsNullOrEmpty(input.F_ZL_Fquantity))
+                model.F_ZL_Fquantity = input.F_ZL_Fquantity;// 质量管理科-确认实收数量（吨）
+            if (!string.IsNullOrEmpty(input.F_ZL_ImprovementRequirements))
+                model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
+            if (!string.IsNullOrEmpty(input.F_ZL_CApprovalNo))
+                model.F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
+            if (!string.IsNullOrEmpty(input.F_ZL_CJ_IsRecord))
+                model.F_ZL_CJ_IsRecord = input.F_ZL_CJ_IsRecord;//质量管理科-抽检-未备案、已备案
             if (input .F_IsVisit !=null )
             {
                 model.F_IsVisit = input.F_IsVisit;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

@@ -53,6 +53,8 @@ namespace CallCenterApi.Interface.Models.Enum
         delete = 5,
         [Description("回访")]
         visit = 6,
+        [Description("审批")]
+        audit = 7,
     }
     /// <summary>
     /// 工单记录操作
@@ -81,8 +83,10 @@ namespace CallCenterApi.Interface.Models.Enum
         update,
         [Description("删除")]
         delete,
-        [Description("审核")]
+        [Description("待审核")]
         audit,
+        [Description("已审核")]
+        reaudit,
         [Description("回访")]
         visit
     }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/CustomerBaseNewInput.cs

@@ -16,6 +16,10 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_CustomerCode { set; get; }
         /// <summary>
+        /// 客户性别
+        /// </summary>
+        public string F_Gender { set; get; }
+        /// <summary>
         /// 公司名称
         /// </summary>
         public string F_CompanyName { set; get; }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -612,6 +612,13 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
+        /// 呼叫结果
+        /// </summary>
+        public string F_Callresults
+        {
+            get; set;
+        }
+        /// <summary>
         /// 添加人工号
         /// </summary>
         public string F_CreateBy
@@ -625,6 +632,7 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
+      
         /// <summary>
         /// 修改次数
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Model/T_Cus_CustomerBaseNew.cs

@@ -60,6 +60,7 @@ namespace CallCenterApi.Model
         private int? _f_isdelete;
         private string _f_deleteby;
         private DateTime? _f_deleteon;
+        private string _f_gender;
         /// <summary>
         /// 自增ID
         /// </summary>
@@ -77,6 +78,14 @@ namespace CallCenterApi.Model
             get { return _f_customercode; }
         }
         /// <summary>
+        /// 客户性别
+        /// </summary>
+        public string F_Gender
+        {
+            set { _f_gender = value; }
+            get { return _f_gender; }
+        }
+        /// <summary>
         /// 公司名称
         /// </summary>
         public string F_CompanyName

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -93,6 +93,12 @@ namespace CallCenterApi.Model
         private string _f_cusname;
         private string _f_companyname;
         private string _f_wxopenid;
+        private string _f_callresults;
+        public string F_Callresults
+        {
+            set { _f_callresults = value; }
+            get { return _f_callresults; }
+        }
         /// <summary>
         /// 微信OpenId
         /// </summary>