微信高层审批修改，值班电话修改，增加客户渠道，短信sdk,通话记录，历史记录增加客户姓名，编号登录

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

@@ -89,6 +89,13 @@ namespace CallCenterApi.BLL
             return dal.GetModel(F_UserCode);
         }
         /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_UserAccount GetworkModel(string F_WorkNumber)
+        {
+            return dal.GetworkModel(F_WorkNumber);
+        }
+        /// <summary>
         /// 根据Openid 获取用户
         /// </summary>
         /// <param name="openid"></param>
@@ -101,11 +108,17 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 登录得到一个对象实体
         /// </summary>
+        public Model.T_Sys_UserAccount LogworkGetModel(string F_WorkNumber, string F_Password)
+        {
+            return dal.LogworkGetModel(F_WorkNumber, F_Password);
+        }
+        /// <summary>
+        /// 登录得到一个对象实体
+        /// </summary>
         public Model.T_Sys_UserAccount LoginGetModel(string F_UserCode, string F_Password)
         {
             return dal.LoginGetModel(F_UserCode, F_Password);
         }
-
         ///// <summary>
         ///// 得到一个对象实体，从缓存中
         ///// </summary>

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -314,7 +314,33 @@ namespace CallCenterApi.DAL
                 return false;
             }
         }
+        /// <summary>
+        /// 登录得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_UserAccount LogworkGetModel(string F_WorkNumber, string F_Password)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId from T_Sys_UserAccount ");
+            strSql.Append(" where F_WorkNumber=@F_WorkNumber and F_Password=@F_Password and  F_DeleteFlag=0");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkNumber", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Password", SqlDbType.VarChar,50)
+            };
+            parameters[0].Value = F_WorkNumber;
+            parameters[1].Value = F_Password;
 
+            Model.T_Sys_UserAccount model = new Model.T_Sys_UserAccount();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
         /// <summary>
         /// 登录得到一个对象实体
         /// </summary>
@@ -342,7 +368,31 @@ namespace CallCenterApi.DAL
                 return null;
             }
         }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_UserAccount GetworkModel(string F_WorkNumber)
+        {
 
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId from T_Sys_UserAccount ");
+            strSql.Append(" where F_WorkNumber=@F_WorkNumber");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkNumber", SqlDbType.VarChar,50)
+            };
+            parameters[0].Value = F_WorkNumber;
+
+            Model.T_Sys_UserAccount model = new Model.T_Sys_UserAccount();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
         /// <summary>
         /// 得到一个对象实体
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -34,11 +34,16 @@ namespace CallCenterApi.Interface.Controllers
                     return Error("账号不能为空！");
                 if (string.IsNullOrEmpty(login.Password))
                     return Error("密码不能为空！");
-                Model.T_Sys_UserAccount loginUser = new BLL.T_Sys_UserAccount().LoginGetModel(login.Username, login.Password);
-
-                if (loginUser != null)
+                Model.T_Sys_UserAccount loginCode = new BLL.T_Sys_UserAccount().LoginGetModel(login.Username, login.Password);
+                Model.T_Sys_UserAccount loginwork = new BLL.T_Sys_UserAccount().LogworkGetModel(login.Username, login.Password);
+                if (loginCode != null|| loginwork != null )
                 {
+                    Model.T_Sys_UserAccount loginUser = null;
                     string deptcode = "";
+                    if (loginCode != null)
+                     loginUser = loginCode;
+                    else
+                        loginUser = loginwork;
                     Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(loginUser.F_DeptId);
                     if (deptModel != null)
                     {
@@ -77,10 +82,6 @@ namespace CallCenterApi.Interface.Controllers
                     {
                         token = token
                     });
-
-
-
-
                 }
                 else
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -164,6 +164,23 @@ namespace CallCenterApi.Interface.Controllers
             }
             return res;
         }
+        public int   Getcode()
+        {
+         
+                int UserCode = 0;
+                string strSql = "select Max(F_UserCode) F_UserCode from T_Sys_UserAccount ";
+                object ob = DbHelperSQL.GetSingle(strSql.ToString());
+                if (ob == null)
+                {
+                    UserCode = 0;
+                }
+                else
+                {
+                    UserCode = Convert.ToInt32(ob);
+                }
+            return UserCode + 1;
+               
+        }
         //[Authority]
         //获取用户信息
         public ActionResult GetUser(int userId = 0, string userCode = "")
