鹤壁

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

                         cname = cModel.F_CategoryName;
                 }
                 #endregion
-                string auditu = "";
+                string auditu = "";DateTime ?audittime =null;
                 #region 审核人
                 if (dModel.F_AuditID != null)
                 {
                         {
                             auditu = User.F_UserName + "(" + User.F_UserCode + ")";
                         }
+                        audittime = auM.F_AuditOn;
                     }
                 }
                 #endregion
                     F_DeptId = dModel.F_DeptId,
                     key1,
                     F_Key = dModel.F_Key,
+                    F_AuditOn = audittime
                 };
                 return Success("获取知识库信息成功", obj);
             }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

             string message = "";string datemessage = "";
             if (!string.IsNullOrEmpty(date))
             {
-                message = "统计周期：" + DateTime.Parse(date).AddMonths(-1).ToString("yyyy年MM月") + "-25日--" + DateTime.Parse(date).ToString("yyyy年MM月") + "-24日";
+                DateTime time = DateTime.Parse((DateTime.Parse(date).ToString("yyyy-MM") + "-01"));
+                message = "统计周期：" + DateTime.Parse(date).ToString("yyyy年MM月") + "-01日--" + time.AddMonths(1).AddDays(-1).ToString("yyyy年MM月dd日") ;
 
                 datemessage = MonthtoUpper(DateTime.Parse(date).Month );
                 date = DateTime.Parse(date).ToString("yyyyMM");
-               
+
             }
             else
             {
-                message = "统计周期：" + DateTime.Now.AddMonths(-1).ToString("yyyy年MM月") + "-25日--" + DateTime.Now.ToString("yyyy年MM月") + "-24日";
+                DateTime time = DateTime.Parse((DateTime.Now.ToString("yyyy-MM") + "-01"));
+                message = "统计周期：" + DateTime.Now.AddMonths(-1).ToString("yyyy年MM月") + "-01日--" + time.AddDays(-1).ToString("yyyy年MM月dd日") ;
                 date = DateTime .Now.AddMonths (-1).ToString("yyyyMM");
                 datemessage = MonthtoUpper(DateTime.Now .Month);
             }

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

                               modelT_Bus_WorkOrder.F_MainDeptId > 0)
                                     {
 
-                                        if (User.F_RoleCode == "ZXHWY")
-                                        {
-                                            Dictionary<string, object> keyValuePairs3 = new Dictionary<string, object>();
-                                            keyValuePairs3.Add("F_WorkState", (int)EnumWorkState.backaudit);
-                                            keyValuePairs3.Add("F_Note", "");
-                                            modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.backaudit;//重办审核
-                                            if (statistics > 0)
-                                            {
-                                                if (modelT_Bus_AssignedInfo.F_IsPerform == 1)
-                                                    modelT_Bus_AssignedInfo.F_IsPerform = 2;
-                                                else
-                                                    modelT_Bus_AssignedInfo.F_IsPerform = 3;
-                                                if (groupstatistics > 0)
-                                                    modelT_Bus_AssignedInfo.F_GroupStatistics = groupstatistics.ToString();
+                                        //if (User.F_RoleCode == "ZXHWY")
+                                        //{
+                                        //    Dictionary<string, object> keyValuePairs3 = new Dictionary<string, object>();
+                                        //    keyValuePairs3.Add("F_WorkState", (int)EnumWorkState.backaudit);
+                                        //    keyValuePairs3.Add("F_Note", "");
+                                        //    modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.backaudit;//重办审核
+                                        //    if (statistics > 0)
+                                        //    {
+                                        //        if (modelT_Bus_AssignedInfo.F_IsPerform == 1)
+                                        //            modelT_Bus_AssignedInfo.F_IsPerform = 2;
+                                        //        else
+                                        //            modelT_Bus_AssignedInfo.F_IsPerform = 3;
+                                        //        if (groupstatistics > 0)
+                                        //            modelT_Bus_AssignedInfo.F_GroupStatistics = groupstatistics.ToString();
 
 
-                                                new BLL.T_Bus_AssignedInfo().Update(modelT_Bus_AssignedInfo);
-                                            }
-                                            if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs3))
-                                            {
-                                                #region 插入操作记录
+                                        //        new BLL.T_Bus_AssignedInfo().Update(modelT_Bus_AssignedInfo);
+                                        //    }
+                                        //    if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs3))
+                                        //    {
+                                        //        #region 插入操作记录
 
-                                                #region 20191021调整为多个主办单位时调整
+                                        //        #region 20191021调整为多个主办单位时调整
 
-                                                #endregion
-                                                opt = "于" + DateTime.Now.ToString("yyyy年MM月dd日HH时mm分ss秒") + "退回重办";
-                                                cbreasons = "，重办原因：" + cbreason;
-                                                #endregion
+                                        //        #endregion
+                                        //        opt = "于" + DateTime.Now.ToString("yyyy年MM月dd日HH时mm分ss秒") + "退回重办";
+                                        //        cbreasons = "，重办原因：" + cbreason;
+                                        //        #endregion
 
-                                            }
-                                        }
-                                        else
-                                        {
+                                        //    }
+                                        //}
+                                        //else
+                                        //{
                                             int n = Int32.Parse(DbHelperSQL.GetSingle("select count(1) from T_Bus_AssignedInfo WITH(NOLOCK) where F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "' and  F_State=1 and F_IsSure=1 and F_IsDelete=0 and isnull(F_IsReload,0)>0").ToString());
                                             Model.T_Bus_AssignedInfo newmodelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
                                             newmodelT_Bus_AssignedInfo.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
 
 
 
-                                        }
+                                       // }
 
                                     }
                                 }
         {
             int maindeptid = RequestString.GetInt("maindeptid", 0);
             string otherdeptids = RequestString.GetFormString("otherdeptids");
-            int limittime = RequestString.GetInt("limittime", 6);
+            int limittime = RequestString.GetInt("limittime", 2);
             string assignedopinion = RequestString.GetFormString("assignedopinion");
             int statistics = RequestString.GetInt("statistics", 0);//是否进行退回统计0否1是
             int groupstatistics = RequestString.GetInt("groupstatistics", 0);
                                             int n = Int32.Parse(DbHelperSQL.GetSingle("select count(1) from T_Bus_AssignedInfo WITH(NOLOCK) where F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "' and  F_State=1 and F_IsSure=1 and F_IsDelete=0 and isnull(F_IsReload,0)>0").ToString());
                                             Model.T_Bus_AssignedInfo newmodelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
                                             newmodelT_Bus_AssignedInfo.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
-                                            DataTable dt = DbHelperSQL.Query("select top " +limittime  + " F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and " +
-                                                "F_OffDate> (select top 1 F_OffDate from T_Sys_WorkOFFDays  where F_OffDate >= '" + DateTime .Now  + "'  and   F_OffState = 1  order by F_OffDate asc) order by F_OffDate ").Tables[0];
-                                            var resdatetime = dt.Rows[limittime-1]["F_OffDate"].ToString();
-                                            if (!string.IsNullOrEmpty(resdatetime))
-                                            {
-                                                resdatetime = GetLimittime(limittime);
-                            //                    resdatetime = resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss");
-                            //                    var datatime = DateTime.Now.AddDays(6);
-                            //                    if (Convert.ToDateTime(resdatetime) > datatime)
-                            //                    {
-                            //                        var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
-                            //                        DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
-                            //                              " with(nolock) where F_OffState = 1 and    " +
-                            //                              "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
-                            //                        var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
-                            //                        if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
-                            //Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
-                            //                        {
-                            //                            resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
-                            //                        }
-                            //                        // resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
-                            //                    }
-                                                newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
-                                            }
+                                            //DataTable dt = DbHelperSQL.Query("select top " +limittime  + " F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and " +
+                                            //    "F_OffDate> (select top 1 F_OffDate from T_Sys_WorkOFFDays  where F_OffDate >= '" + DateTime .Now  + "'  and   F_OffState = 1  order by F_OffDate asc) order by F_OffDate ").Tables[0];
+                                            var resdatetime = GetLimittime(limittime);
+                            //                if (!string.IsNullOrEmpty(resdatetime))
+                            //                {
+                            //                    resdatetime = GetLimittime(limittime);
+                            ////                    resdatetime = resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss");
+                            ////                    var datatime = DateTime.Now.AddDays(6);
+                            ////                    if (Convert.ToDateTime(resdatetime) > datatime)
+                            ////                    {
+                            ////                        var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                            ////                        DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                            ////                              " with(nolock) where F_OffState = 1 and    " +
+                            ////                              "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                            ////                        var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                            ////                        if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                            ////Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                            ////                        {
+                            ////                            resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                            ////                        }
+                            ////                        // resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                            ////                    }
+                            //                    newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
+                            //                }
                                             newmodelT_Bus_AssignedInfo.F_MainDeptId = modelT_Bus_WorkOrder.F_MainDeptId;//主办单位id
                                             newmodelT_Bus_AssignedInfo.F_OtherDeptIds = "";//协办单位id
                                             newmodelT_Bus_AssignedInfo.F_AssignedOpinion = reason;//交办意见
                                             newmodelT_Bus_AssignedInfo.F_State = 1;
                                             newmodelT_Bus_AssignedInfo.F_CreateUser = User.F_UserCode;
                                             newmodelT_Bus_AssignedInfo.F_CreateTime = DateTime.Now;
+                                            newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);
                                             newmodelT_Bus_AssignedInfo.F_IsDelete = 0;
                                             newmodelT_Bus_AssignedInfo.F_IsOverdue = 0;
                                             newmodelT_Bus_AssignedInfo.F_IsSure = 0;

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

             cell15.CellStyle = cellStylebt;
             sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 9, 9));
 
