报表通讯录筛选项

codegit/CallCenterApi/CallCenterApi.BLL/T_Cus_AddressBook.cs

@@ -80,6 +80,13 @@ namespace CallCenterApi.BLL
             return dal.GetList(strWhere);
         }
         /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetAPPList(string strWhere)
+        {
+            return dal.GetAPPList(strWhere);
+        }
+        /// <summary>
         /// 获得前几行数据
         /// </summary>
         public DataSet GetList(int Top, string strWhere, string filedOrder)

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_AddressBook.cs

@@ -358,7 +358,19 @@ namespace CallCenterApi.DAL
             }
             return DbHelperSQL.Query(strSql.ToString());
         }
-
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetAPPList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select code=(dbo.GetPY(UPPER(substring(c.F_Name ,1,1)))),F_Position=(select F_RoleName from T_Sys_RoleInfo where F_RoleId = c.F_PositionId),F_Department = (select F_DeptName from T_Sys_Department where F_DeptId = c.F_DepartmentId),F_Area = (dbo.GetArea(c.F_DepartmentId)),F_Offce = (dbo.GetOffic(c.F_DepartmentId)),*from T_Cus_AddressBook c  ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            return DbHelperSQL.Query(strSql.ToString());
+        }
         /// <summary>
         /// 获得前几行数据
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AddressBookController.cs

@@ -280,13 +280,15 @@ namespace CallCenterApi.Interface.Controllers
 
                     sql += " and F_DepartmentId in ( select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptModel.F_DeptCode + "%') ";
                 }
-                var modelList = bll.GetModelList(sql);
-                List<AddressBook> Input = AddressBooks(modelList);
-                var modelListOrder = Input.OrderBy(x => x.F_Name);
-                return Content(modelListOrder.ToJson());
+                var modelList = bll.GetAPPList(sql+ " order by code asc").Tables[0];
+                //  List<AddressBook> Input = AddressBooks(modelList);
+                //  var modelListOrder = Input.OrderBy(x => x.F_Name);
+                return Content(modelList.ToJson());
             }
             return NoToken("未知错误，请重新登录");
         }
+      
+       
         /// <summary>
         /// 获取一条详细信息 Id
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ApplicationsVersionController.cs

@@ -120,7 +120,7 @@ namespace CallCenterApi.Interface.Controllers
             }
             return Error("获取失败");
         }
-        public ActionResult GetAndroid()
+        public ActionResult GetAndroid(int type=0)
         {
             var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
             var model = new BLL.T_Sys_ApplicationsVersion().GetModelList("F_IsDelete=0 and F_Type=0 order by F_ID DESC ").FirstOrDefault();
@@ -259,6 +259,96 @@ namespace CallCenterApi.Interface.Controllers
         }
         private BLL.T_Sys_UserAccount userBLL = new BLL.T_Sys_UserAccount();
         /// <summary>
