综合查询

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

@@ -194,14 +194,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             else
             {
+                int comprehensive =RequestString.GetInt("jianhang", 0);
+
                 int jianhang = RequestString.GetInt("jianhang", 0);
-                if (jianhang > 0)
-                {
-                    sql += " and F_InfoSource != '1' ";
-                }
-                else
+                if (comprehensive<=0)
                 {
-                    sql += " and F_InfoSource = '1' ";
+                    if (jianhang > 0)
+                    {
+                        sql += " and F_InfoSource != '1' ";
+                    }
+                    else
+                    {
+                        sql += " and F_InfoSource = '1' ";
+                    }
                 }
             }
             string ComTitle = HttpUtility.UrlDecode(RequestString.GetQueryString("ComTitle"));
@@ -1243,19 +1248,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else
                     {
-                        //int[] sts = new int[] { (int)EnumWorkState.submit, (int)EnumWorkState.receive, (int)EnumWorkState.auditreback, (int)EnumWorkState.auditdelay, (int)EnumWorkState.visit, (int)EnumWorkState.reload };
-                        //sql += " and F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ")";
-                        ////sql += " and F_WorkState in (1,2,3,5,7,8)";
-
                        int[] sts = new int[] { (int)EnumWorkState.submit, (int)EnumWorkState.resubmit };
-
-
-                        //  sql += " and F_WorkState in (" + (int)EnumWorkState.neworder + "," + (int)EnumWorkState.audit + "," + (int)EnumWorkState.resubmit + ") ";
                         sql += "and F_WorkOrderID not in(select F_WorkOrderId   from T_Bus_Feedback b where F_Id in (select MAX(F_Id) from T_Bus_Feedback where F_WorkOrderId in (select F_WorkOrderId from T_Bus_Feedback where F_WorkOrderId = b.F_WorkOrderId  group by F_WorkOrderId  ))  and F_State = 1 and F_IsDelete = 0 and F_Type = 3 and F_IsAudit = 1 ) ";
                         sql += " and (F_WorkState in(1,11) or ( F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ") and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
-                        sql += " and (F_WorkState in(1,11) or ( F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ") and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
-                       
-
                         if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "ZXLDGLY" && userModel.F_RoleCode != "ZXLDGLYGLY" && userModel.F_RoleCode != "DDZG"&&userModel .F_RoleCode !="ZXLD"&& userModel.F_RoleCode != "MTDD")
                         {
                             sql += " and F_CreateUser='" + userModel.F_UserCode + "')))";

CallCenterCommon/CallCenter.Utility/word/ExportWord.cs

@@ -66,12 +66,17 @@ public class ExportWord
              //设置表格样式 
             for (int i = 1; i < 10; i ++)
             {
+            if (i ==9)
+            {
+                newTable.Columns[i].Width = 80f;
+            }
+            else  
             newTable.Columns[i].Width = 60f;
-          }
+            }
             for (int i=1;i<19;i++)
-          {
+           {
             newTable.Rows[i].Height = 30f;
-          }
+           }
             //表格外线
         newTable.Borders.OutsideLineStyle = Microsoft.Office.Interop.Word.WdLineStyle.wdLineStyleSingle;
         //表格内线