投诉日期分布表，工单表，工单修改

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

@@ -132,22 +132,43 @@ namespace CallCenterApi.Interface.Controllers.report
 
            
         }
-        private Date  RetuDate(string name,DateTime time ,List <Model .T_Bus_WorkOrder> modelList)
+
+        private class Timeslot
+        {
+            public int onetime { get; set; }
+            public int twotime { get; set; }
+            public int threetime { get; set; }
+            public int stime { get; set; }
+            public int etime { get; set; }
+        }
+        private Timeslot GetTimeslot (int mouth)
+        {
+            Timeslot timeslot = new Timeslot();
+            DateTime date = DateTime.Parse(DateTime.Now.ToString("yyyy") + "-" + mouth + "-01");
+            timeslot.onetime = date.AddMonths (-2).Month ;
+            timeslot.twotime = date.AddMonths(-1).Month;
+            timeslot.threetime = date.Month;
+            timeslot.stime = date.AddMonths(-11).Month;
+            timeslot.etime = date.AddMonths(-3).Month;
+            return timeslot;
+        }
+
+        private Date  RetuDate(string name, Timeslot timeslot, List <Model .T_Bus_WorkOrder> modelList)
         {
             Date date = new Date() ;
-            date.name = name;
+            date.name = DateTime .Parse (name).ToString ("MM月dd日")  ;
             date.total = 0;
             date.MonthCount1 = 0;
-            date.MonthCount1name = time.AddMonths(-11).Month + "-" + time.AddMonths(-4).Month + "月份日期";
+            date.MonthCount1name = timeslot.stime  + "-" + timeslot.etime  + "月份日期";
             date.MonthCountmix1 = "0.00%";
             date.MonthCount2 = 0;
-            date.MonthCount2name = time.AddMonths(-3).Month + "月份日期";
+            date.MonthCount2name = timeslot.onetime  + "月份日期";
             date.MonthCountmix2 = "0.00%";
             date.MonthCount3 = 0;
-            date.MonthCount3name = time.AddMonths(-2).Month + "月份日期";
+            date.MonthCount3name = timeslot.twotime  + "月份日期";
             date.MonthCountmix3 = "0.00%";
             date.MonthCount4 = 0;
-            date.MonthCount4name = time.AddMonths(-1).Month + "月份日期";
+            date.MonthCount4name = timeslot.threetime  + "月份日期";
             date.MonthCountmix4 = "0.00%";
             date.MonthCount5 = 0;
             date.MonthCount5name = "不清楚日期";
@@ -155,20 +176,31 @@ namespace CallCenterApi.Interface.Controllers.report
             for (int j = 0; j < modelList.Count; j++)
             {
                 string datetime = DateTime.Parse(modelList[j].F_CreateTime.ToString()).ToString("yyyy-MM-dd");
-                if (datetime == date.name)
+                if (datetime == name)
                 {
                     date.total++;
                     if (!string.IsNullOrEmpty(modelList[j].F_ProductDate))
                     {
-                        var pronos = DateTime.ParseExact(modelList[j].F_ProductDate, "yyyyMMdd", null).ToString("yyyy-MM-dd");
-                        var protime = Convert.ToDateTime(pronos);
-                        if (protime > time.AddMonths(-11) && protime < time.AddMonths(-3))
-                            date.MonthCount1++;
-                        if (protime > time.AddMonths(-3) && protime < time.AddMonths(-2))
+                        var pronos = DateTime.ParseExact(modelList[j].F_ProductDate, "yyyyMMdd", null).Month;
+                        if (timeslot.stime > timeslot.etime)
+                        {
+                            int t = 12 - timeslot.stime;
+                            if (pronos >= timeslot.stime && pronos <= 12)
+                                date.MonthCount1++;
+                            else if (pronos >= timeslot.etime)
+                                date.MonthCount1++;
+
+                        }
+                        else
+                        {
+                            if (pronos >= timeslot.stime && pronos <= timeslot.etime)
+                                date.MonthCount1++;
+                        }
+                        if (pronos == timeslot.onetime)
                             date.MonthCount2++;
-                        if (protime > time.AddMonths(-2) && protime < time.AddMonths(-1))
+                        if (pronos == timeslot.twotime)
                             date.MonthCount3++;
-                        if (protime > time.AddMonths(-1))
+                        if (pronos == timeslot.threetime)
                             date.MonthCount4++;
                     }
                     else
@@ -188,18 +220,6 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             return date;
         }
-        public ActionResult DistributionToExcel()
-        {
-            NPOIHelper npoi = new NPOIHelper();
-            if (npoi.DistributionToExcel(DateTime .Now  , null) == "")
-            {
-                return Success("导出成功");
-            }
-            else
-            {
-                return Error("导出失败");
-            }
-        }
         /// <summary>
         /// 产品日期分布情况表
         /// </summary>
@@ -213,11 +233,13 @@ namespace CallCenterApi.Interface.Controllers.report
          //   Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
             string sql = $"  F_IsDelete=0";
             DateTime time=DateTime .Now ;
+           
             DataTable dt = new DataTable();
             if (datetime != null )
             {
                 time =DateTime .Parse ( datetime.ToString ());
             }
+            Timeslot timeslot = GetTimeslot(time.Month );
             int days = System.Threading.Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(time.Year, time.Month-1);//获取天数
             DateTime lastmonth= time.AddMonths(-1);
             sql += " and F_CreateTime>='" + lastmonth.ToString ("yyyy-MM") +"-28" + " 00:00:00' ";
@@ -229,8 +251,8 @@ namespace CallCenterApi.Interface.Controllers.report
             #region 上月28号至最后一天
             for (int i=0;i< lastday;i ++)
             {
-               string  name = string.Format("{0}-{1}", lastmonth.ToString("yyyy-MM"), 27 + i) ;
-                product.dates.Add(RetuDate(name, time, modelList));
+               string  name = string.Format("{0}-{1}", lastmonth.ToString("yyyy-MM"), 28 + i) ;
+                product.dates.Add(RetuDate(name, timeslot, modelList));
             }
             #endregion
             #region 本月一号至27号
@@ -245,7 +267,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                    name = string.Format("{0}-{1}", time.ToString("yyyy-MM"), 1 + i);
                 }
-                product.dates.Add(RetuDate(name, time, modelList));
+                product.dates.Add(RetuDate(name, timeslot, modelList));
             }
             Date date = new Date();
             date.total = modelList.Count;