+        /// 上传base64图片
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult UploadBase64(string[] dataurl)
+        {
+
+            //  string stropenid = HttpUtility.UrlDecode(RequestString.GetFormString("openid"));
+            #region 保存文件到本地路径
+            //  DataTable FileUrl = new DataTable();
+            //    var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+        //    ActionResult res = NoToken("未知错误，请重新登录");
+          //  int userId = CurrentUser.UserData.F_UserId;
+          //  Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            //string dataurl = HttpUtility.UrlDecode(RequestString.GetFormString("dataurl"));
+            //  string dataurl = RequestString.GetFormString("dataurl");
+            List<Model.T_Sys_Accessories> acs = new List<Model.T_Sys_Accessories>();
+            if (dataurl != null)
+            {
+                for (int i = 0; i < dataurl.Length; i++)
+                {
+                    //  string dataurl = RequestString.GetFormString("dataurl");
+                    string filename = DateTime.Now.ToString("yyyyMMddHHmmssfff") + i + ".jpg";
+                   
+                   
+                        if (!string.IsNullOrEmpty(dataurl[i ]))
+                        {
+                            string path = "/Upload/APP/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
+
+                            ImageUpload iu = new ImageUpload();
+                            iu.SavePath = path;
+                            iu.DataUrl = dataurl[i];
+                            if (!string.IsNullOrEmpty(filename))
+                            {
+                                iu.SaveType = 1;
+                                iu.InFileName = filename;
+                            }
+                            iu.Upload64();
+
+                            int n = iu.Error;
+                            if (n == 0)
+                            {
+                                path = path + iu.OutFileName;
+                                Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                                model_T_Sys_Accessories.F_CreateTime = DateTime.Now;//上传时间
+                                model_T_Sys_Accessories.F_Name = iu.OutFileName;//附件名称
+                                model_T_Sys_Accessories.F_Type = ".jpg";//附件类型
+                                model_T_Sys_Accessories.F_Url = path;//附件地址
+                                model_T_Sys_Accessories.F_Size = iu.FileSize;
+                                //model_T_Sys_Accessories.F_UserCode = userModel.F_UserCode;//上传人  
+                                int id = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                                #endregion
+                                model_T_Sys_Accessories.F_Id  = id;//修改为返回对象以便查看图片
+                                acs.Add(model_T_Sys_Accessories);
+                            }
+                            else
+                            {
+                                string msg = string.Empty;
+                                switch (n)
+                                {
+                                    case 1: msg = "请选择要上传的文件"; break;
+                                    case 2: msg = "上传的文件类型不支持"; break;
+                                    case 3: msg = "上传的文件过大"; break;
+                                    case 4: msg = "未知错误"; break;
+                                }
+                                return Error(msg);
+                            }
+                        }
+                        else
+                        {
+                            return Error("请选择要上传的文件");
+                        }
+                  
+                   
+                }
+
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    acs,
+                };
+                return Content(obj.ToJson());
+
+
+            }
+
+            return Error("请选择要上传的文件");
+
+        }
+        /// <summary>
         /// 上传附件
         /// </summary>
         /// <returns></returns>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/EquipmentNumberController.cs

@@ -60,6 +60,77 @@ namespace CallCenterApi.Interface.Controllers
             }
             return NoToken("未知错误，请重新登录");
         }
+        public ActionResult GetEquipment()
+        {
+          
+
+                DataTable dt = new DataTable();
+                string where = "";
+                 where = " F_IsDelete=0 ";
+                dt = new BLL.T_Sys_EquipmentNumber().GetList(0, where, " F_ID desc").Tables[0];
+                List<Model.TreeModel> modelList = BindTree(dt, "0");
+               
+                if (modelList != null)
+                {
+                    if (modelList.Count > 0)
+                        return Success("加载成功", modelList);
+                }
+                return Error("加载失败");
+           
+        }
+        /// <summary>
+        /// tree  树形部门
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="parentid"></param>
+        /// <returns></returns>
+        private List<Model.TreeModel> BindTree(DataTable tab, string parentid, int pid = 0)
+        {
+            DataTable tab2 = new DataTable();
+            List<Model.TreeModel> modelList1 = new List<Model.TreeModel>();
+            Model.TreeModel mode = new Model.TreeModel();
+            string currentID = "0";//当前功能ID
+            mode.id = currentID;
+            mode.IconCls = "";//图标
+            mode.text = "双汇集团";
+            mode.children = BindEquipmentNumbeTree(tab, currentID, pid);
+            modelList1.Add(mode);
+            return modelList1;
+
+        }
+        private List<Model.TreeModel> BindEquipmentNumbeTree(DataTable tab, string parentid, int pid = 0)
+        {
+            DataTable tab2 = new DataTable();
+
+
+            List<Model.TreeModel> modelList = new List<Model.TreeModel>();
+            Model.TreeModel mode = new Model.TreeModel();
+            mode.id = "0";
+            mode.IconCls = "";//图标
+            mode.text = "不清";
+            modelList.Add(mode);
+            if (tab != null && tab.Rows.Count > 0)
+            {
+                List<Model.T_Sys_EquipmentNumber> categorylist = new BLL.T_Sys_EquipmentNumber().DataTableToList(tab);
+              
+                for (int i = 0; i < categorylist.Count; i++)
+                {
+                    Model.TreeModel model = new Model.TreeModel();
+                    string currentID = categorylist[i].F_ID.ToString();//当前功能ID
+                    model.id = currentID;
+                    model.IconCls = "";//图标
+                    model.text = categorylist[i].F_Production;
+                    modelList.Add(model);
+                }
+                return modelList;
+
+            }
+            else
+            {
+                return null;
+            }
+
+        }
         /// <summary>
         /// 修改设备编号
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/PushMessageController.cs

