调整工单后bug

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

@@ -228,55 +228,56 @@ namespace CallCenterApi.Interface.Controllers
                     Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
                     if (ua != null)
                     {
-                        var date = DateTime.Now;//DateTime.Parse("2015-04-14"); //
-                        string strDate = date.ToString("yyyy-MM-dd");
-                        string strMonth = date.ToString("yyyy-MM");
-
-                        //BLL.T_Wo_WorkOrderBase bll = new BLL.T_Wo_WorkOrderBase();
-                        //var list1 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
-                        //var list2 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
-                        //var list3 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
-                        //var list4 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
-                        //部门信息
-                        var modelDep = new BLL.T_Sys_Department().GetModel(deptid);
-                        int depType = 0;
-                        if (modelDep != null)
-                            depType = modelDep.F_Type ?? 0;  //部门操作权限：1接待部，2办理人员，3区域客服，4监管
-
-                        string uwhere = " 1=1 ";
-                        if (ua.F_RoleId != 17 && depType != 1 && depType != 3)
-                        {
-                            uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
-                        }
+                        //var date = DateTime.Now;//DateTime.Parse("2015-04-14"); //
+                        //string strDate = date.ToString("yyyy-MM-dd");
+                        //string strMonth = date.ToString("yyyy-MM");
+
+                        ////BLL.T_Wo_WorkOrderBase bll = new BLL.T_Wo_WorkOrderBase();
+                        ////var list1 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
+                        ////var list2 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
+                        ////var list3 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
+                        ////var list4 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
+                        ////部门信息
+                        //var modelDep = new BLL.T_Sys_Department().GetModel(deptid);
+                        //int depType = 0;
+                        //if (modelDep != null)
+                        //    depType = modelDep.F_Type ?? 0;  //部门操作权限：1接待部，2办理人员，3区域客服，4监管
 
-                        BLL.T_Wo_WorkOrder bll = new BLL.T_Wo_WorkOrder();
-                        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];
-                        ////日未完成
-                        //var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State=0 and IsDel=0 ").Tables[0];
-                        ////月已完成
-                        //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,
-                            daywwc = list2.Rows.Count,
-                            monwc = list3.Rows.Count,
-                            monwwc = list4.Rows.Count
-                        };
-                        res = Success("成功", obj);
+                        //string uwhere = " 1=1 ";
+                        //if (ua.F_RoleId != 17 && depType != 1 && depType != 3)
+                        //{
+                        //    uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
+                        //}
+
+                        //BLL.T_Wo_WorkOrder bll = new BLL.T_Wo_WorkOrder();
+                        //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];
+                        //////日未完成
+                        ////var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State=0 and IsDel=0 ").Tables[0];
+                        //////月已完成
+                        ////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,
+                        //    daywwc = list2.Rows.Count,
+                        //    monwc = list3.Rows.Count,
+                        //    monwwc = list4.Rows.Count
+                        //};
+                        //res = Success("成功", obj);
+                        res = Success("成功");
                     }
                 }
             }
