管理中心数据读取bug,工单测试后bug,微信登录获取rolecode

codegit/CallCenterApi/CallCenterAPI.WechatSDK/Models/WxLoginDto.cs

@@ -13,6 +13,7 @@ namespace CallCenterAPI.WechatSDK.Models
         #region 坐席登录所需
         public string UserCode { get; set; }
         public string Password { get; set; }
+        public string RoleCode { get; set; }
         /// <summary>
         /// 返回时候用：用户角色（坐席表用户【-1管理员 1--接待部（客服端） 2--办理人员 3--区域客服 4--监管】，客户档案用户【5用户端】） 
         /// 登陆时候用： 1员工端，2业主端

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -2,6 +2,7 @@
 using CallCenterApi.Common;
 using CallCenterApi.Interface.Controllers.Base;
 using CallCenterApi.Interface.Controllers.workorder;
+using CallCenterApi.Interface.Models.Enum;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -249,10 +250,15 @@ namespace CallCenterApi.Interface.Controllers
                         }
 
                         BLL.T_Wo_WorkOrder bll = new BLL.T_Wo_WorkOrder();
-                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =2 and IsDel=0 ").Tables[0];
-                        var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State in (0,1) and IsDel=0 ").Tables[0];
-                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =2 and IsDel=0 ").Tables[0];
-                        var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State in (0,1) and IsDel=0 ").Tables[0];
+                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
+                        var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State <" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
+                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
+                        var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State <" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
+                        #region
+                        //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =2 and IsDel=0 ").Tables[0];
+                        //var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State in (0,1) and IsDel=0 ").Tables[0];
+                        //var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =2 and IsDel=0 ").Tables[0];
+                        //var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State in (0,1) and IsDel=0 ").Tables[0];
 
                         ////日已完成
                         //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =1 and IsDel=0 ").Tables[0];
@@ -262,7 +268,7 @@ namespace CallCenterApi.Interface.Controllers
                         //var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =1 and IsDel=0 ").Tables[0];
                         ////月未完成
                         //var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State=0 and IsDel=0 ").Tables[0];