@@ -48,7 +48,7 @@ namespace CallCenterApi.Interface.Controllers
         }
         public ActionResult PushMessagePush()
         {
-            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
+            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20,21,22)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
             string msg = "";
             if (modellist != null)
             {
@@ -95,7 +95,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult SetPush()
         {
-            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
+            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20,21,22)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
           
             string msg = "";
             if (modellist != null)
@@ -518,7 +518,7 @@ namespace CallCenterApi.Interface.Controllers
 
          //   var modellist = new BLL.T_Bus_WorkOrder().GetModelList("F_IsDelete=0 and F_State in(1,3,5)  and F_Area in(18,19,8,9,61,10" +
              //   ",11,12,15,13,482,14,16,17)");
-            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
+            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20,21,22)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
             if (modellist != null)
             {
                 foreach (var it in modellist)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -867,7 +867,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         public ActionResult Import()
         {
             DataTable dt = new DataTable();
-            var depts = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (select F_DeptId   FROM T_Sys_Department WHERE F_State=1 and (F_DeptCode like '|0|1|21|%' or F_DeptCode like '|0|1|22|%' )) ");
+            var depts = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (select F_DeptId   FROM T_Sys_Department WHERE F_State=1 and (F_DeptCode like '|0|1|23|%' or F_DeptCode like '|0|1|24|%' )) ");
            
             #region 
             dt.Columns.Add("工号");

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

@@ -820,11 +820,15 @@ namespace CallCenterApi.Interface.Controllers.report
                     factory.proportion = "0.00%";
                     for (int i=0;i < modelList.Count;i++)
                     {
-                        if (modelList[i].F_Manufacturer == it.F_Production)
+                        if (!string .IsNullOrEmpty (modelList[i].F_Manufacturer))
                         {
-                            total++;
-                            factory.number++;
+                            if (modelList[i].F_Manufacturer .Trim ()== it.F_Production)
+                            {
+                                total++;
+                                factory.number++;
+                            }
                         }
+                        
                     }
                     if (modelList.Count > 0)
                         factory.proportion = string.Format("{0:f2}%", (float)factory.number / modelList.Count*100);
@@ -847,22 +851,34 @@ namespace CallCenterApi.Interface.Controllers.report
                 foreach (var it in problem)
                 {
                     Factory factory = new Factory();
-                    factory.name = it.F_Name ;
+                    factory.name = it.F_Describe;
                     factory.number = 0;
                     factory.proportion = "0.00%";
                     for (int i = 0; i < modelList.Count; i++)
                     {
-                        if (modelList[i].F_ProblemCode == it.F_Name)
+                        if (!string .IsNullOrEmpty (modelList[i].F_ProblemCode))
                         {
-                            total++;
-                            factory.number++;
+                            if (modelList[i].F_ProblemCode.Trim () == it.F_Name)
+                            {
+                                total++;
+                                factory.number++;
+                            }
                         }
+                       
                     }
                     if (modelList.Count>0)
                     factory.proportion = string.Format("{0:f2}%", (float)factory.number / modelList.Count * 100);
                     product.problem.Add(factory);
                 }
+                 product.problem.ForEach(c => {
+                  var group = product.problem.Where(a => a.name == c.name);
+                  c.number = group.Sum(x => x.number);
+                     c.proportion = string.Format("{0:f2}%", (float)c.number / modelList.Count * 100);
+                 });
+                product.problem = product.problem.Distinct(new ProductNoComparer()).ToList();
+
                 product.problem.Sort((a, b) => b.number.CompareTo(a.number));
+
                 Factory factor = new Factory();
                 factor.name = "合计";
                 factor.number = total;
@@ -880,21 +896,32 @@ namespace CallCenterApi.Interface.Controllers.report
                 foreach (var it in productcode)
                 {
                     Factory factory = new Factory();
-                    factory.name = it.F_Name;
+                    factory.name = it.F_Describe;
                     factory.number = 0;
                     factory.proportion = "0.00%";
                     for (int i = 0; i < modelList.Count; i++)
                     {
-                        if (modelList[i].F_ProductType == it.F_Name)
+                        if (!string.IsNullOrEmpty(modelList[i].F_ProductType))
                         {
-                            total++;
-                            factory.number++;
+                            if (modelList[i].F_ProductType.Trim () == it.F_Name)
+                            {
+                                total++;
+                                factory.number++;
+                            }
                         }
                     }
                     if (modelList.Count > 0)
                         factory.proportion = string.Format("{0:f2}%", (float)factory.number / modelList.Count * 100);
                     product.product.Add(factory);
                 }
+
+                product.product.ForEach(c => {
+                    var group = product.product.Where(a => a.name == c.name);
+                    c.number = group.Sum(x => x.number);
+                    c.proportion = string.Format("{0:f2}%", (float)c.number / modelList.Count * 100);
+                });
+                product.product = product.product.Distinct(new ProductNoComparer()).ToList();
+
                 product.product.Sort((a, b) => b.number.CompareTo(a.number));
                 Factory factor = new Factory();
                 factor.name = "合计";
@@ -929,6 +956,22 @@ namespace CallCenterApi.Interface.Controllers.report
             #endregion
            
         }
+        class ProductNoComparer : IEqualityComparer<Factory>
+        {
+            public bool Equals(Factory p1, Factory p2)
+            {
+                if (p1 == null)
+                    return p2 == null;
+                return p1.name  == p2.name;
+            }
+
+            public int GetHashCode(Factory p)
+            {
+                if (p == null)
+                    return 0;
+                return p.name.GetHashCode();
+            }
+        }
         /// <summary>
         /// 工单来源
         /// </summary>

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

@@ -146,10 +146,44 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_ProductDate = '" + productDate.Trim() + "'";
                 if (!string.IsNullOrEmpty(batchNumber))//产品编码
                     sql += $" and F_BatchNumber like '%" + batchNumber.Trim() + "%'";
+
                 if (!string.IsNullOrEmpty(manufacturer))//生产厂家
-                    sql += $" and F_Manufacturer = '" + manufacturer.Trim() + "'";
+                {
+                    string msg = "";
+                    string[] facturer = manufacturer.Split(',');
+                    foreach (var it in facturer)
+                    {
+                        if (msg=="")
+                        {
+                            msg = "'" + it + "'";
+                        }
+                        else
+                        {
+                            msg = msg+","+ "'" + it + "'";
+                        }
+                       
+                    }
+                    sql += $" and F_Manufacturer in (" + msg + ")";
+                }
+                  
                 if (!string.IsNullOrEmpty(problemCode))//问题代码
-                    sql += $" and F_ProblemCode = '" + problemCode.Trim() + "'";
+                {
+                    string msg = "";
+                    string[] facturer = problemCode.Split(',');
+                    foreach (var it in facturer)
+                    {
+                        if (msg == "")
+                        {
+                            msg = "'" + it + "'";
+                        }
+                        else
+                        {
+                            msg = msg + "," + "'" + it + "'";
+                        }
+                    }
+                    sql += $" and F_ProblemCode  in (" + msg + ")";
+                }
+                   
                 if (!string.IsNullOrEmpty(notifications))//通知人
                     sql += $" and F_Notifications = '" + notifications.Trim() + "'";
                 if (!string.IsNullOrEmpty(productName))//产品名称
@@ -539,7 +573,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private string[] col()
         {
             string[] ccc = {
-                   "序号","姓名","地址","产品代码","产品名称","规格","生产日期","生产时间","产品编码",
+                   "序号","大区","办事处","姓名","地址","产品代码","产品名称","规格","生产日期","生产时间","产品编码",
                   "生产厂家","问题代码","质量问题","通知人","接听人","落实情况","重复投诉日期"
             };
             return ccc;

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

@@ -297,6 +297,80 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return res;
         }
 
+
+
+
+        public ActionResult GetProblem()
+        {
+
+            DataTable dt = new DataTable();
+            string where = "";
+            where = " F_DictionaryFlag='WTDM'";
+          
+            dt = new BLL.T_Sys_DictionaryValue().GetList(0, where, "F_DictionaryValueId asc").Tables[0];
+            List<Model.TreeModel> modelList = BindTrTree(dt, "0");
+
+            if (modelList != null)
+            {
+                if (modelList.Count > 0)
+                    return Success("加载成功", modelList);
+            }
+            return Error("加载失败");
+
+        }
+        /// <summary>
+        /// tree  树形部门
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="parentid"></param>
+        /// <returns></returns>
+        private List<Model.TreeModel> BindTrTree(DataTable tab, string parentid, int pid = 0)
+        {
+            DataTable tab2 = new DataTable();
+            List<Model.TreeModel> modelList1 = new List<Model.TreeModel>();
+            Model.TreeModel mode = new Model.TreeModel();
+            string currentID = "0";//当前功能ID
+            mode.id = currentID;
+            mode.IconCls = "";//图标
+            mode.text = "双汇集团";
+            mode.children = BindEquipmentNumbeTree(tab, currentID, pid);
+            modelList1.Add(mode);
+            return modelList1;
+
+        }
+        private List<Model.TreeModel> BindEquipmentNumbeTree(DataTable tab, string parentid, int pid = 0)
+        {
+            DataTable tab2 = new DataTable();
+
+
+            List<Model.TreeModel> modelList = new List<Model.TreeModel>();
+            if (tab != null && tab.Rows.Count > 0)
+            {
+                List<Model.T_Sys_DictionaryValue> categorylist = new BLL.T_Sys_DictionaryValue().DataTableToList(tab);
+
+                for (int i = 0; i < categorylist.Count; i++)
+                {
+                    Model.TreeModel model = new Model.TreeModel();
+                    string currentID = categorylist[i].F_DictionaryValueId .ToString();//当前功能ID
+                    model.id = currentID;
+                    model.IconCls = "";//图标
+                    model.text = categorylist[i].F_Name ;
+                    modelList.Add(model);
+                }
+                return modelList;
+
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+
+
+
+
         #region 公共属性
         string id = "";
         string name = "";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -141,6 +141,10 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                         buttons.Add(assign());
                     }
+                    else if (code == "YWY" || code == "XTGLY" || code == "ZG")
+                    {
+                        buttons.Add(handle());
+                    }
                     break;
             }
             return buttons;

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

@@ -1184,6 +1184,11 @@ namespace CallCenter.Utility
                                                 cell8.SetCellValue(Factory2[i].name);
                                                 cell8.CellStyle = cellStylebt;
                                                 sheet.AddMergedRegion(new CellRangeAddress(t +1+ i, t+1 + i+b , 8, 9));
+                                            if (istrue )
+                                            {
+                                                ICell cell22 = irow6.CreateCell(9);
+                                                cell22.CellStyle = cellStylebt;
+                                            }
                                                 break;
                                             case 1:
                                                 ICell cell9 = irow6.CreateCell(10);
@@ -1242,20 +1247,23 @@ namespace CallCenter.Utility
                                                 ICell cell8 = irow6.CreateCell(8);
                                                 cell8.SetCellValue(Factory3[i - Factory2.Count - b].name);
                                                 cell8.CellStyle = cellStylebt;
+                                          
                                                 sheet.AddMergedRegion(new CellRangeAddress(t +1+ i, t+1 + i + b, 8, 9));
                                                 break;
                                             case 1:
                                                 ICell cell9 = irow6.CreateCell(10);
                                                 cell9.SetCellValue(Factory3[i - Factory2.Count - b].number.ToString());
                                                 cell9.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + 1 + i, t + 1 + i + b, 10, 10));