@@ -350,86 +351,88 @@ namespace CallCenterApi.Interface.Controllers
                     Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
                     if (ua != null)
                     {
-                        var date = DateTime.Now;//DateTime.Parse("2015-04-05"); //
-                        string strDate = date.ToString("yyyy-MM");
-
-                        int days = DateTime.DaysInMonth(date.Year, date.Month);
-
-                        string[] strcols = { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10",
-                                  "11", "12", "13", "14", "15", "16", "17", "18", "19", "20",
-                                  "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31" };
-                        int newcount = 0;
-                        List<string> cols = strcols.Take(days).ToList();
-                        BLL.T_Call_CallRecords telbll = new BLL.T_Call_CallRecords();
-                        //BLL.T_Wo_WorkOrderBase workbll = new BLL.T_Wo_WorkOrderBase();
-                        BLL.T_Wo_WorkOrder workbll = new BLL.T_Wo_WorkOrder();
-                        int[] teltotal = new int[days];
-                        int[] worktotal = new int[days];
-                        //部门信息
-                        var modelDep = new BLL.T_Sys_Department().GetModel(deptid);
-                        int depType = 0;
-                        if (modelDep != null)
-                            depType = modelDep.F_Type ?? 0;  //部门操作权限：1接待部，2办理人员，3区域客服，4监管
-
-                        string uwhere = " 1=1 ";
-                        string u1where = " 1=1 ";
-                        if (ua.F_RoleId != 17 && depType != 1 && depType != 3)
-                        {
-                            uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
-                            u1where += " and UserCode='" + ua.F_UserCode + "' ";
-                        }
+                        //    var date = DateTime.Now;//DateTime.Parse("2015-04-05"); //
+                        //    string strDate = date.ToString("yyyy-MM");
+
+                        //    int days = DateTime.DaysInMonth(date.Year, date.Month);
+
+                        //    string[] strcols = { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10",
+                        //              "11", "12", "13", "14", "15", "16", "17", "18", "19", "20",
+                        //              "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31" };
+                        //    int newcount = 0;
+                        //    List<string> cols = strcols.Take(days).ToList();
+                        //    BLL.T_Call_CallRecords telbll = new BLL.T_Call_CallRecords();
+                        //    //BLL.T_Wo_WorkOrderBase workbll = new BLL.T_Wo_WorkOrderBase();
+                        //    BLL.T_Wo_WorkOrder workbll = new BLL.T_Wo_WorkOrder();
+                        //    int[] teltotal = new int[days];
+                        //    int[] worktotal = new int[days];
+                        //    //部门信息
+                        //    var modelDep = new BLL.T_Sys_Department().GetModel(deptid);
+                        //    int depType = 0;
+                        //    if (modelDep != null)
+                        //        depType = modelDep.F_Type ?? 0;  //部门操作权限：1接待部，2办理人员，3区域客服，4监管
+
+                        //    string uwhere = " 1=1 ";
+                        //    string u1where = " 1=1 ";
+                        //    if (ua.F_RoleId != 17 && depType != 1 && depType != 3)
+                        //    {
+                        //        uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
+                        //        u1where += " and UserCode='" + ua.F_UserCode + "' ";
+                        //    }
 
-                        for (int i = 0; i < cols.Count; i++)
-                        {
-                            //var tellist = telbll.GetModelList(" UserId='" + userId + "' and CONVERT(varchar(10),BeginTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
-                            var tellist = telbll.GetModelList(u1where + " and CONVERT(varchar(10),BeginTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
-                            teltotal[i] = tellist.Count;
-                            newcount = newcount + tellist.Count;
-                            //var worklist = workbll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
-                            var worklist = workbll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
-                            worktotal[i] = worklist.Rows.Count;
-                        }
+                        //    for (int i = 0; i < cols.Count; i++)
+                        //    {
+                        //        //var tellist = telbll.GetModelList(" UserId='" + userId + "' and CONVERT(varchar(10),BeginTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
+                        //        var tellist = telbll.GetModelList(u1where + " and CONVERT(varchar(10),BeginTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
+                        //        teltotal[i] = tellist.Count;
+                        //        newcount = newcount + tellist.Count;
+                        //        //var worklist = workbll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
+                        //        var worklist = workbll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
+                        //        worktotal[i] = worklist.Rows.Count;
+                        //    }
 
-                        var olddate = date.AddYears(-1);
-                        string strold1 = olddate.ToString("yyyy-MM") + "-1";
-                        string strold2 = olddate.ToString("yyyy-MM-dd");
+                        //    var olddate = date.AddYears(-1);
+                        //    string strold1 = olddate.ToString("yyyy-MM") + "-1";
+                        //    string strold2 = olddate.ToString("yyyy-MM-dd");
 
-                        string bl = string.Empty;
-                        var oldcount = telbll.GetModelList(u1where + " and CONVERT(varchar(10),BeginTime, 23)>='" + strold1 + "' and CONVERT(varchar(10),BeginTime, 23)<='" + strold2 + "' ").Count;
+                        //    string bl = string.Empty;
+                        //    var oldcount = telbll.GetModelList(u1where + " and CONVERT(varchar(10),BeginTime, 23)>='" + strold1 + "' and CONVERT(varchar(10),BeginTime, 23)<='" + strold2 + "' ").Count;
 
-                        if (oldcount == newcount)
-                        {
-                            bl = " 持平";
-                        }
-                        else
-                        {
-                            if (newcount != 0)
-                            {
-                                if (oldcount > newcount)
-                                {
-                                    bl = " ↓ " + (Convert.ToDouble(oldcount - newcount) / Convert.ToDouble(newcount)).ToString("0.0%");
-                                }
-                                else if (oldcount < newcount)
-                                {
-                                    bl = " ↑ " + (Convert.ToDouble(newcount - oldcount) / Convert.ToDouble(newcount)).ToString("0.0%");
-                                }
-                            }
-                            else
-                            {
-                                bl = " --";
-                            }
-                        }
-
-                        var obj = new
-                        {
-                            bl = bl,
-                            col = cols.Select(p => p + "日"),
-                            worktotal = worktotal,
-                            teltotal = teltotal
-                        };
+                        //    if (oldcount == newcount)
+                        //    {
+                        //        bl = " 持平";
+                        //    }
+                        //    else
+                        //    {
+                        //        if (newcount != 0)
+                        //        {
+                        //            if (oldcount > newcount)
+                        //            {
+                        //                bl = " ↓ " + (Convert.ToDouble(oldcount - newcount) / Convert.ToDouble(newcount)).ToString("0.0%");
+                        //            }
+                        //            else if (oldcount < newcount)
+                        //            {
+                        //                bl = " ↑ " + (Convert.ToDouble(newcount - oldcount) / Convert.ToDouble(newcount)).ToString("0.0%");
+                        //            }
+                        //        }
+                        //        else
+                        //        {
+                        //            bl = " --";
+                        //        }
+                        //    }
 
-                        res = Success("成功", obj);
+                        //    var obj = new
+                        //    {
+                        //        bl = bl,
+                        //        col = cols.Select(p => p + "日"),
+                        //        worktotal = worktotal,
+                        //        teltotal = teltotal
+                        //    };
+
+                        //    res = Success("成功", obj);
+                        res = Success("成功");
                     }
+
                 }
 
             }
@@ -558,6 +561,7 @@ namespace CallCenterApi.Interface.Controllers
                         //    //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()
                         //};
                         //res = Success("成功", obj);
+                        res = Success("");
                     }
                 }
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -15,7 +15,7 @@ namespace CallCenterApi.Interface.Controllers.report
     {
         public ActionResult GetDataList(string stime, string endtime, int deptid = 0)
         {
-            DataTable dtNew = getData(stime, endtime, deptid);
+            DataTable dtNew = new DataTable();//getData(stime, endtime, deptid);
             var obj = new
             {
                 dtNew,
@@ -27,7 +27,8 @@ namespace CallCenterApi.Interface.Controllers.report
         public ActionResult ExptList(string stime, string endtime, int deptid = 0)
         {
             NPOIHelper npoi = new NPOIHelper();
-            DataTable dt = getData(stime, endtime, deptid);
+            DataTable dt = new DataTable();
+            //DataTable dt = getData(stime, endtime, deptid);
             if (npoi.ExportToExcel("业务报表数据", dt) == "")
             {
                 return Success("导出成功");