-
+                        #endregion
                         var obj = new
                         {
                             daywc = list1.Rows.Count,
@@ -517,29 +523,37 @@ namespace CallCenterApi.Interface.Controllers
                         if (ua.F_RoleId != 17)
                         {
                             uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
-                            uwhere += " and State =0 ";
+                            uwhere += " and State =" + (int)EnumWorkOrderState.neworder + " ";
+                            //uwhere += " and State =0 ";
                         }
                         //2、待接单的
-                        string djdwhere = " 1=1 and State =1 and WorkOrderID in ( " + woController.GetDJDWorkOrderID(ua.F_UserCode) + ") ";
+                        string djdwhere = $" 1=1 and State =" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.ID in ( " + woController.GetDJDWorkOrderID(ua.F_UserCode) + ") ";//" 1=1 and State =1 and WorkOrderID in ( " + woController.GetDJDWorkOrderID(ua.F_UserCode) + ") ";
                         //3、待完成（处理）的
-                        string dclwhere = " 1=1 and State =1 and WorkOrderID in ( " + woController.GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                        string dclwhere = $" 1=1 and State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and T_Wo_WorkOrder.ID in ( " + woController.GetDWCWorkOrderID(ua.F_UserCode) + ") ";//" 1=1 and State =1 and WorkOrderID in ( " + woController.GetDWCWorkOrderID(ua.F_UserCode) + ") ";
                         //4、已处理的
-                        string yclwhere = " 1=1 and State =2 and LastDealUser = '" + ua.F_UserCode + "' ";
+                        string yclwhere = $" 1=1 and State =" + (int)EnumWorkOrderState.finish + " and LastDealUser = '" + ua.F_UserCode + "' ";//" 1=1 and State =2 and LastDealUser = '" + ua.F_UserCode + "' ";
                         //5、我参与的
-                        string wcywhere = " 1=1 and  (CreateUser= '" + ua.F_UserCode + "' or WorkOrderID in ( " + woController.GetCYWorkOrderID(ua.F_UserCode) + ")) ";
+                        string wcywhere = $" 1=1 and (CreateUser= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.ID in ( " + woController.GetCYWorkOrderID(ua.F_UserCode) + ")) ";//" 1=1 and  (CreateUser= '" + ua.F_UserCode + "' or WorkOrderID in ( " + woController.GetCYWorkOrderID(ua.F_UserCode) + ")) ";
                         //5、超期工单
-                        string cqwhere = $" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < 2  ";
+                        string cqwhere = $" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < " + (int)EnumWorkOrderState.finish + " ";//$" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < 2  ";
                         //5、未审核微信工单
                         string wxwhere = $" 1=1 ";  // ANd Type = (SELECT F_DictionaryValueId FROM dbo.T_Sys_DictionaryValue (NOLOCK) WHERE F_DictionaryFlag = 'GDLY' AND F_Name = '微信')
                         var obj = new
                         {
-                            dpd = bll.GetList(uwhere + sql+ " and State=0 and IsAudit = 1 ").Tables[0].Rows.Count,                    //待指派的统计
-                            djd = bll.GetList(djdwhere + sql + " and State =1 and IsAudit = 1 ").Tables[0].Rows.Count,    //待接单的统计
-                            dcl = bll.GetList(dclwhere + sql + " and State =1 and IsAudit = 1 ").Tables[0].Rows.Count,    //待处理的统计
-                            ycl = bll.GetList(yclwhere + sql + " and State =2 and IsAudit = 1 ").Tables[0].Rows.Count,    //已处理的统计
+                            dpd = bll.GetList(uwhere + sql + " and State=" + (int)EnumWorkOrderState.neworder + " and IsAudit = 1 ").Tables[0].Rows.Count,                    //待指派的统计
+                            djd = bll.GetList(djdwhere + sql + " and State =" + (int)EnumWorkOrderState.assign + " and IsAudit = 1 ").Tables[0].Rows.Count,    //待接单的统计
+                            dcl = bll.GetList(dclwhere + sql + " and State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and IsAudit = 1 ").Tables[0].Rows.Count,    //待处理的统计
+                            ycl = bll.GetList(yclwhere + sql + " and State =" + (int)EnumWorkOrderState.finish + " and IsAudit = 1 ").Tables[0].Rows.Count,    //已处理的统计
                             wyc = bll.GetList(wcywhere + sql + " and IsAudit = 1 ").Tables[0].Rows.Count,    //我参与的的统计
-                            cq = bll.GetList(cqwhere + sql + " AND State < 2 and IsAudit = 1 ").Tables[0].Rows.Count,    //超期工单的统计
+                            cq = bll.GetList(cqwhere + sql + " AND State < " + (int)EnumWorkOrderState.finish + " and IsAudit = 1 ").Tables[0].Rows.Count,    //超期工单的统计
                             wx = bll.GetList(wxwhere + sql + " and IsAudit = 0 ").Tables[0].Rows.Count,    //微信工单的统计
+                            //dpd = bll.GetList(uwhere + sql+ " and State=0 and IsAudit = 1 ").Tables[0].Rows.Count,                    //待指派的统计
+                            //djd = bll.GetList(djdwhere + sql + " and State =1 and IsAudit = 1 ").Tables[0].Rows.Count,    //待接单的统计
+                            //dcl = bll.GetList(dclwhere + sql + " and State =1 and IsAudit = 1 ").Tables[0].Rows.Count,    //待处理的统计
+                            //ycl = bll.GetList(yclwhere + sql + " and State =2 and IsAudit = 1 ").Tables[0].Rows.Count,    //已处理的统计
+                            //wyc = bll.GetList(wcywhere + sql + " and IsAudit = 1 ").Tables[0].Rows.Count,    //我参与的的统计
+                            //cq = bll.GetList(cqwhere + sql + " AND State < 2 and IsAudit = 1 ").Tables[0].Rows.Count,    //超期工单的统计
+                            //wx = bll.GetList(wxwhere + sql + " and IsAudit = 0 ").Tables[0].Rows.Count,    //微信工单的统计
                             //djd = new BLL.T_Wo_WorkOrderItem().GetModelList(" IsDel=0 and Type=1 and (state='0' and ','+ToUser+',' like '%," + ua.F_UserCode + ",%')  ").Select(p => p.WorkOrderID).Distinct().Count(),
                             //dcl = new BLL.T_Wo_WorkOrderItem().GetModelList(" IsDel=0 and Type=1 and (state='1' and SureUser='" + ua.F_UserCode + "')  ").Select(p => p.WorkOrderID).Distinct().Count()
                         };

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

@@ -19,6 +19,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
     public class WxLoginController : BaseController
     {
         private readonly BLL.T_Sys_UserAccount userAccountBLL = new BLL.T_Sys_UserAccount();
+        private readonly BLL.T_Sys_RoleInfo roleBLL = new BLL.T_Sys_RoleInfo();
         private readonly BLL.T_Cus_CustomerBaseNew customerBaseBLL = new BLL.T_Cus_CustomerBaseNew();
         private readonly BLL.T_Cus_CustomerFinance finbll = new BLL.T_Cus_CustomerFinance();
         private readonly BLL.T_Wo_WorkOrder woBLL = new BLL.T_Wo_WorkOrder();
@@ -77,15 +78,19 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     //var user = userAccountBLL.GetModel(login.UserCode);   //20180926 次方法查询有漏洞
                     var user = userAccountBLL.DataTableToList(dt).ToList().FirstOrDefault();
                     user.F_WxOpenId = login.OpenId;
-                    int UserType = 0;
+                    int UserType = 0;string rolecode = "";
 
                     //部门
                     Model.T_Sys_Department modelDep = new BLL.T_Sys_Department().GetModel(user.F_DeptId);
                     if (modelDep == null)
                         return Error("获取失败!");
-
-                    #region 部门角色
-                    //部门角色（-1管理员，1接待部，2案场经理、项目负责人,3销售部总经理、物业部总经理、工程总经理、设计总经理,4区域客服，5业主（客户档案））
+                    #region 读取角色code
+                    var rolemodel = roleBLL.GetModel(user.F_RoleId);
+                    if (rolemodel != null)
+                        rolecode = rolemodel.F_RoleCode;
+                    #endregion
+                        #region 部门角色
+                        //部门角色（-1管理员，1接待部，2案场经理、项目负责人,3销售部总经理、物业部总经理、工程总经理、设计总经理,4区域客服，5业主（客户档案））
                     if (user.F_RoleId == 17 || user.F_RoleId == 57)
                     {
                         //-1管理员
@@ -127,7 +132,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         openid = login.OpenId,
                         usercode = login.UserCode,
-                        usertype = UserType
+                        usertype = UserType,
+                        rolecode=rolecode,
                     };
 
                     if (userAccountBLL.Update(user))
@@ -339,7 +345,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (modelDep == null)
                         return Error("获取失败!");
                     wld.UserCode = usertemp.F_UserCode;
-
+                    #region 读取角色code
+                    var rolemodel = roleBLL.GetModel(usertemp.F_RoleId);
+                    if (rolemodel != null)
+                        wld.RoleCode = rolemodel.F_RoleCode;
+                    #endregion
                     #region 部门角色
                     if (usertemp.F_RoleId == 17)
                     {
@@ -410,6 +420,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 openid = wld.OpenId,
                 usercode = wld.UserCode,
                 usertype = wld.UserType,
+                rolecode = wld.RoleCode,
             };
             return Success("成功", newobj);
         }

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

@@ -195,7 +195,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
                             }