+                                          
+                                            sheet.AddMergedRegion(new CellRangeAddress(t + 1 + i, t + 1 + i + b, 10, 10));
 
                                                 break;
                                             case 2:
                                                 ICell cell12 = irow6.CreateCell(11);
                                                 cell12.SetCellValue(Factory3[i - Factory2.Count - b].proportion);
                                                 cell12.CellStyle = cellStylebt;
-                                                sheet.AddMergedRegion(new CellRangeAddress(t + 1 + i, t + 1 + i + b, 11, 11));
+                                           
+                                            sheet.AddMergedRegion(new CellRangeAddress(t + 1 + i, t + 1 + i + b, 11, 11));
                                                 break;
                                         }
                                     }
@@ -1268,10 +1276,11 @@ namespace CallCenter.Utility
                                 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;
+                                    ICell cell125 = irow6.CreateCell(10);
+                                    cell125.CellStyle = cellStylebt;
+                                    ICell cell126 = irow6.CreateCell(11);
+                                    cell126.CellStyle = cellStylebt;
+                                
                             }
                             if (!istrue )
                             {
@@ -1279,6 +1288,7 @@ namespace CallCenter.Utility
                                 {
                                     ICell cell119 = irow6.CreateCell(0);
                                     cell119.CellStyle = cellStylebt;
+                                   
                                 }
                                 if (i *2 +1>= Factory1.Count&i < Factory2.Count)
                                 {
@@ -1314,6 +1324,13 @@ namespace CallCenter.Utility
                                 cell119.CellStyle = cellStylebt;
                                 ICell cell121 = irow6.CreateCell(7);
                                 cell121.CellStyle = cellStylebt;
+                                ICell cell122 = irow6.CreateCell(4);
+                                cell122.CellStyle = cellStylebt;
+                                ICell cell123 = irow6.CreateCell(5);
+                                cell123.CellStyle = cellStylebt;
+                                ICell cell124 = irow6.CreateCell(6);
+                                cell124.CellStyle = cellStylebt;
+                                sheet.AddMergedRegion(new CellRangeAddress(t + 1 + i, t + 1 + i, 4, 6));
                                 ICell cell132 = irow6.CreateCell(8);
                                 cell132.CellStyle = cellStylebt;
                                 ICell cell128 = irow6.CreateCell(9);
@@ -1322,6 +1339,7 @@ namespace CallCenter.Utility
                                 cell129.CellStyle = cellStylebt;
                                 ICell cell130 = irow6.CreateCell(11);
                                 cell130.CellStyle = cellStylebt;
+                             //   sheet.AddMergedRegion(new CellRangeAddress(t + 1 + i, t + 1 + i, 8, 11));
                             }
                         }
 