-            ICell cell4 = irow1.CreateCell(10);
+            ICell cell22 = irow1.CreateCell(10);
+            cell22.SetCellValue("不满意量");
+            cell22.CellStyle = cellStylebt;
+            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 10, 10));
+
+            ICell cell4 = irow1.CreateCell(11);
             cell4.SetCellValue("回访满意度");
             cell4.CellStyle = cellStylebt;
-            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 10, 10));
+            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 11, 11));
 
-            ICell cell5 = irow1.CreateCell(11);
+            ICell cell5 = irow1.CreateCell(12);
             cell5.SetCellValue("知识库更新");
             cell5.CellStyle = cellStylebt;
-            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 11, 11));
+            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 12, 12));
+
+            ICell cel23 = irow1.CreateCell(13);
+            cel23.SetCellValue("知识库更新量");
+            cel23.CellStyle = cellStylebt;
+            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 13, 13));
 
-            ICell cell8 = irow1.CreateCell(12);
+            ICell cell8 = irow1.CreateCell(14);
             cell8.SetCellValue("热线整合");
             cell8.CellStyle = cellStylebt;
-            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 12, 12));
+            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 14, 14));
 
-            ICell cell6 = irow1.CreateCell(13);
+            ICell cell6 = irow1.CreateCell(15);
             cell6.SetCellValue("加扣分项");
             cell6.CellStyle = cellStylebt;