-                            sql += " and State =0 " + uwhere;
+                            sql += " and State =" + (int)EnumWorkOrderState.neworder + " " + uwhere;
                             break;
                         case "1"://待接单的
                             sql += " and State ="+ (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.ID in ( " + GetDJDWorkOrderID(ua.F_UserCode) + ") ";
@@ -403,7 +403,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public string GetDJDWorkOrderID(string user)
         {
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where Type=" + (int)EnumItemType.deal 
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal 
                 + " and F_WoState="+ (int)EnumWorkOrderState.assign
                 + " and isnull(F_IsUsed,'0')='0' and F_NextUser='" + user + "' ";
            
@@ -418,7 +418,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             string str = string.Empty;
 
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where Type=" + (int)EnumItemType.deal
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
                 + " and ("
                     +"(F_WoState in(" + (int)EnumWorkOrderState.dealing + ","+ (int)EnumWorkOrderState.receive + ") and F_CreateUser='" + user + "') "//办理中和接单状态的操作人
                     +" or (F_WoState="+ (int)EnumWorkOrderState.reback + " and F_NextUser='" + user + "')"//退回下一步操作人
@@ -1031,54 +1031,55 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         var res = RemindWO(ua, model, cont);
                         if (res)
-                            Success("催办成功！");
+                            return Success("催办成功！");
                         else
-                            Success("操作失败！");
+                            return Error("操作失败！");
                     }
                     return Error("工单不存在！");
                 }
             }
             return Error("无操作权限！");
         }