@@ -237,17 +254,17 @@ namespace CallCenterApi.Interface.Controllers
 
                 Model.T_Sys_UserAccount userAccountModel = new Model.T_Sys_UserAccount();
                 //员工工号不能重复
-                string ucode = input.Usercode.Trim();
+                string ucode = input.WorkNumber.Trim();
                 if (!string.IsNullOrEmpty(ucode))
                 {
-                    Model.T_Sys_UserAccount uModel = new BLL.T_Sys_UserAccount().GetModel(ucode);
+                    Model.T_Sys_UserAccount uModel = new BLL.T_Sys_UserAccount().GetworkModel(ucode);
                     if (uModel != null)
                     {
-                        return Error("不能重复添加工号");
+                        return Error("不能重复添加编号");
                     }
                     else
                     {
-                        userAccountModel.F_UserCode = ucode;
+                      userAccountModel.F_UserCode = Getcode().ToString ();
                         userAccountModel.F_WorkNumber = ucode;
                     }
                 }
@@ -342,17 +359,18 @@ namespace CallCenterApi.Interface.Controllers
                 string ucode = input.Usercode.Trim();
                 if (!string.IsNullOrEmpty(ucode))
                 {
-                    var uModels = new BLL.T_Sys_UserAccount().GetModelList(" F_UserCode='" + ucode + "'");
-                    if (uModels.Count() > 1)
+                    Model.T_Sys_UserAccount uModel = new BLL.T_Sys_UserAccount().GetModel(ucode);
+                    if (uModel==null )
                     {
-                        return Error("不能重复添加工号");
+                        return Error("查找不到该用户");
                     }
                     else
                     {
-                        userAccountModel.F_UserCode = ucode;
-                        userAccountModel.F_WorkNumber = ucode;
+                       userAccountModel.F_UserCode  = ucode;
                     }
                 }
+                if (!string .IsNullOrEmpty (input.WorkNumber))
+                    userAccountModel.F_WorkNumber  = input.WorkNumber.Trim ();
                 if (input.Username != null)
                     userAccountModel.F_UserName = input.Username.Trim();
                 if (input.Password != null)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -324,6 +324,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                             pageindex,
                             true,
                             out recordCount);
+                        dt.Columns.Add("CusName");
                         var config = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
                         foreach (DataRow dr in dt.Rows)
                         {
@@ -337,11 +338,12 @@ namespace CallCenterApi.Interface.Controllers.tel
                                 }
                                 dr["FilePath"] = ym + path.Substring(path.IndexOf(':') + 1).Replace('\\', '/');
                             }
+                            dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList($" ( F_CompanyName like '%" + dr["CallNumber"] + "%' or F_CustomerCode like '%" + dr["CallNumber"] + "%' ) ");
                         }
 
                         int hrcount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=0 " + sqlcount);
                         int hccount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=1 " + sqlcount);
-
+                        
                         var obj = new
                         {
                             state = "success",

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallOutScreenController.cs

@@ -27,7 +27,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                     Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
                     if (ua != null)
                     {
-                        string sql = " and UserCode='" + ua.F_WorkNumber + "'";
+                        string sql = " and UserCode='" + ua.F_UserCode  + "'";
                         DataTable dt = new DataTable();
 
                         string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -193,8 +193,8 @@ namespace CallCenterApi.Interface.Controllers.tel
                             dr["UserName"] = uu.F_UserName;
                     }
                 }
-
-                //dr["CusName"] = new BLL.T_Cus_CustomerBase().GetModelList("F_Telephone='" + dr["CallNumber"] + "' and F_DeleteFlag=0").FirstOrDefault() == null ? "" : new BLL.T_Cus_CustomerBase().GetModelList("F_Telephone='" + dr["CallNumber"] + "'").FirstOrDefault().F_CustomerName;
+                dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList($" ( F_CompanyName like '%" + dr["CallNumber"] + "%' or F_CustomerCode like '%" + dr["CallNumber"] + "%' ) ")
+                  .FirstOrDefault().F_Legal;
             }
 
             var obj = new

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/DutyPhoneController.cs

@@ -130,7 +130,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                         dModel.F_Remark = des.Trim();
                         var gid = int.Parse(groupid.Trim());
                         dModel.F_Groupid = gid;