-            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 13, 13));
+            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 15, 15));
 
-            ICell cell7 = irow1.CreateCell(14);
+            ICell cell7 = irow1.CreateCell(16);
             cell7.SetCellValue("总分");
             cell7.CellStyle = cellStylebt;
-            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 14, 14));
+            sheet.AddMergedRegion(new CellRangeAddress(index, index + 1, 16, 16));
 
 
 
             ICell cell21 = irow3.CreateCell(6);
             cell21.SetCellValue("重办量");
             cell21.CellStyle = cellStylebt;
-            ICell cell22 = irow3.CreateCell(7);
-            cell22.SetCellValue("重办事项得分");
-            cell22.CellStyle = cellStylebt;
+            ICell cell23 = irow3.CreateCell(7);
+            cell23.SetCellValue("重办事项得分");
+            cell23.CellStyle = cellStylebt;
 
 
             ICellStyle cellStylebt1 = workbook.CreateCellStyle();
                     IRow irow4 = sheet.CreateRow(index);
                     index++;
                     iCellIndex++;
-                    for (int i = 0; i < 15; i++)
+                    for (int i = 0; i < 17; i++)
                     {
                         switch (i)
                         {
                                 cel17.CellStyle = cellStylebt1;
                                 break;
                             case 10:
+                                ICell cel20 = irow4.CreateCell(i);
+                                cel20.SetCellValue(dr["F_Dissatisfied"].ToString());
+                                cel20.CellStyle = cellStylebt1;
+                                break;
+                            case 11:
                                 ICell cel6 = irow4.CreateCell(i);
                                 cel6.SetCellValue(dr["F_Satisfied"].ToString());
                                 cel6.CellStyle = cellStylebt1;
                                 break;
-                            case 11:
+                            case 12:
                                 ICell cel7 = irow4.CreateCell(i);
                                 cel7.SetCellValue(dr["F_knowledge"].ToString());
                                 cel7.CellStyle = cellStylebt1;
                                 break;
-                            case 12:
+                            case 13:
+                                ICell ce21 = irow4.CreateCell(i);
+                                ce21.SetCellValue(dr["F_knowledgeCount"].ToString());
+                                ce21.CellStyle = cellStylebt1;
+                                break;
+                            case 14:
                                 ICell cel10 = irow4.CreateCell(i);
                                 cel10.SetCellValue(dr["F_Integration"].ToString());
                                 cel10.CellStyle = cellStylebt1;
                                 break;
 
-                            case 13:
+                            case 15:
                                 ICell cel8 = irow4.CreateCell(i);
                                 cel8.SetCellValue(dr["F_Buckle"].ToString());
                                 cel8.CellStyle = cellStylebt1;
                                 break;
-                            case 14:
+                            case 16:
                                 ICell cel9 = irow4.CreateCell(i);
                                 cel9.SetCellValue(dr["F_Total"].ToString());
                                 cel9.CellStyle = cellStylebt1;