@@ -254,15 +276,26 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 if (!string.IsNullOrEmpty(modelList[j].F_ProductDate))
                 {
-                    var pronos = DateTime.ParseExact(modelList[j].F_ProductDate, "yyyyMMdd", null).ToString("yyyy-MM-dd");
-                    var protime = Convert.ToDateTime(pronos);
-                    if (protime > time.AddMonths(-11) && protime < time.AddMonths(-3))
-                        date.MonthCount1++;
-                    if (protime > time.AddMonths(-3) && protime < time.AddMonths(-2))
+                    var pronos = DateTime.ParseExact(modelList[j].F_ProductDate, "yyyyMMdd", null).Month ;
+                    if (timeslot.stime > timeslot.etime)
+                    {
+                        int t = 12 - timeslot.stime;
+                        if (pronos >= timeslot.stime && pronos <= 12)
+                            date.MonthCount1++;
+                        else if (pronos >= timeslot.etime)
+                            date.MonthCount1++;
+
+                    }
+                    else
+                    {
+                        if (pronos >= timeslot.stime  && pronos <= timeslot.etime)
+                            date.MonthCount1++;
+                    }
+                    if (pronos == timeslot.onetime )
                         date.MonthCount2++;
-                    if (protime > time.AddMonths(-2) && protime < time.AddMonths(-1))
+                    if (pronos == timeslot.twotime )
                         date.MonthCount3++;
-                    if (protime > time.AddMonths(-1))
+                    if (pronos == timeslot.threetime )
                         date.MonthCount4++;
                 }
                 else
@@ -314,6 +347,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     factory.proportion = string.Format("{0:f2}%", (float)factory.number / modelList.Count*100);
                     product.factory.Add(factory);
                 }
+                product.factory.Sort((a, b) => b.number.CompareTo(a.number));
                 Factory factor = new Factory();
                 factor.name = "合计";
                 factor.number = total;
@@ -343,6 +377,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     factory.proportion = string.Format("{0:f2}%", (float)factory.number / modelList.Count * 100);
                     product.problem.Add(factory);
                 }
+                product.problem.Sort((a, b) => b.number.CompareTo(a.number));
                 Factory factor = new Factory();
                 factor.name = "合计";
                 factor.number = total;
@@ -350,6 +385,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 factor.proportion = string.Format("{0:f2}%", (float)total / modelList.Count * 100);
                 product.problem.Add(factor);
             }
+           
             var productcode = new BLL.T_Sys_DictionaryValue().GetModelList("F_DictionaryFlag='CPDM'");
             product.product = new List<Factory>();
             if (productcode != null && modelList.Count > 0)
@@ -372,6 +408,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     factory.proportion = string.Format("{0:f2}%", (float)factory.number / modelList.Count * 100);
                     product.product.Add(factory);
                 }
+                product.product.Sort((a, b) => b.number.CompareTo(a.number));
                 Factory factor = new Factory();
                 factor.name = "合计";
                 factor.number = total;
@@ -379,6 +416,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 factor.proportion = string.Format("{0:f2}%", (float)total / modelList.Count * 100);
                 product.product.Add(factor);
             }
+           
             if (isdc > 0)
             {
                 NPOIHelper npoi = new NPOIHelper();

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

@@ -78,12 +78,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string code, string starttime, string endtime,string productType,string productDate, string batchNumber,string manufacturer,string problemCode,string notifications,string keywords, string dealTimely,int area = 0,int office=0,int duplicate=-1, int see = 0, int source = 0, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetList(string code, string starttime, string endtime,string productType,string productDate, string batchNumber,string manufacturer,string problemCode,string notifications,string keywords, string dealTimely,int area = 0,int office=0,int duplicate=-1, int see = 0, int source = 0, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10,int isdc=0,int istime=0 )
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                string sql = $" and F_IsDelete=0";
+                string sql = $"  F_IsDelete=0";
                 DataTable dt = new DataTable();
                 #region 筛选条件
                 if (type > 0 && type < 5)//工单类型
@@ -192,40 +192,117 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                 }
                 #endregion
-                int recordCount = 0;
-                if (!string.IsNullOrWhiteSpace(sql))
+                string str = "";
+                if (!string.IsNullOrEmpty(starttime))
                 {
-
-                    dt = BLL.PagerBLL.GetListPager(
-                        "T_Bus_WorkOrder",
-                        "F_Id",
-                        "*",
-                        sql,
-                        "ORDER BY T_Bus_WorkOrder.F_Id desc",
-                        pagesize,
-                        pageindex,
-                        true,
-                        out recordCount);
+                    str = DateTime.Parse(starttime).ToString("yyyy年MM月dd日") + "至" +
+                        DateTime.Parse(endtime).ToString("yyyy年MM月dd日") + "消费者重复投诉表";
+                }
+                else if (istime == 0&&isdc >0)
+                {
+                    sql +=  " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')<=0 ";
+                    sql += " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')>=0   ";
+                    str = DateTime.Now.ToString("yyyy年MM月dd日") + "消费者重复投诉表";
                 }