-                        var gname = new BLL.T_Sys_SeatGroup().GetModel(gid) == null ? "" : new BLL.T_Sys_SeatGroup().GetModel(gid).F_ZXZName;
+                        var gname = new BLL.T_Sys_SeatGroup().GetModel(gid) == null ? "" : new BLL.T_Sys_SeatGroup().GetModel(gid).F_ZXZCode ;
                         dModel.F_GroupName = gname;
 
                         bool b = dBLL.Update(dModel);
@@ -155,7 +155,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                     dModel.F_CreateTime = DateTime.Now;
                     var gid = int.Parse(groupid.Trim());
                     dModel.F_Groupid = gid;
-                    var gname = new BLL.T_Sys_SeatGroup().GetModel(gid).F_ZXZName;
+                    var gname = new BLL.T_Sys_SeatGroup().GetModel(gid).F_ZXZCode;
                     dModel.F_GroupName = gname;
 
                     int b = new BLL.T_Call_ZBDH().Add(dModel);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -73,51 +73,55 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 customerBaseBLL.Update(modelcustomer);
             }
             #endregion
-          
-                Dictionary<string, string> paras = new Dictionary<string, string>();
-                string sql = " select * from T_Sys_UserAccount (NOLOCK) where F_UserCode=@F_UserCode and F_PassWord=@F_PassWord and F_DeleteFlag = 0 ";
-                paras.Add("@F_UserCode", login.UserCode);
-                paras.Add("@F_PassWord", login.Password);
-                var dt = DbHelperSQL.Query(sql, paras).Tables[0];
 
