工单列表调整

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

@@ -279,13 +279,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
             string remark = HttpUtility.UrlDecode(RequestString.GetFormString("remark"));
             string infotype = HttpUtility.UrlDecode(RequestString.GetFormString("infotype"));
             string unit = HttpUtility.UrlDecode(RequestString.GetFormString("unit"));
+            int issend = RequestString.GetFormInt("issend", 0);
             //int infotypeid = RequestString.GetFormInt("infotypeid", 0);
             //int unitid = RequestString.GetFormInt("unitid", 0);
 
             string stropenid = HttpUtility.UrlDecode(RequestString.GetFormString("openid"));
 
             workorder.WorkOrderController wo = new workorder.WorkOrderController();
-            bool res = wo.DealWorkOrders(orderid, customer,inqtime,inquser,country,address,detail,detail,answer,remark, infotype, unit, stropenid);
+            bool res = wo.DealWorkOrders(orderid,issend, customer,inqtime,inquser,country,address,detail,detail,answer,remark, infotype, unit, stropenid);
 
             if (res)
             {

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

@@ -46,14 +46,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 int pageindex = 1;
                 string strpagesize = RequestString.GetQueryString("pagesize");
                 int pagesize = 10;
-
+                #region 条件
                 if (strorderid.Trim() != "" && strorderid != "undefined")
                 {
                     sql += " and WorkOrderID like '%" + strorderid.Trim() + "%' ";
                 }
                 if (strstate.Trim() != "" && strstate != "undefined")
                 {
-                    sql += " and State = '" + strstate.Trim() + "' ";
+                    if(strstate.Trim()=="0")
+                        sql += " and State <> '2' ";
+                    else
+                        sql += " and State = '2' ";
+                    //需求只展示是否完成
+                    //20180518 zhengbingbing
+                    //sql += " and State = '" + strstate.Trim() + "' ";
                 }
                 if (strtype.Trim() != "" && strtype != "undefined")
                 {
@@ -83,7 +89,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += " and datediff(day,CreateTime,'" + strendtime + "')>=0   ";
                 }
-
+                #endregion
                 if (strpageindex.Trim() != "")
                 {
                     pageindex = Convert.ToInt32(strpageindex);
@@ -151,26 +157,45 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         string strpagesize = RequestString.GetQueryString("pagesize");
                         int pagesize = 10;
 
+                        #region 息县需求变动
                         switch (strltype)
                         {
-                            case "0"://待指派的
+                            case "0"://待处理和处理中
                                 //sql += " and State ='0' and CreateUser= '" + ua.F_UserCode + "' ";
-                                sql += " and State ='0'  ";
+                                sql += " and (State ='0' or( State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(ua.F_UserCode) + "')) )";
                                 break;
-                            //case "1"://待接单的
-                            //    sql += " and State ='1' and WorkOrderID in ( '" + GetDJDWorkOrderID(ua.F_UserCode) + "') ";
-                            //    break;
-                            case "2"://待完成的
-                                sql += " and State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(ua.F_UserCode) + "') ";
-                                break;
-                            case "3"://已完成的
+                            case "1"://已完成的
                                 sql += " and State ='2' and LastDealUser = '" + ua.F_UserCode + "' ";
                                 break;
-                            case "4"://我参与的
+                            case "2"://我参与的
                                 sql += " and (CreateUser= '" + ua.F_UserCode + "' or WorkOrderID in ( '" + GetCYWorkOrderID(ua.F_UserCode) + "')) ";
                                 break;
                         }
+                        #region
+                        //20180518 zhengbingbing
+                        //switch (strltype)
+                        //{
+                        //    case "0"://待指派的
+                        //        //sql += " and State ='0' and CreateUser= '" + ua.F_UserCode + "' ";
+                        //        sql += " and State ='0'  ";
+                        //        break;
+                        //    //case "1"://待接单的
+                        //    //    sql += " and State ='1' and WorkOrderID in ( '" + GetDJDWorkOrderID(ua.F_UserCode) + "') ";
+                        //    //    break;
+                        //    case "2"://待完成的
+                        //        sql += " and State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(ua.F_UserCode) + "') ";
+                        //        break;
+                        //    case "3"://已完成的
+                        //        sql += " and State ='2' and LastDealUser = '" + ua.F_UserCode + "' ";
+                        //        break;
+                        //    case "4"://我参与的
+                        //        sql += " and (CreateUser= '" + ua.F_UserCode + "' or WorkOrderID in ( '" + GetCYWorkOrderID(ua.F_UserCode) + "')) ";
+                        //        break;
+                        //}
+                        #endregion
+                        #endregion
 
+                        #region 条件
                         if (strorderid.Trim() != "" && strorderid != "undefined")
                         {
                             sql += " and WorkOrderID like '%" + strorderid.Trim() + "%' ";
@@ -203,7 +228,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             sql += " and ISReward=" + strisreward.Trim();
                         }
-
+                        #endregion
                         if (strpageindex.Trim() != "")
                         {
                             pageindex = Convert.ToInt32(strpageindex);
@@ -249,7 +274,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             string str = string.Empty;
 
-            var list = new BLL.T_Wo_WorkOrderItem().GetModelList(" IsDel=0 and Type=1 and (state='1' and ','+ToUser+',' like '%," + user + ",%')    ").Select(p => p.WorkOrderID).Distinct();
+            var list = new BLL.T_Wo_WorkOrderItem().GetModelList(" IsDel=0 and Type=1 and (state<>'2' and ','+ToUser+',' like '%," + user + ",%')    ").Select(p => p.WorkOrderID).Distinct();
 
             foreach (var l in list)
             {
@@ -1030,6 +1055,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 model.Remark = remark;
 
                             #endregion
+                            if (isend == 1)
+                                model.State = 2;
+                            else
+                                model.State = 1;
 
                             var rerere = new BLL.T_Wo_WorkOrder().Update(model);
                             #region 无需走流程
@@ -1043,17 +1072,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (rerere)
                             {
                                 #region 消息通知
-                                Model.T_Wo_WorkOrderItem item = new BLL.T_Wo_WorkOrderItem().GetModelList(" WorkOrderID='" + orderid + "' and Type=1 ").OrderByDescending(p => p.CreateTime).FirstOrDefault();
-
-                                string strmsg = string.Empty;
-                                if (item.IsLast == 0)
-                                {
-                                    strmsg = ua.F_UserName + "给你指派了工单，单号：" + model.WorkOrderID;
-                                }
-                                else if (item.IsLast == 1)
-                                {
-                                    strmsg = ua.F_UserName + "完结了工单，单号：" + model.WorkOrderID;
-                                }
+                                //Model.T_Wo_WorkOrderItem item = new BLL.T_Wo_WorkOrderItem().GetModelList(" WorkOrderID='" + orderid + "' and Type=1 ").OrderByDescending(p => p.CreateTime).FirstOrDefault();
+
+                                //string strmsg = string.Empty;
+                                //if (item.IsLast == 0)
+                                //{
+                                //    strmsg = ua.F_UserName + "给你指派了工单，单号：" + model.WorkOrderID;
+                                //}
+                                //else if (item.IsLast == 1)
+                                //{
+                                //    strmsg = ua.F_UserName + "完结了工单，单号：" + model.WorkOrderID;
+                                //}
                                 #endregion
                                 #region 插入操作记录
                                 Model.T_Wo_Operation oper = new Model.T_Wo_Operation();
@@ -1063,7 +1092,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 oper.F_File = model.Files;
 
                                 string userinfo = ua.depname + "-" + ua.F_UserName + "(" + ua.F_UserCode + ")";
-                                if (model.State == 1)
+                                if (model.State <2)
                                 {
                                     oper.F_Message = userinfo + " 指派了工单，单号：" + model.WorkOrderID;
                                 }
@@ -1159,7 +1188,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         }
 
         //微信处理工单
-        public bool DealWorkOrders(string orderid, string customer, string inqtime, 
+        public bool DealWorkOrders(string orderid, int isend, string customer, string inqtime, 
             string inquser, string country, string address, string detail, string cont, 
             string answer, string remark,string infotype, string unit, string openid)
             //int infotypeid, int unitid, string openid)
@@ -1222,18 +1251,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             model.Remark = remark;
                         #endregion
 
-                        int n = new BLL.T_Wo_WorkOrder().DealWorkOrder1(model.WorkOrderID, 1
-                                , model.Customer, model.CustomerTel, inqtimes, model.Inquser
-                                , model.County, model.Address, model.Detail, model.Clcontent, model.Answer, model.Remark
-                                , ua.F_DeptId, ua.F_UserCode, ua.F_UserCode, model.InfoType, model.InfoTypeID.Value, model.UnitID.Value, model.Unit);
-                        
-                        if (n > 0)
+                        if (isend == 1)
+                            model.State = 2;
+                        else
+                            model.State = 1;
+                        var rerere = new BLL.T_Wo_WorkOrder().Update(model);
+                        #region 无需走流程
+                        //int n = new BLL.T_Wo_WorkOrder().DealWorkOrder1(model.WorkOrderID, 1
+                        //        , model.Customer, model.CustomerTel, inqtimes, model.Inquser
+                        //        , model.County, model.Address, model.Detail, model.Clcontent, model.Answer, model.Remark
+                        //        , ua.F_DeptId, ua.F_UserCode, ua.F_UserCode, model.InfoType, model.InfoTypeID.Value, model.UnitID.Value, model.Unit);
+
+                        //if (n > 0)
+                        #endregion
+                        if (rerere)
                         {
                             #region 消息通知
-                            Model.T_Wo_WorkOrderItem item = new BLL.T_Wo_WorkOrderItem().GetModelList(" WorkOrderID='" + orderid + "' and Type=1 ").OrderByDescending(p => p.CreateTime).FirstOrDefault();
+                            //Model.T_Wo_WorkOrderItem item = new BLL.T_Wo_WorkOrderItem().GetModelList(" WorkOrderID='" + orderid + "' and Type=1 ").OrderByDescending(p => p.CreateTime).FirstOrDefault();
 
-                            string strmsg = string.Empty;
-                            strmsg = ua.F_UserName + "通过微信完结了工单，单号：" + model.WorkOrderID;
+                            //string strmsg = string.Empty;
+                            //strmsg = ua.F_UserName + "通过微信完结了工单，单号：" + model.WorkOrderID;
                            
                             #endregion
 
@@ -2071,14 +2108,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string strcode = HttpUtility.UrlDecode(RequestString.GetQueryString("code"));
                 string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
                 string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
-
+                #region 条件
                 if (strorderid.Trim() != "" && strorderid != "undefined")
                 {
                     sql += " and WorkOrderID like '%" + strorderid.Trim() + "%' ";
                 }
                 if (strstate.Trim() != "" && strstate != "undefined")
                 {
-                    sql += " and State = '" + strstate.Trim() + "' ";
+                    if (strstate.Trim() == "0")
+                        sql += " and State <> '2' ";
+                    else
+                        sql += " and State = '2' ";
+
+                    //20180518 zhengbingbing
+                    //sql += " and State = '" + strstate.Trim() + "' ";
                 }
                 if (strtype.Trim() != "" && strtype != "undefined")
                 {
@@ -2108,7 +2151,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += " and datediff(day,CreateTime,'" + strendtime + "')>=0   ";
                 }
-
+                #endregion
                 sql = " select WorkOrderID as '工单编号',( case isnull(Type,0) when 1 then '咨询' when 3 then '投诉建议' else '' end) as '工单类型',"
                     + " Detail as '工单内容',Customer as '客户名称',CustomerTel as '客户电话',"
                     + " (case isnull(State,0) when 0 then '未指派' when 1 then '处理中' when 2 then '已完结' else '' end ) as '工单状态',"
@@ -2158,24 +2201,42 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
                         string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
 
+                        #region 息县需求变动
                         switch (strltype)
                         {
-                            case "0"://我创建的
-                                sql += " and State ='0' and CreateUser= '" + ua.F_UserCode + "' ";
-                                break;
-                            //case "1"://待接单的
-                            //    sql += " and State ='1' and WorkOrderID in ( '" + GetDJDWorkOrderID(ua.F_UserCode) + "') ";
-                            //    break;
-                            case "2"://待完成的
-                                sql += " and State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(ua.F_UserCode) + "') ";
+                            case "0"://待处理和处理中
+                                //sql += " and State ='0' and CreateUser= '" + ua.F_UserCode + "' ";
+                                sql += " and (State ='0' or( State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(ua.F_UserCode) + "')) )";
                                 break;
-                            case "3"://已完成的
+                            case "1"://已完成的
                                 sql += " and State ='2' and LastDealUser = '" + ua.F_UserCode + "' ";
                                 break;
-                            case "4"://我参与的
+                            case "2"://我参与的
                                 sql += " and (CreateUser= '" + ua.F_UserCode + "' or WorkOrderID in ( '" + GetCYWorkOrderID(ua.F_UserCode) + "')) ";
                                 break;
                         }
+                        #region
+                        //20180518 zhengbingbing
+                        //switch (strltype)
+                        //{
+                        //    case "0"://我创建的
+                        //        sql += " and State ='0' and CreateUser= '" + ua.F_UserCode + "' ";
+                        //        break;
+                        //    //case "1"://待接单的
+                        //    //    sql += " and State ='1' and WorkOrderID in ( '" + GetDJDWorkOrderID(ua.F_UserCode) + "') ";
+                        //    //    break;
+                        //    case "2"://待完成的
+                        //        sql += " and State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(ua.F_UserCode) + "') ";
+                        //        break;
+                        //    case "3"://已完成的
+                        //        sql += " and State ='2' and LastDealUser = '" + ua.F_UserCode + "' ";
+                        //        break;
+                        //    case "4"://我参与的
+                        //        sql += " and (CreateUser= '" + ua.F_UserCode + "' or WorkOrderID in ( '" + GetCYWorkOrderID(ua.F_UserCode) + "')) ";
+                        //        break;
+                        //}
+                        #endregion
+                        #endregion
 
                         if (strorderid.Trim() != "" && strorderid != "undefined")
                         {