-                List<Model.T_Bus_WorkOrder> modlelist = new BLL.T_Bus_WorkOrder().DataTableToList(dt);
-                if (modlelist.Count > 0)
+                else if (istime> 0 && isdc > 0)
                 {
-                    List<WorkOrderInput> Input = modeltooip(modlelist);
-                    var obj = new
+                    sql +=  " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM")
+                      +  "-01"+ "')<=0 ";
+                    sql += " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')>=0   ";
+                    str = DateTime.Now.ToString("yyyy年MM月") + "消费者重复投诉表";
+                }
+                if (isdc > 0)
+                {
+                    var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql);
+                    #region 
+                    dt.Columns.Add("序号");
+                    dt.Columns.Add("姓名");
+                    dt.Columns.Add("地址");
+                    dt.Columns.Add("产品代码");
+                    dt.Columns.Add("产品名称");
+                    dt.Columns.Add("规格");
+                    dt.Columns.Add("生产日期");
+                    dt.Columns.Add("产品编码");
+                    dt.Columns.Add("生产厂家");
+                    dt.Columns.Add("问题代码");
+                    dt.Columns.Add("质量问题");
+                    dt.Columns.Add("通知人");
+                    dt.Columns.Add("接听人");
+                    dt.Columns.Add("落实情况");
+                    dt.Columns.Add("重复投诉日期");
+                    #endregion
+                    foreach (var it in depts)
+                    {
+                        DataRow drNew = dt.NewRow();
+                        #region 基本字段
+                        drNew["序号"] = it.F_SerialNumber;//序号
+                        drNew["姓名"] = it.F_CusName;//姓名
+                        drNew["地址"] = it.F_AddRess;//地址
+                        drNew["产品代码"] = it.F_ProductType;
+                        drNew["产品名称"] = it.F_ProductName;
+                        drNew["规格"] = it.F_Specifications;
+                        drNew["生产日期"] = it.F_ProductDate;
+                        drNew["产品编码"] = it.F_BatchNumber;
+                        drNew["生产厂家"] = it.F_Manufacturer;
+                        drNew["问题代码"] = it.F_ProblemCode;
+                        drNew["质量问题"] = it.F_QualityProblem;
+                        drNew["通知人"] = it.F_Notifications;
+                        drNew["接听人"] = it.F_ReceivingPerson;
+                        drNew["落实情况"] = it.F_ImplementationSituation;
+                        drNew["重复投诉日期"] = it.F_CreateTime;
+                        dt.Rows.Add(drNew);
+                        #endregion
+                    }
+                    NPOIHelper npoi = new NPOIHelper();
+                    if (npoi.ExportToExcel(str, dt) == "")
+                    {
+                        return Success("导出成功");
+                    }
+                    else
                     {
-                        state = "success",
-                        message = "成功",
-                        rows = Input,
-                        total = recordCount
-                    };
+                        return Error("导出失败");
 
-                    return Content(obj.ToJson()); ;
+                    }
                 }
                 else
                 {
+                    sql = "and" + sql;
+                    int recordCount = 0;
+                    if (!string.IsNullOrWhiteSpace(sql))
+                    {
+
+                        dt = BLL.PagerBLL.GetListPager(
+                            "T_Bus_WorkOrder",
+                            "F_Id",
+                            "*",
+                            sql,
+                            "ORDER BY T_Bus_WorkOrder.F_Id desc",
+                            pagesize,
+                            pageindex,
+                            true,
+                            out recordCount);
+                    }
+                    List<Model.T_Bus_WorkOrder> modlelist = new BLL.T_Bus_WorkOrder().DataTableToList(dt);
+                    if (modlelist.Count > 0)
+                    {
+                        List<WorkOrderInput> Input = modeltooip(modlelist);
+                        var obj = new
+                        {
+                            state = "success",
+                            message = "成功",
+                            rows = Input,
+                            total = recordCount
+                        };
 
-                    return Success("暂无工单"); ;
+                        return Content(obj.ToJson()); ;
+                    }
+                    else
+                    {
+
+                        return Success("暂无工单"); ;
+                    }
                 }