-                if (dt != null && dt.Rows.Count > 0)
-                {
-                    //var user = userAccountBLL.GetModel(login.UserCode);   //20180926 次方法查询有漏洞
-                    var user = userAccountBLL.DataTableToList(dt).ToList().FirstOrDefault();
-                    user.F_WxOpenId = login.OpenId;
+            if (string.IsNullOrEmpty(login.UserCode))
+                return Error("账号不能为空！");
+            if (string.IsNullOrEmpty(login.Password))
+                return Error("密码不能为空！");
+            Model.T_Sys_UserAccount loginCode = new BLL.T_Sys_UserAccount().LoginGetModel(login.UserCode, login.Password);
+            Model.T_Sys_UserAccount loginwork = new BLL.T_Sys_UserAccount().LogworkGetModel(login.UserCode, login.Password);
+            if (loginCode != null || loginwork != null)
+            {
+                Model.T_Sys_UserAccount loginUser = null;
+                string deptcode = "";
+                if (loginCode != null)
+                    loginUser = loginCode;
+                else
+                    loginUser = loginwork;
+                loginUser.F_WxOpenId = login.OpenId;
                     int UserType = 0;string rolecode = "";
 
                     //部门
-                    Model.T_Sys_Department modelDep = new BLL.T_Sys_Department().GetModel(user.F_DeptId);
+                    Model.T_Sys_Department modelDep = new BLL.T_Sys_Department().GetModel(loginUser.F_DeptId);
                     if (modelDep == null)
                         return Error("获取失败!");
                     #region 读取角色code
-                    var rolemodel = roleBLL.GetModel(user.F_RoleId);
+                    var rolemodel = roleBLL.GetModel(loginUser.F_RoleId);
                     if (rolemodel != null)
                         rolecode = rolemodel.F_RoleCode;
                     #endregion
                         #region 部门角色
                         //部门角色（-1管理员，1接待部，2案场经理、项目负责人,3销售部总经理、物业部总经理、工程总经理、设计总经理,4区域客服，5业主（客户档案））
-                    if (user.F_RoleId == 17 )
+                    if (loginUser.F_RoleId == 17 )
                     {
                     //-1管理员
                     return Error("无操作权限");
                 }
                     else
                     {
-                        if ( user.F_RoleId == 60 || user.F_RoleId == 62)
+                        if (loginUser.F_RoleId == 60 || loginUser.F_RoleId == 62)
                         {
                             UserType = 0;
                         }
-                        else if (user.F_RoleId == 61)
+                        else if (loginUser.F_RoleId == 61)
                         {
                             UserType = 2;
                         }
-                        else if (user.F_RoleId == 58)
+                        else if (loginUser.F_RoleId == 58)
                         {
                             UserType = 4;
                         }
-                        else if (user.F_RoleId == 59)
+                        else if (loginUser.F_RoleId == 59)
                         {
                             UserType = 3;
                         }
@@ -163,7 +167,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         rolecode=rolecode,
                     };
 
-                     if (userAccountBLL.Update(user))
+                     if (userAccountBLL.Update(loginUser))
                         return Success("绑定成功", obj);
                     else
                         return Error("绑定失败");
@@ -566,11 +570,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     sql += $" and F_IncidentCountry like '%" + country.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(province))//乡
                     sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
+             
              //   sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
              if (ua !=null )
                 {
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                    switch (state)
+                    if (source==3)
+                    {
+                        sql += $" and F_WxOpenId ='" + OpenId + "'";
+                    }
+                        switch (state)
                     {
                         case 0://待审批
                             string uwhere = "";
@@ -651,7 +660,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         case 4://待完成的(待处理)
                             if (GetDWCWorkOrderID(ua.F_UserCode) != null)
                             {
-                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.reassign + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
                             }
                             else
                             {
@@ -1048,7 +1057,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public string GetHApproval(string user)
         {
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where isnull(F_IsUsed,'0')='0' and F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + user + "'"+ "and F_IsUsed=2"; ;
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where   F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + user + "'" + "and F_IsUsed=2";
             return str;
         }
         /// <summary>
@@ -1428,8 +1437,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             string str = string.Empty;
             #region 查询自己名下未审批的工单列表
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit +","+(int)EnumItemOpt.reback + "," + (int)EnumItemOpt.abreback + ")"+ " and "
-                    + "F_WoState in("  + (int)EnumWorkOrderState.audit + ","+(int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser='" + ua.F_UserCode  + "' "
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + ")"+ " and "
+                    + "F_WoState in("  + (int)EnumWorkOrderState.audit + ") and F_NextUser='" + ua.F_UserCode  + "' "
                 + "" + " ");
 
             foreach (var it in itemlast)
@@ -1484,8 +1493,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 if (!string .IsNullOrEmpty (GetDeptment(ua)))
                 {
-                    var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + "," + (int)EnumItemOpt.reback + "," + (int)EnumItemOpt.abreback + ")" + " and "
-                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit + "," + (int)EnumWorkOrderState.neworder + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
+                    var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit+ ")" + " and "
+                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
                                        foreach (var it in itemlasts)
                     {
                         float hours = (DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString())).Hours;
@@ -1592,6 +1601,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     model.F_BranchName = pdModel1.F_DeptName;
                                 }
                             }
+                            model.F_CompanyName = cuModel.F_CompanyName;//公司名称
                             model.F_CustomerID = cuModel.F_CustomerCode;//客户编码
                             model.F_Salesman = cuModel.F_Salesman;
                             model.F_SalesPhone = cuModel.F_SalesPhone;
@@ -1720,7 +1730,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (model1[i].F_State == 14)
                     {
-                        model.F_StateName = "待审批";
+                        model.F_StateName = "待办理";
                     }
                     else if (model1[i].F_State == 15)
                     {
@@ -1728,12 +1738,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (model1[i].F_State == 16)
                     {
-                        model.F_StateName = "待审批";
+                        model.F_StateName = "待办理";
                     }
                     #endregion
                     model.F_CusName = model1[i].F_CusName;//客户姓名
                     model.F_CusPhone = model1[i].F_CusPhone;//客户电话
-                    model.F_CompanyName = model1[i].F_CompanyName;//公司名称
+                    model.F_Canal = model1[i].F_Canal;//
                     model.F_IncidentProvince = model1[i].F_IncidentProvince;//事发地-省
                     model.F_IncidentCity = model1[i].F_IncidentCity;//事发地-市
                     model.F_IncidentCountry = model1[i].F_IncidentCountry;//事发地-县
@@ -1807,7 +1817,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_ZL_ImprovementRequirements = model1[i].F_ZL_ImprovementRequirements;//质量管理科-改进要求
                     model.F_ZL_CApprovalNo = model1[i].F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
                     model.F_ZL_CJ_IsRecord = model1[i].F_ZL_CJ_IsRecord;//质量管理科-抽检-未备案、已备案
-                    model.F_IsVisit = model1[i].F_IsVisit;//质量管理科-抽检-未备案、已备案
+                    if (model1[i].F_IsVisit!=0)
+                    {
+                        model.F_IsVisit = "是";//是否回访
+                    }
+                    else
+                    {
+                        model.F_IsVisit = "否";//是否回访
+                    }
+                 
                     model.F_IsAudit = model1[i].F_IsAudit;//是否审核
                     model.F_Highopinions = model1[i].F_Highopinions ;//高层处理意见
                     model.F_CreateOn = model1[i].F_CreateOn; ;//添加时间
@@ -2386,6 +2404,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             model.F_ZX_Branch = input.F_ZX_Branch;//分公司
             model.F_Files = "0";//附件上传ids
             model.F_DealType = input.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
+            model.F_Canal = input.F_Canal;//处理方式:当即办理、电话转接、网络转办（点选）
             #endregion
             model.F_QuestionType = input.F_QuestionType;//问题类别（投诉抽捡和咨询类别不一样）
                 model.F_CustomerID = input.F_CustomerID;//客户编号为10为纯数字
@@ -2678,7 +2697,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_ZL_CJ_IsRecord = input.F_ZL_CJ_IsRecord;//质量管理科-抽检-未备案、已备案
             if (input.F_IsVisit != null)
             {
-                model.F_IsVisit = input.F_IsVisit;
+                try
+                {
+                    model.F_IsVisit = int.Parse(input.F_IsVisit);
+                }
+                catch
+                {
+                    model.F_IsVisit =1;
+                }
+               
             }
             return model;
         }
@@ -2727,7 +2754,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     }
                                     else if (deptmodel.F_DeptId == 12)
                                     {
-                                        input.F_IsVisit = isvisit;
+                                        input.F_IsVisit = isvisit.ToString ();
                                         input.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
                                         input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                         input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
@@ -2755,7 +2782,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     }
                                     else if (deptmodel.F_DeptId == 12)
                                     {
-                                        input.F_IsVisit = isvisit;
+                                        input.F_IsVisit = isvisit.ToString ();
                                         input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                         input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                     }
@@ -3323,7 +3350,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 }
                                 else if (deptmodel.F_DeptId == 12)
                                 {
-                                    input.F_IsVisit = isvisit;
+                                    input.F_IsVisit = isvisit.ToString ();
                                     input.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
                                     input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                     input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
@@ -3346,7 +3373,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 }
                                 else if (deptmodel.F_DeptId == 12)
                                 {
-                                    input.F_IsVisit = isvisit;
+                                    input.F_IsVisit = isvisit.ToString ();
                                     input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                 }
                             }