-        /// <summary>
-        /// 审核
-        /// </summary>
-        [Authority]
-        public ActionResult AuditWorkOrder(long orderid, string note, int iseffective = 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 = bll.GetModel(orderid);
-                    if (model != null)
-                    {
-                        if (iseffective == 1 && string.IsNullOrEmpty(note))
-                            return Error("请输入无效原因，如不填写，工单无法创建");
 
-                        model.IsAudit = 1;
-                        model.AuditTime = DateTime.Now;
-                        model.IsEffective = iseffective;    //是否有效工单项(0有效，1无效)
-                        if (iseffective == 1)
-                            model.Province = System.Web.HttpUtility.UrlDecode(note, System.Text.Encoding.UTF8); //备注
-                        if (bll.Update(model))
-                        {
-                            AddLog(model.ID, model.State.Value, "", (int)EnumItemType.deal, (int)EnumItemOpt.audit, "", 0, ua);
-                            return Success("操作成功");
-                        }
-                        return Error("操作失败");
-                    }
-                    else
-                        return Error("工单不存在");
-                }
-            }
-            return Error("无操作权限！");
-        }
         #endregion
         #region 暂时不用
         ///// <summary>
+        ///// 审核
+        ///// </summary>
+        //[Authority]
+        //public ActionResult AuditWorkOrder(long orderid, string note, int iseffective = 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 = bll.GetModel(orderid);
+        //            if (model != null)
+        //            {
+        //                if (iseffective == 1 && string.IsNullOrEmpty(note))
+        //                    return Error("请输入无效原因，如不填写，工单无法创建");
+
+        //                model.IsAudit = 1;
+        //                model.AuditTime = DateTime.Now;
+        //                model.IsEffective = iseffective;    //是否有效工单项(0有效，1无效)
+        //                if (iseffective == 1)
+        //                    model.Province = System.Web.HttpUtility.UrlDecode(note, System.Text.Encoding.UTF8); //备注
+        //                if (bll.Update(model))
+        //                {
+        //                    AddLog(model.ID, model.State.Value, "", (int)EnumItemType.deal, (int)EnumItemOpt.audit, "", 0, ua);
+        //                    return Success("操作成功");
+        //                }
+        //                return Error("操作失败");
+        //            }
+        //            else
+        //                return Error("工单不存在");
+        //        }
+        //    }
+        //    return Error("无操作权限！");
+        //}
+        ///// <summary>
         ///// 导出工单列表
         ///// </summary>
         ///// <returns></returns>
@@ -2354,13 +2355,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         public bool RemindWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont)
         {
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.ID + "' F_IsUsed=0 order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.ID + "' and F_IsUsed=0 order by F_CreateTime desc").FirstOrDefault();
             #region 接收人
             int todept = 0; string touser = "";
             if (itemlast != null)
             {
-                todept = itemlast.F_NextDept.Value;
                 touser = itemlast.F_NextUser;
+                if (!string.IsNullOrWhiteSpace(touser))
+                    touser = itemlast.F_CreateUser;
                 #region 读取当前登录人部门
                 string deptname = "";
                 var deptmodel = sysDeptBll.GetModel(nowUser.F_DeptId);
@@ -2370,7 +2372,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 #endregion
                 var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")催办工单，单号：" + model.WorkOrderID + "，催办说明：" + cont;
-                long itemid = AddLog(model.ID, model.State.Value, "", (int)EnumItemType.urge, (int)EnumItemOpt.urge, touser, todept, nowUser);
+                long itemid = AddLog(model.ID, model.State.Value, content, (int)EnumItemType.urge, (int)EnumItemOpt.urge, touser, todept, nowUser);
                 if (itemid > 0)
                 {
                     sendsysmsg(model, nowUser, touser, Int32.Parse(itemid.ToString()), "催办");