+               
             }
             else
             {
@@ -1090,6 +1167,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_Notifications = touser;//通知人
                 model.F_Largeareaid = F_Largeareaid;//转派大区id
                 model.F_Officeid = F_Officeid;//转派办事处id
+                model.F_Area = F_Largeareaid.ToString ();//转派大区id
+                model.F_Office = F_Officeid.ToString();//转派办事处id
                 model.F_Distribution = F_Distribution; //转派分销组id
                 model.F_DealUser = touser;//已接单待处理;//已接单待处理
                 workorderBLL.Update(model);

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

@@ -119,7 +119,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList( string keywords, string dealTimely, int see=0, int state = -1, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetList( string keywords, string dealTimely, int see=0, int state = -1, int pageindex = 1, int pagesize = 10,int Processing=0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -127,6 +127,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string sql = $" and F_IsDelete=0";
                 DataTable dt = new DataTable();
                 #region 筛选条件
+               
+                    if (Processing==1)
+                        sql += "AND F_State in(0,1,2,3,4,5,6)";
+                else if (Processing == 2)
+                    sql += "AND F_State in(10)";
+
+
+
                 if (!string.IsNullOrWhiteSpace(dealTimely))//重要级别
                     sql += $" and F_DealTimely = '" + dealTimely.Trim() + "'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
@@ -1106,8 +1114,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string touser = ""; string tousername = "";
             int deptid = 0;
             #region 获取接收人
-            if (clid != 0)
-            {
+          
                 Model.T_Sys_UserAccount clus = userBLL.GetModel(clid);
                 deptid = clus.F_DeptId;
                 if (clus != null)
@@ -1115,8 +1122,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     touser = clus.F_UserCode;
                     tousername = clus.F_UserName + "(" + clus.F_UserCode  + ")";
                 }
-            }
-
             #endregion
             #region 工单处理
             string opt = "";
@@ -1127,7 +1132,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int optbut = wostate ;
             #region 读取当前登录人部门
             string deptname = "";
-            var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
+            var deptmodel = departmentBLL.GetModel(clus.F_DeptId);
             int F_Largeareaid = 0, F_Officeid = 0,F_Distribution=0;
             if (deptmodel != null)
             {
@@ -1161,6 +1166,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 处理工单
                 model.F_State = wostate;
                 model.F_Notifications = touser;//通知人
+                model.F_Area = F_Largeareaid.ToString();//转派大区id
+                model.F_Office = F_Officeid.ToString();//转派办事处id
                 model.F_Largeareaid  = F_Largeareaid;//转派大区id
                 model.F_DealUser = touser;//已接单待处理;
                 model.F_Officeid = F_Officeid;//转派办事处id

codegit/CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -569,13 +569,13 @@ namespace CallCenter.Utility
                             {
                                 ICell cell101 = irow3list[td].CreateCell(3 * dt  - 3);
                                 cell101.SetCellValue(it.name );
-                                cell101.CellStyle = cellStyle;
+                                cell101.CellStyle = cellStylebt;
                                 ICell cell102 = irow3list[td].CreateCell(3 * dt  - 2);
                                 cell102.SetCellValue(it .number );
-                                cell102.CellStyle = cellStyle;
+                                cell102.CellStyle = cellStylebt;
                                ICell cell103= irow3list[td].CreateCell(3 * dt-1 );
                                cell103.SetCellValue(it.Proportion );
-                               cell103.CellStyle = cellStyle;
+                               cell103.CellStyle = cellStylebt;
                         }
                             else
                             {
@@ -583,13 +583,13 @@ namespace CallCenter.Utility
                                 td++;
                                 ICell cell101 = irow3list[td].CreateCell(3 * dt - 3);
                                 cell101.SetCellValue(it.name);
-                                cell101.CellStyle = cellStyle;
+                                cell101.CellStyle = cellStylebt;
                                 ICell cell102 = irow3list[td].CreateCell(3 * dt - 2);
                                 cell102.SetCellValue(it.number);
-                                cell102.CellStyle = cellStyle;
+                                cell102.CellStyle = cellStylebt;
                                ICell cell103 = irow3list[td].CreateCell(3 * dt-1);
                                 cell103.SetCellValue(it.Proportion);
-                                cell103.CellStyle = cellStyle;
+                                cell103.CellStyle = cellStylebt;
                         }
                         }
                    
@@ -611,13 +611,13 @@ namespace CallCenter.Utility
                     IRow irow5 = sheet.CreateRow(dtrow);
                     ICell cell51 = irow5.CreateCell(0);
                     cell51.SetCellValue(dt2.name);
-                    cell51.CellStyle = cellStyle;
+                    cell51.CellStyle = cellStylebt;
                     ICell cell52 = irow5.CreateCell(1);
                     cell52.SetCellValue(dt2.number);
-                    cell52.CellStyle = cellStyle;
+                    cell52.CellStyle = cellStylebt;
                     ICell cell53 = irow5.CreateCell(2);
                     cell53.SetCellValue(dt2.Proportion);
-                    cell53.CellStyle = cellStyle;
+                    cell53.CellStyle = cellStylebt;
                 }
                
                 #endregion
@@ -635,13 +635,13 @@ namespace CallCenter.Utility
                     IRow irow10 = sheet.CreateRow(dtrow);
                     ICell cell53 = irow10.CreateCell(0);
                     cell53.SetCellValue(dt3.name);
-                    cell53.CellStyle = cellStyle;
+                    cell53.CellStyle = cellStylebt;
                     ICell cell54 = irow10.CreateCell(1);
                     cell54.SetCellValue(dt3.number);
-                    cell54.CellStyle = cellStyle;
+                    cell54.CellStyle = cellStylebt;
                     ICell cell55 = irow10.CreateCell(2);
                     cell55.SetCellValue(dt3.Proportion);
-                    cell55.CellStyle = cellStyle;
+                    cell55.CellStyle = cellStylebt;
                 }
                
                 #endregion
@@ -660,13 +660,13 @@ namespace CallCenter.Utility
                     IRow irow12 = sheet.CreateRow(dtrow);
                     ICell cell55 = irow12.CreateCell(0);
                     cell55.SetCellValue(dt4.name);
-                    cell55.CellStyle = cellStyle;
+                    cell55.CellStyle = cellStylebt;
                     ICell cell56 = irow12.CreateCell(1);
                     cell56.SetCellValue(dt4.number);
-                    cell56.CellStyle = cellStyle;
+                    cell56.CellStyle = cellStylebt;
                     ICell cell57 = irow12.CreateCell(2);
                     cell57.SetCellValue(dt4.Proportion);
-                    cell57.CellStyle = cellStyle;
+                    cell57.CellStyle = cellStylebt;
                 }
              
 
@@ -686,20 +686,21 @@ namespace CallCenter.Utility
                     IRow irow15 = sheet.CreateRow(dtrow);
                     ICell cell57 = irow15.CreateCell(0);
                     cell57.SetCellValue(dt4.name);
-                    cell57.CellStyle = cellStyle;
+                    cell57.CellStyle = cellStylebt;
                     ICell cell58 = irow15.CreateCell(1);
                     cell58.SetCellValue(dt4.number);