codegit/PushMessage/Program.cs

@@ -31,12 +31,12 @@ namespace Push
             
             
             System.Console.WriteLine("Hello Push!");
-            System.Console.WriteLine(DateTime.Now.ToString("HH"));
-            PushTime time = new PushTime();
-            time.time = DateTime.Now;
-            time.morning = 0;
-            time.Afternoon = 0;
-            Push(time);
+          //  System.Console.WriteLine(DateTime.Now.ToString("HH"));
+            //PushTime time = new PushTime();
+            //time.time = DateTime.Now;
+            //time.morning = 0;
+            //time.Afternoon = 0;
+            //Push(time);
             Thread t = new Thread(new ThreadStart(SetCensusURL));
             t.Start();
           
@@ -55,12 +55,12 @@ namespace Push
                 }
                 if ( File.Exists("D:\\Push\\PushMessage.txt"))
                 {
-                    System.Console.WriteLine(JsonConvert.SerializeObject(time));
+                  //  System.Console.WriteLine(JsonConvert.SerializeObject(time));
                     File.WriteAllText("D:\\Push\\PushMessage.txt", JsonConvert.SerializeObject(time), Encoding.UTF8);
                 }
                 else
                 {
-                    System.Console.WriteLine(JsonConvert.SerializeObject(time));
+                  //  System.Console.WriteLine(JsonConvert.SerializeObject(time));
                     File.WriteAllText("D:\\Push\\PushMessage.txt", JsonConvert.SerializeObject(time), Encoding.UTF8);
                 }
             }
