热线整合

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

@@ -13905,7 +13905,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //int maindeptid = RequestString.GetInt("maindeptid", 0);
                 string  maindeptid = RequestString.GetFormString("maindeptid");
                 string otherdeptids = RequestString.GetFormString("otherdeptids");
-                DateTime limittime = DateTime.Parse(RequestString.GetFormString("limittime") + " 23:59:59");
+                DateTime limittime = DateTime.Parse(RequestString.GetFormString("limittime") );
                 string assignedopinion = RequestString.GetFormString("assignedopinion");
                 string files = RequestString.GetFormString("files");
                 int state = RequestString.GetInt("state", 0);

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -792,7 +792,7 @@ namespace CallCenter.Utility
                 sheet.AddMergedRegion(new CellRangeAddress(0, 0, 2, 5));
 
                 ICell cell4 = irow1.CreateCell(6);
-                cell4.SetCellValue("群众满意度");
+                cell4.SetCellValue("回访满意度");
                 cell4.CellStyle = cellStylebt;
                 sheet.AddMergedRegion(new CellRangeAddress(0, 2, 6, 6));
 
@@ -801,15 +801,20 @@ namespace CallCenter.Utility
                 cell5.CellStyle = cellStylebt;
                 sheet.AddMergedRegion(new CellRangeAddress(0, 2, 7, 7));
 
-                ICell cell6 = irow1.CreateCell(8);
+                ICell cell8 = irow1.CreateCell(8);
+                cell8.SetCellValue("热线整合");
+                cell8.CellStyle = cellStylebt;
+                sheet.AddMergedRegion(new CellRangeAddress(0, 2, 8, 8));
+
+                ICell cell6 = irow1.CreateCell(9);
                 cell6.SetCellValue("加扣分项");
                 cell6.CellStyle = cellStylebt;
-                sheet.AddMergedRegion(new CellRangeAddress(0, 2, 8, 8));
+                sheet.AddMergedRegion(new CellRangeAddress(0, 2, 9, 9));
 
-                ICell cell7 = irow1.CreateCell(9);
+                ICell cell7 = irow1.CreateCell(10);
                 cell7.SetCellValue("总分");
                 cell7.CellStyle = cellStylebt;
-                sheet.AddMergedRegion(new CellRangeAddress(0, 2, 9, 9));
+                sheet.AddMergedRegion(new CellRangeAddress(0, 2, 10, 10));
 
              
 
@@ -854,7 +859,7 @@ namespace CallCenter.Utility
                         IRow irow4 = sheet.CreateRow(index);
                         index++;
                         iCellIndex++;
-                        for (int i = 0; i < 10; i++)
+                        for (int i = 0; i < 11; i++)
                         {
                             switch (i )
                             {
@@ -899,11 +904,17 @@ namespace CallCenter.Utility
                                     cel7.CellStyle = cellStylebt1;
                                     break;
                                 case 8:
+                                    ICell cel10 = irow4.CreateCell(i);
+                                    cel10.SetCellValue(dr["F_Integration"].ToString());
+                                    cel10.CellStyle = cellStylebt1;
+                                    break;
+                                    
+                                case 9:
                                     ICell cel8= irow4.CreateCell(i);
                                     cel8.SetCellValue(dr["F_Buckle"].ToString());
                                     cel8.CellStyle = cellStylebt1;
                                     break;
-                                case 9:
+                                case 10:
                                     ICell cel9 = irow4.CreateCell(i);
                                     cel9.SetCellValue(dr["F_Total"].ToString());
                                     cel9.CellStyle = cellStylebt1;