-                    cell58.CellStyle = cellStyle;
+                    cell58.CellStyle = cellStylebt;
                     ICell cell59 = irow15.CreateCell(2);
                     cell59.SetCellValue(dt5.Proportion);
-                    cell59.CellStyle = cellStyle;
+                    cell59.CellStyle = cellStylebt;
                 }
                
                 #endregion
                 //自适应列宽度
                 for (int i = 0; i < 8; i++)
                 {
-                    sheet.AutoSizeColumn(i);
+                    // sheet.AutoSizeColumn(i);
+                    sheet.SetColumnWidth(i, 12 * 256);
                 }
 
                 using (MemoryStream ms = new MemoryStream())
@@ -749,6 +750,32 @@ namespace CallCenter.Utility
                 }
             }
         }
+        private string ReturnMsg(int j, int i, List<Factory> Factory1)
+        {
+            string msg = "";
+            switch (j)
+            {
+                case 0:
+                    msg = Factory1[i * 2].name;
+                    break;
+                case 1:
+                    msg = Factory1[i * 2].number.ToString();
+                    break;
+                case 2:
+                    msg = Factory1[i * 2].proportion;
+                    break;
+                case 3:
+                    msg = Factory1[i * 2 + 1].name;
+                    break;
+                case 4:
+                    msg = Factory1[i * 2 + 1].number.ToString();
+                    break;
+                case 5:
+                    msg = Factory1[i * 2 + 1].proportion;
+                    break;
+            }
+            return msg;
+        }
         /// <summary>
         /// 投诉产品日期分布表
         /// </summary>
@@ -761,10 +788,15 @@ namespace CallCenter.Utility
                 HSSFWorkbook workbook = new HSSFWorkbook();
                 ISheet sheet = workbook.CreateSheet("Sheet1");
                 ICellStyle cellStyle = workbook.CreateCellStyle();
+              
                 NPOI.SS.UserModel.IFont cellfont = workbook.CreateFont();
                 cellfont.Boldweight = (short)FontBoldWeight.Normal;
                 cellStyle.SetFont(cellfont);
                 ICellStyle cellStylebt = workbook.CreateCellStyle();
+                cellStylebt.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStylebt.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStylebt.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStylebt.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
                 NPOI.SS.UserModel.IFont cellfontbt = workbook.CreateFont();
                 cellfontbt.Boldweight = (short)FontBoldWeight.Bold;
                
@@ -781,14 +813,20 @@ namespace CallCenter.Utility
                 IRow irow2 = sheet.CreateRow(1);
                 ICell cell2 = irow2.CreateCell(0);
                 ICellStyle style13 = workbook.CreateCellStyle();
+                style13.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                style13.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                style13.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                style13.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
                 style13.BorderDiagonalLineStyle = BorderStyle.Thin;
                 style13.BorderDiagonal = BorderDiagonal.Backward;
                 style13.BorderDiagonalColor = IndexedColors.Black .Index;
-                StringBuilder sb = new StringBuilder();
-                sb.AppendLine("数量".PadLeft(15));//该行不足长度10在左侧填空格
-                sb.AppendLine("日期".PadRight(15));//该行不足长度10在右侧填空格
-                cell2.SetCellValue(sb.ToString ());
+                string sb = "                  数量\n日期";
+              //  StringBuilder sb = new StringBuilder();
+              //  sb.AppendLine("数量".PadLeft(15));//该行不足长度10在左侧填空格
+              //  sb.AppendLine("日期".PadRight(15));//该行不足长度10在右侧填空格
+                cell2.SetCellValue(sb);
                 cell2.CellStyle = cellStylebt;
+                style13.WrapText = true;
                 irow2.GetCell(0).CellStyle = style13;
                 sheet.AddMergedRegion(new CellRangeAddress(1, 2, 0,0 ));
                 ICell cell6 = irow2.CreateCell(1);
@@ -801,16 +839,16 @@ namespace CallCenter.Utility
                     switch (i)
                     {
                         case 0:
-                            msg = datetime.AddMonths(-11).Month + "-" + datetime.AddMonths(-4).Month + "月份日期";
+                            msg = datetime.AddMonths(-11).Month + "-" + datetime.AddMonths(-3).Month + "月份日期";
                             break;
                         case 1:
-                            msg = datetime.AddMonths(-3).Month + "月份日期";
+                            msg = datetime.AddMonths(-2).Month + "月份日期";
                             break;
                         case 2:
-                            msg = datetime.AddMonths(-2).Month + "月份日期";
+                            msg = datetime.AddMonths(-1).Month + "月份日期";
                             break;
                         case 3:
-                            msg = datetime.AddMonths(-1).Month + "月份日期";
+                            msg = datetime.Month + "月份日期";
                             break;
                         case 4:
                             msg = "不清楚日期";
@@ -819,6 +857,8 @@ namespace CallCenter.Utility
                     ICell cell3 = irow2.CreateCell(i *2+ 2 );
                     cell3.SetCellValue(msg);
                     cell3.CellStyle = cellStylebt;
+                    ICell cell4 = irow2.CreateCell(i * 2 + 3);
+                    cell4.CellStyle = cellStylebt;
                     sheet.AddMergedRegion(new CellRangeAddress(1, 1, i * 2 + 2, i * 2 + 3));
                 }
                  IRow irow3 = sheet.CreateRow(2);
@@ -901,7 +941,7 @@ namespace CallCenter.Utility
                         }
                     }
                 }
-                int t = dt1.Count + 3;int count = 0;
+                int t = dt1.Count + 2;int count = 0;
                 List<Factory> Factory1 = product.factory;
                 List<Factory> Factory2 = product.problem;
                 List<Factory> Factory3 = product.product;