@@ -3513,7 +3540,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             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, limit + model .F_limit , sms);
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.Delay, optbut, touser, 0, nowUser, limit + model .F_limit , sms,"", 1);
 
             #endregion
 
@@ -3624,7 +3651,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             var opt = "处理";
             int optbut = (int)EnumItemOpt.deal;
-            int wostate = (int)EnumWorkOrderState.dealing;
+            int wostate = (int)EnumWorkOrderState.receive;
 
             if (isover == 1)
             {
@@ -3808,7 +3835,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 var model = woBLL.GetModel(input.F_ID);
                 if (model ==null )
                     return Error("查询不到此工单！");
-                if(model .F_State !=3)
+                if(model .F_State !=3&& model.F_State != 12)
                 {
                     var itemlast = itembll.GetModelList(" F_WoID=" + input.F_ID + " ");
                     if (itemlast .Count >0)

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

@@ -161,7 +161,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     case 2://待完成的(待处理)
                         if(GetDWCWorkOrderID(ua.F_UserCode)!=null )
                         {
-                            sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                            sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
                         }
                         else
                         {
@@ -540,7 +540,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += $"  F_IsDelete=0";
                             if (GetDWCWorkOrderID(ua.F_UserCode) != null)
                             {
-                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
                             }
                             else
                             {
@@ -1122,8 +1122,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             string str = string.Empty;
             #region 查询自己名下未审批的工单列表
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + "," + (int)EnumItemOpt.reback + "," + (int)EnumItemOpt.abreback + ")" + " and "
-                    + "F_WoState in(" + (int)EnumWorkOrderState.audit + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser='" + ua.F_UserCode + "' "
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + ")" + " and "
+                    + "F_WoState in(" + (int)EnumWorkOrderState.audit + ") and F_NextUser='" + ua.F_UserCode + "' "
                 + "" + " ");
 
             foreach (var it in itemlast)
@@ -1178,8 +1178,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 if (!string.IsNullOrEmpty(GetDeptment(ua)))
                 {
-                    var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + "," + (int)EnumItemOpt.reback + "," + (int)EnumItemOpt.abreback + ")" + " and "
-                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit  + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
+                    var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit  + ")" + " and "
+                                      + "F_WoState in(" + (int)EnumWorkOrderState.audit   + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
                     foreach (var it in itemlasts)
                     {
                         float hours = (DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString())).Hours;
@@ -1566,6 +1566,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             drNew["详细地址"] = cuModel.F_AddressFull;
                             drNew["产品"] = cuModel.F_Brands;
                             drNew["渠道类型"] = cuModel.F_Channel;
+                            drNew["公司名称"] = cuModel.F_CompanyName ;
                             drNew["是否经营心连心"] = cuModel.F_IsRunXLX;
                             drNew["年销量"] = cuModel.F_AnnualSales;
                             drNew["配方"] = cuModel.F_Formula;
@@ -1677,7 +1678,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     #endregion
                     drNew["客户姓名"] = it.F_CusName;//
                     drNew["客户电话"] = it.F_CusPhone;//
-                    drNew["公司名称"] = it.F_CompanyName;//
                     drNew["事发地-省"] = it.F_IncidentProvince;//
                     drNew["事发地-市"] = it.F_IncidentCity;//
                     drNew["事发地-县"] = it.F_IncidentCountry;//
@@ -3388,7 +3388,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = workOrder.GetModel(input.F_ID);
                 if (model == null)
                     return Error("查询不到此工单！");
-                if (model.F_State != 3)
+                if (model.F_State != 3 && model.F_State != 12)
                 {
                     var itemlast = itembll.GetModelList(" F_WoID=" + input.F_ID + " ");
                     if (itemlast.Count > 0)
@@ -3546,8 +3546,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 model.F_AddressTownship = cuModel.F_AddressTownship;
                                 model.F_AddressFull = cuModel.F_AddressFull;
                                 model.F_Brands = cuModel.F_Brands;
-                                model.F_Channel = cuModel.F_Channel;
-                                model.F_IsRunXLX = cuModel.F_IsRunXLX;
+                                model.F_Channel = cuModel.F_Channel; 
+                            model.F_Channel = cuModel.F_CompanyName ;
+                            model.F_IsRunXLX = cuModel.F_IsRunXLX;
                                 model.F_AnnualSales = cuModel.F_AnnualSales;
                                 model.F_Formula = cuModel.F_Formula;
                                 model.F_RaiseCrops = cuModel.F_RaiseCrops;
@@ -3672,7 +3673,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else if (model1[i].F_State == 14)
                     {
-                        model.F_StateName = "待审批";
+                        model.F_StateName = "待办理";
                     }
                     else if (model1[i].F_State == 15)
                     {
@@ -3680,12 +3681,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else if (model1[i].F_State == 16)
                     {
-                        model.F_StateName = "待审批";
+                        model.F_StateName = "待办理";
                     }
                     #endregion
                     model.F_CusName = model1[i].F_CusName;//客户姓名
                     model.F_CusPhone = model1[i].F_CusPhone;//客户电话
-                    model.F_CompanyName = model1[i].F_CompanyName;//公司名称
+               //     model.F_CompanyName = model1[i].F_CompanyName;//公司名称
                     model.F_IncidentProvince = model1[i].F_IncidentProvince;//事发地-省
                     model.F_IncidentCity = model1[i].F_IncidentCity;//事发地-市
                     model.F_IncidentCountry = model1[i].F_IncidentCountry;//事发地-县
@@ -3769,23 +3770,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_ZL_ImprovementRequirements = model1[i].F_ZL_ImprovementRequirements;//质量管理科-改进要求
                     model.F_ZL_CApprovalNo = model1[i].F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
                     model.F_ZL_CJ_IsRecord = model1[i].F_ZL_CJ_IsRecord;//质量管理科-抽检-未备案、已备案
-                    model.F_IsVisit  = model1[i].F_IsVisit;//质量管理科-抽检-未备案、已备案
+                    if (model1[i].F_IsVisit==1)
+                    {
+                        model.F_IsVisit ="是";//
+                    }
+                    else
+                    {
+                        model.F_IsVisit ="否";//
+                    }
                     model.RemainingTime = TimeToOver(model1[i].F_ID, model1[i].F_limit );
-
                     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_IsAudit = model1[i].F_IsAudit;//是否审核
                     model.F_Highopinions = model1[i].F_Highopinions;//高层处理意见
-
-                  
                     model.F_CreateOn = model1[i].F_CreateOn; ;//添加时间
                     model.F_CreateBy = model1[i].F_CreateBy; ;//添加人
                     if (!string .IsNullOrEmpty (model1[i].F_CreateBy))
-
                     {
                         Model.T_Sys_UserAccount creatname = sysUserAccountBll.GetModel(model1[i].F_CreateBy);
                         if (creatname!=null )
@@ -3794,7 +3797,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                      
                     }
-                   
                     model.F_UpdateBy = model1[i].F_UpdateBy;//修改人工号
                     model.F_UpdateOn = model1[i].F_UpdateOn; ;//修改人工号
                     if (model1[i].F_IsAudit!=0&& model1[i].F_IsAudit!=null )
@@ -3816,7 +3818,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_AuditState = "";
                     }
-                  model .F_limit = model1[i].F_limit ;
+                    model .F_Canal = model1[i].F_Canal;
+                    model .F_limit = model1[i].F_limit ;
                     model.F_AuditBy = model1[i].F_AuditBy;//审核人
                     model.F_AuditOn = model1[i].F_AuditOn;//审核时间
                     model.F_AuditCont = model1[i].F_AuditCont;//审核内容
@@ -4135,7 +4138,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
             }
             #endregion
-           
+            model.F_Canal = input.F_Canal;//生产批次号
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
             model.F_CusName = input.F_CusName;//客户姓名
             model.F_CusPhone = input.F_CusPhone;//客户电话
@@ -4366,7 +4369,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         }
                                         else if (deptmodel.F_DeptId == 12)
                                         {
-                                        inputs.F_IsVisit = isvisit;
+                                        inputs.F_IsVisit = isvisit.ToString ();
                                         inputs.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
                                         inputs.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                         inputs.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
@@ -4392,8 +4395,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         }
                                         else if (deptmodel.F_DeptId == 12)
                                         {
-                                        inputs.F_IsVisit = isvisit;
-                                        inputs.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
+                                        inputs.F_IsVisit = isvisit.ToString();
+                                    inputs.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                         inputs.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                         }
                                     }
@@ -4604,7 +4607,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
                                     else if (deptmodel.F_DeptId  == 12)
                                     {
-                                        input.F_IsVisit = isvisit;
+                                        input.F_IsVisit = isvisit.ToString();
                                         input.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
                                         input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                         input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
@@ -4632,7 +4635,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
                                     else if (deptmodel.F_DeptId == 12)
                                     {
-                                        input.F_IsVisit = isvisit;
+                                        input.F_IsVisit = isvisit.ToString();
                                         input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                         input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                     }
@@ -4786,7 +4789,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else if (deptmodel.F_DeptId ==12)
                                 {
-                                    input.F_IsVisit = isvisit;
+                                    input.F_IsVisit = isvisit.ToString();
                                     input.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
                                     input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                     input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
@@ -4809,7 +4812,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else if (deptmodel.F_DeptId == 12)
                                 {
-                                    input.F_IsVisit = isvisit;
+                                    input.F_IsVisit = isvisit.ToString();
                                     input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                 }
                             }
@@ -5389,7 +5392,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             var opt = "处理";
             int optbut = (int)EnumItemOpt.deal;
-            int wostate = (int)EnumWorkOrderState.dealing;
+            int wostate = (int)EnumWorkOrderState.receive;
            
             if (isover == 1)
             {
@@ -5596,7 +5599,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_ZL_CJ_IsRecord = input.F_ZL_CJ_IsRecord;//质量管理科-抽检-未备案、已备案
             if (input .F_IsVisit !=null )
             {
-                model.F_IsVisit = input.F_IsVisit;
+                try
+                {
+                    model.F_IsVisit = int .Parse (input.F_IsVisit);
+                }
+                catch
+                {
+                    model.F_IsVisit =1;
+                }
+               
             }
             return model;
         }

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

@@ -648,7 +648,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 是否建议回访（是，否）此项若选是，则流转到客服-待回访工单，若选否，则流转至客服待完结工单
         /// </summary>
-        public int? F_IsVisit
+        public string  F_IsVisit
         {
             get; set;
         }
@@ -793,6 +793,13 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
+        ///// <summary>
+        ///// 客户渠道类型
+        ///// </summary>
+        public string  F_Canal
+        {
+            get; set;
+        }
     }
 }
 public class Questions