@@ -73,7 +73,7 @@ namespace Push
             }
 
         }
-        //http://oa.shuanghui.net
+        //http://oa.shuanghui.net:8046/
         private static void SetCensusURL()
         {
            
@@ -87,83 +87,85 @@ namespace Push
                
                 try
                 {
-                    string seturl = "http://oa.shuanghui.net/PushMessage/SetCensusURL";
+                    string seturl = "http://oa.shuanghui.net:8046/PushMessage/SetCensusURL";
                     string Dataaaurl = web.DownloadString(seturl);//这一句话就能请求到数据了
-                    string url = "http://oa.shuanghui.net/PushMessage/SetPush";
+                //    System.Console.WriteLine("nnvnn" + Dataaaurl);
+                    string url = "http://oa.shuanghui.net:8046/PushMessage/SetPush";
                     string Dataaa = web.DownloadString(url);//这一句话就能请求到数据了
-                    Program program = new Program();
-                      if (DateTime.Now.ToString("HH") == "09")
-                        {
-                        string str1 = File.ReadAllText("D:\\Push\\PushMessage.txt");
-                        if (!string.IsNullOrEmpty(str1))
-                        {
-                            var obj = JsonConvert.DeserializeObject<PushTime>(str1);
-                            if (obj != null)
-                            {
-                                if (DateTime.Now.Day - obj.time .Day >0)
-                                {
-                                    program.time.time = DateTime.Now;
-                                    program.time.morning = 1;
-                                    program.time.Afternoon = 0;
-                                //    System.Console.WriteLine("aavaa" + program.time.morning);
-                                    Push(program.time);
-                                    string urla = "http://oa.shuanghui.net/PushMessage/PushMessagePush";
-                                    string Dataa = web.DownloadString(urla);//这一句话就能请求到数据了
-                                }
-                                else
-                                {
-                                    if (program.time.morning<=0)
-                                    {
-                                        program.time.time = DateTime.Now;
-                                        program.time.morning = 1;
-                                        program.time.Afternoon = obj.Afternoon ;
-                                    //    System.Console.WriteLine("aacaa" + program.time.morning);
-                                        Push(program.time);
-                                        string urla = "http://oa.shuanghui.net/PushMessage/PushMessagePush";
-                                        string Dataa = web.DownloadString(urla);//这一句话就能请求到数据了
-                                    }
-                                }
-                            }
-                        }
-                        }
-                        else if (DateTime.Now.ToString("HH") == "14")
-                        {
-                        string str1 = File.ReadAllText("D:\\Push\\PushMessage.txt");
-                      //  System.Console.WriteLine("nnvnn" + str1);
-                        if (!string.IsNullOrEmpty(str1))
-                        {
-                            var obj = JsonConvert.DeserializeObject<PushTime>(str1);
-                            if (obj != null)
-                            {
-                                if (DateTime.Now.Day - obj.time.Day > 0)
-                                {
-                                    program.time.time = DateTime.Now;
-                                    program.time.morning = obj .morning ;
-                                    program.time.Afternoon = 1;
-                                    Push(program.time);
-                                    //System.Console.WriteLine("nnvnn" + program.time.Afternoon);
-                                    string urla = "http://oa.shuanghui.net/PushMessage/PushMessagePush";
-                                    string Dataa = web.DownloadString(urla);//这一句话就能请求到数据了
+                 //   System.Console.WriteLine("nnvnn" + Dataaa);
+                    //Program program = new Program();
+                    //  if (DateTime.Now.ToString("HH") == "09")
+                    //    {
+                    //    string str1 = File.ReadAllText("D:\\Push\\PushMessage.txt");
+                    //    if (!string.IsNullOrEmpty(str1))
+                    //    {
+                    //        var obj = JsonConvert.DeserializeObject<PushTime>(str1);
+                    //        if (obj != null)
+                    //        {
+                    //            if (DateTime.Now.Day - obj.time .Day >0)
+                    //            {
+                    //                program.time.time = DateTime.Now;
+                    //                program.time.morning = 1;
+                    //                program.time.Afternoon = 0;
+                    //            //    System.Console.WriteLine("aavaa" + program.time.morning);
+                    //                Push(program.time);
+                    //                string urla = "http://192.168.8.9:1001//PushMessage/PushMessagePush";
+                    //                string Dataa = web.DownloadString(urla);//这一句话就能请求到数据了
+                    //            }
+                    //            else
+                    //            {
+                    //                 if (program.time.morning<=0)
+                    //                {
+                    //                    program.time.time = DateTime.Now;
+                    //                    program.time.morning = 1;
+                    //                    program.time.Afternoon = obj.Afternoon ;
+                    //                //    System.Console.WriteLine("aacaa" + program.time.morning);
+                    //                    Push(program.time);
+                    //                    string urla = "http://192.168.8.9:1001//PushMessage/PushMessagePush";
+                    //                    string Dataa = web.DownloadString(urla);//这一句话就能请求到数据了
+                    //                }
+                    //            }
+                    //        }
+                    //    }
+                    //    }
+                    //    else if (DateTime.Now.ToString("HH") == "14")
+                    //    {
+                    //    string str1 = File.ReadAllText("D:\\Push\\PushMessage.txt");
+                    //  //  System.Console.WriteLine("nnvnn" + str1);
+                    //    if (!string.IsNullOrEmpty(str1))
+                    //    {
+                    //        var obj = JsonConvert.DeserializeObject<PushTime>(str1);
+                    //        if (obj != null)
+                    //        {
+                    //            if (DateTime.Now.Day - obj.time.Day > 0)
+                    //            {
+                    //                program.time.time = DateTime.Now;
+                    //                program.time.morning = obj .morning ;
+                    //                program.time.Afternoon = 1;
+                    //                Push(program.time);
+                    //                //System.Console.WriteLine("nnvnn" + program.time.Afternoon);
+                    //                string urla = "http://oa.shuanghui.net:8046//PushMessage/PushMessagePush";
+                    //                string Dataa = web.DownloadString(urla);//这一句话就能请求到数据了
 
 
-                                }
-                                else
-                                {
-                                    if (program.time.Afternoon <= 0)
-                                    {
-                                        program.time.time = DateTime.Now;
-                                        program.time.morning = obj.morning;
-                                        program.time.Afternoon = 1;
-                                        Push(program.time);
-                                      //  System.Console.WriteLine("nncnn" + program.time.Afternoon);
-                                        string urla = "http://oa.shuanghui.net/PushMessage/PushMessagePush";
-                                        string Dataa = web.DownloadString(urla);//这一句话就能请求到数据了
-                                    }
-                                }
-                            }
-                        }
+                    //            }
+                    //            else
+                    //            {
+                    //                if (program.time.Afternoon <= 0)
+                    //                {
+                    //                    program.time.time = DateTime.Now;
+                    //                    program.time.morning = obj.morning;
+                    //                    program.time.Afternoon = 1;
+                    //                    Push(program.time);
+                    //                  //  System.Console.WriteLine("nncnn" + program.time.Afternoon);
+                    //                    string urla = "http://oa.shuanghui.net:8046//PushMessage/PushMessagePush";
+                    //                    string Dataa = web.DownloadString(urla);//这一句话就能请求到数据了
+                    //                }
+                    //            }
+                    //        }
+                    //    }
                        
-                     }
+                    // }
                    
                     
                 }