@@ -923,77 +963,57 @@ namespace CallCenter.Utility
                     istrue = false;
                     count = total;
                 }
-                   
-                IRow irow5 = sheet.CreateRow(t);
+                IRow irow5 = sheet.CreateRow(t+1);
                 ICell cell7 = irow5.CreateCell(0);
                 cell7.SetCellValue("工\n厂\n投\n诉\n占\n比\n");
+        
                 cell7.CellStyle = cellStylebt;
-                sheet.AddMergedRegion(new CellRangeAddress(t, t+ count, 0, 0));
+                cell7.CellStyle.WrapText=true ;
+                sheet.AddMergedRegion(new CellRangeAddress(t+1, t+ count, 0, 0));
                 ICell cell10 = irow5.CreateCell(7);
                 cell10.SetCellValue("各\n质\n量\n问\n题\n占\n比\n");
                 cell10.CellStyle = cellStylebt;
-                int structure = 0;
+                cell10.CellStyle.WrapText = true;
+                int structure = t + problem;
                 if (istrue)
                 {
                   if (a >1)
                     {
                         structure = t + problem + a / 2;
-                        sheet.AddMergedRegion(new CellRangeAddress(t, t + problem + a / 2, 7, 7));
+                        sheet.AddMergedRegion(new CellRangeAddress(t+1, t + problem + a / 2, 7, 7));
                     }
                        
                   else
                     {
                         structure = t + problem;
-                        sheet.AddMergedRegion(new CellRangeAddress(t, t + problem + 1, 7, 7));
+                        sheet.AddMergedRegion(new CellRangeAddress(t+1, t + problem, 7, 7));
                     }
                 }
                     else 
-                sheet.AddMergedRegion(new CellRangeAddress(t, t + problem, 7, 7));
-                IRow irow7 = sheet.CreateRow(structure);
+                sheet.AddMergedRegion(new CellRangeAddress(t+1, t + problem, 7, 7));
+                IRow irow7 = sheet.CreateRow(structure+1);
                 ICell cell11 = irow7.CreateCell(7);
                 cell11.SetCellValue("结\n构\n占\n比\n");
                 cell11.CellStyle = cellStylebt;
+                cell11.CellStyle.WrapText = true;
                 if (istrue)
                 {
                     if (a > 1)
-                        sheet.AddMergedRegion(new CellRangeAddress(t + problem + a / 2+1, t + total + 1 +a/2, 7, 7));
+                        sheet.AddMergedRegion(new CellRangeAddress(structure + 1, structure+ productcode+a/2, 7, 7));
                     else
-                        sheet.AddMergedRegion(new CellRangeAddress(t + problem + 2, t + total + 2, 7, 7));
+                        sheet.AddMergedRegion(new CellRangeAddress(structure + 1, structure + productcode+a, 7, 7));
                 }
                     else
-                    sheet.AddMergedRegion(new CellRangeAddress(t + problem+1, t +  1 + total, 7, 7));
+                    sheet.AddMergedRegion(new CellRangeAddress(structure + 1, structure + productcode, 7, 7));
                 if (Factory1 != null)
                 {
                     for (int i = 0; i < count; i++)
                     {
                         if (i ==0 || t + i== structure)
                         {
-                            if (i < Factory1.Count )
-                            {
                                 for (int j = 0; j < 6; j++)
                                 {
-                                    string msg = "";
-                                    switch (j)
-                                    {
-                                        case 0:
-                                            msg = Factory1[i * 2].name;
-                                            break;
-                                        case 1:
-                                            msg = Factory1[i * 2].number.ToString();
-                                            break;
-                                        case 2:
-                                            msg = Factory1[i * 2].proportion;
-                                            break;
-                                        case 3:
-                                            msg = Factory1[i * 2 + 1].name;
-                                            break;
-                                        case 4:
-                                            msg = Factory1[i * 2 + 1].number.ToString();
-                                            break;
-                                        case 5:
-                                            msg = Factory1[i * 2 + 1].proportion;
-                                            break;
-                                    }
+                                    string msg = ReturnMsg(j ,i ,Factory1 );
                                     if (i == 0)
                                     {
                                         ICell cell8 = irow5.CreateCell(j + 1);
@@ -1002,64 +1022,64 @@ namespace CallCenter.Utility
                                     }
                                     else
                                     {
-                                        ICell cell8 = irow7.CreateCell(j + 1);
-                                        cell8.SetCellValue(msg);
-                                        cell8.CellStyle = cellStylebt;
+                                        ICell cell9 = irow7.CreateCell(j + 1);
+                                        cell9.SetCellValue(msg);
+                                        cell9.CellStyle = cellStylebt;
                                     }
-
                                 }
-                            }
                             if (i ==0)
                             {
                                 for (int z = 0; z < 3; z++)
                                 {
-                                    string msg = "";
                                     switch (z)
                                     {
                                         case 0:
-                                            ICell cell8 = irow5.CreateCell(8);
-                                            cell8.SetCellValue(Factory2[0].name );
-                                            cell8.CellStyle = cellStylebt;
-                                            sheet.AddMergedRegion(new CellRangeAddress(t, t , 8, 9));
+                                            ICell cell12 = irow5.CreateCell(8);
+                                            cell12.SetCellValue(Factory2[0].name );
+                                            cell12.CellStyle = cellStylebt;
+                                            sheet.AddMergedRegion(new CellRangeAddress(t+1, t+1 , 8, 9));
+                                            ICell cell22 = irow5.CreateCell(9);
+                                            cell22.CellStyle = cellStylebt;
                                             break;
                                         case 1:
-                                            ICell cell9 = irow5.CreateCell(10);
-                                            cell9.SetCellValue(Factory2[0].number .ToString ());
-                                            cell9.CellStyle = cellStylebt;
+                                            ICell cell13 = irow5.CreateCell(10);
+                                            cell13.SetCellValue(Factory2[0].number .ToString ());
+                                            cell13.CellStyle = cellStylebt;
                                            
                                             break;
                                         case 2:
-                                            ICell cell12 = irow5.CreateCell(11);
-                                            cell12.SetCellValue(Factory2[0].proportion);
-                                            cell12.CellStyle = cellStylebt;
+                                            ICell cell14 = irow5.CreateCell(11);
+                                            cell14.SetCellValue(Factory2[0].proportion);
+                                            cell14.CellStyle = cellStylebt;
                                             break;
                                     }
                                     
                                 }
                             }
-                            else if (t + i  == structure)
+                            else 
                             {
                                 for (int z = 0; z < 3; z++)
                                 {
-                                    string msg = "";
                                     switch (z)
                                     {
                                         case 0:
-                                            ICell cell8 = irow7.CreateCell(8);
-                                            cell8.SetCellValue(Factory3[1].name);
-                                            cell8.CellStyle = cellStylebt;
-                                            sheet.AddMergedRegion(new CellRangeAddress(structure, structure, 8, 9));
+                                            ICell cell15 = irow7.CreateCell(8);
+                                            cell15.SetCellValue(Factory3[0].name);
+                                            cell15.CellStyle = cellStylebt;
+                                            sheet.AddMergedRegion(new CellRangeAddress(structure+1, structure+1, 8, 9));
+                                            ICell cell31 = irow7.CreateCell(9);
+                                            cell15.CellStyle = cellStylebt;
                                             break;
                                         case 1:
-                                            ICell cell9 = irow7.CreateCell(10);
-                                            cell9.SetCellValue(Factory3[1].number.ToString());
-                                            cell9.CellStyle = cellStylebt;
+                                            ICell cell16 = irow7.CreateCell(10);
+                                            cell16.SetCellValue(Factory3[0].number.ToString());
+                                            cell16.CellStyle = cellStylebt;
 
                                             break;
                                         case 2:
-                                            ICell cell12 = irow7.CreateCell(11);
-                                            cell12.SetCellValue(Factory3[1].proportion);
-                                            cell12.CellStyle = cellStylebt;
+                                            ICell cell17= irow7.CreateCell(11);
+                                            cell17.SetCellValue(Factory3[0].proportion);
+                                            cell17.CellStyle = cellStylebt;
                                             break;
                                     }
 
@@ -1070,41 +1090,19 @@ namespace CallCenter.Utility
                         else
                         {
                             
-                            IRow irow6 = sheet.CreateRow(t + i);
-                            if (i < Factory1.Count)
+                            IRow irow6 = sheet.CreateRow(t+1 + i);
+
+                            if (i*2 < Factory1.Count)
                             {
                                 for (int j = 0; j < 6; j++)
                                 {
-                                    string msg = "";
-                                    switch (j)
-                                    {
-                                        case 0:
-                                            msg = Factory1[i * 2].name;
-                                            break;
-                                        case 1:
-                                            msg = Factory1[i * 2].number.ToString();
-                                            break;
-                                        case 2:
-                                            msg = Factory1[i * 2].proportion;
-                                            break;
-                                        case 3:
-                                            msg = Factory1[i * 2 + 1].name;
-                                            break;
-                                        case 4:
-                                            msg = Factory1[i * 2 + 1].number.ToString();
-                                            break;
-                                        case 5:
-                                            msg = Factory1[i * 2 + 1].proportion;
-                                            break;
-                                    }
-                                    ICell cell9 = irow6.CreateCell(j + 1);
-                                    cell9.SetCellValue(msg);
-                                    cell9.CellStyle = cellStylebt;
+                                    string msg = ReturnMsg(j, i, Factory1);
+                                    ICell cell18 = irow6.CreateCell(j + 1);
+                                    cell18.SetCellValue(msg);
+                                    cell18.CellStyle = cellStylebt;
                                 }
                             }
-                            if (istrue)
-                            {
-                                int b = 1;
+                                int b = 0;
                                 if (a >1)
                                 {
                                     b= (a / 2) + (0 == a % 2 ? 0 : 1);
@@ -1113,14 +1111,15 @@ namespace CallCenter.Utility
                                 {
                                     for (int z = 0; z < 3; z++)
                                     {
-                                        string msg = "";
                                         switch (z)
                                         {
                                             case 0:
                                                 ICell cell8 = irow6.CreateCell(8);
                                                 cell8.SetCellValue(Factory2[i].name);
                                                 cell8.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + i, t + i, 8, 9));
+                                                sheet.AddMergedRegion(new CellRangeAddress(t+1 + i, t+1 + i, 8, 9));
+                                                ICell cell22 = irow6.CreateCell(9);
+                                                cell22.CellStyle = cellStylebt;
                                                 break;
                                             case 1:
                                                 ICell cell9 = irow6.CreateCell(10);
@@ -1136,7 +1135,7 @@ namespace CallCenter.Utility
                                         }
                                     }
                                 }
-                               else  if (i < Factory2.Count )
+                               else  if (i == Factory2.Count-1 )
                                 {
                                     for (int z = 0; z < 3; z++)
                                     {
@@ -1144,86 +1143,114 @@ namespace CallCenter.Utility
                                         switch (z)
                                         {
                                             case 0:
-                                                ICell cell8 = irow7.CreateCell(8);
+                                                ICell cell8 = irow6.CreateCell(8);
                                                 cell8.SetCellValue(Factory2[i].name);
                                                 cell8.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + i, t + i+b , 8, 9));
+                                                sheet.AddMergedRegion(new CellRangeAddress(t +1+ i, t+1 + i+b , 8, 9));
                                                 break;
                                             case 1:
-                                                ICell cell9 = irow7.CreateCell(10);
+                                                ICell cell9 = irow6.CreateCell(10);
                                                 cell9.SetCellValue(Factory2[i].number.ToString());
                                                 cell9.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + i, t + i + b, 10, 10));
+                                                sheet.AddMergedRegion(new CellRangeAddress(t+1 + i, t+1 + i + b, 10, 10));
 
                                                 break;
                                             case 2:
-                                                ICell cell12 = irow7.CreateCell(11);
+                                                ICell cell12 = irow6.CreateCell(11);
                                                 cell12.SetCellValue(Factory2[i].proportion);
                                                 cell12.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + i, t + i + b, 11, 11));
+                                                sheet.AddMergedRegion(new CellRangeAddress(t+1 + i, t+1 + i + b, 11, 11));
                                                 break;
                                         }
+                                    
                                     }
                                 }
                                 if (i <( Factory3.Count + Factory2.Count+b -1)&& i>= Factory2.Count + b)
                                 {
                                     for (int z = 0; z < 3; z++)
                                     {
-                                        string msg = "";
+                                       
                                         switch (z)
                                         {
                                             case 0:
                                                 ICell cell8 = irow6.CreateCell(8);
                                                 cell8.SetCellValue(Factory3[i- Factory2.Count -b ].name);
+
                                                 cell8.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + i, t + i, 8, 9));
+                                                sheet.AddMergedRegion(new CellRangeAddress(t +1+ i, t +1+ i, 8, 9));
+                                                ICell cel27 = irow6.CreateCell(9);
+                                                cel27.CellStyle = cellStylebt;
                                                 break;
                                             case 1:
                                                 ICell cell9 = irow6.CreateCell(10);
-                                                cell9.SetCellValue(Factory3[i - Factory2.Count - b].number.ToString());
+                                                cell9.SetCellValue(Factory3[i - Factory2.Count - b ].number.ToString());
                                                 cell9.CellStyle = cellStylebt;
 
                                                 break;
                                             case 2:
                                                 ICell cell12 = irow6.CreateCell(11);
-                                                cell12.SetCellValue(Factory3[i - Factory2.Count - b].proportion);
+                                                cell12.SetCellValue(Factory3[i - Factory2.Count - b ].proportion);
                                                 cell12.CellStyle = cellStylebt;
                                                 break;
                                         }
                                     }
                                 }
-                                else  if ( i >= Factory2.Count + b&& i < Factory2.Count + b+ Factory3.Count )
+                                else  if ( i== Factory2.Count + b+ Factory3.Count-1 )
                                 {
                                     for (int z = 0; z < 3; z++)
                                     {
-                                        string msg = "";
                                         switch (z)
                                         {
                                             case 0:
-                                                ICell cell8 = irow7.CreateCell(8);
+                                                ICell cell8 = irow6.CreateCell(8);
                                                 cell8.SetCellValue(Factory3[i - Factory2.Count - b].name);
                                                 cell8.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + i, t + i + b, 8, 9));
+                                                sheet.AddMergedRegion(new CellRangeAddress(t +1+ i, t+1 + i + b, 8, 9));
                                                 break;
                                             case 1:
-                                                ICell cell9 = irow7.CreateCell(10);
+                                                ICell cell9 = irow6.CreateCell(10);
                                                 cell9.SetCellValue(Factory3[i - Factory2.Count - b].number.ToString());
                                                 cell9.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + i, t + i + b, 10, 10));
+                                                sheet.AddMergedRegion(new CellRangeAddress(t + 1 + i, t + 1 + i + b, 10, 10));
 
                                                 break;
                                             case 2:
-                                                ICell cell12 = irow7.CreateCell(11);
+                                                ICell cell12 = irow6.CreateCell(11);
                                                 cell12.SetCellValue(Factory3[i - Factory2.Count - b].proportion);
                                                 cell12.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + i, t + i + b, 11, 11));
+                                                sheet.AddMergedRegion(new CellRangeAddress(t + 1 + i, t + 1 + i + b, 11, 11));
                                                 break;
                                         }
                                     }
                                 }
 
+                            
+                            if ( i == Factory2.Count)
+                            {
+                                ICell cell120 = irow6.CreateCell(7);
+                                cell120.CellStyle = cellStylebt;
+                                ICell cell124 = irow6.CreateCell(9);
+                                cell124.CellStyle = cellStylebt;
+                                ICell cell125 = irow6.CreateCell(10);
+                                cell125.CellStyle = cellStylebt;
+                                ICell cell126 = irow6.CreateCell(11);
+                                cell126.CellStyle = cellStylebt;
+                            }
+                             if (i ==count -1)
+                            {
+                                ICell cell119 = irow6.CreateCell(0);
+                                cell119.CellStyle = cellStylebt;
+                                ICell cell121 = irow6.CreateCell(7);
+                                cell121.CellStyle = cellStylebt;
+                                ICell cell132 = irow6.CreateCell(8);
+                                cell132.CellStyle = cellStylebt;
+                                ICell cell128 = irow6.CreateCell(9);
+                                cell128.CellStyle = cellStylebt;
+                                ICell cell129 = irow6.CreateCell(10);
+                                cell129.CellStyle = cellStylebt;
+                                ICell cell130 = irow6.CreateCell(11);
+                                cell130.CellStyle = cellStylebt;
                             }
-                          
                         }
                     }
                 }