duhongyu преди 4 години
родител
ревизия
f4c8dff2b6

+ 11 - 16
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

194
             }
194
             }
195
             else
195
             else
196
             {
196
             {
197
+                int comprehensive =RequestString.GetInt("jianhang", 0);
198
+
197
                 int jianhang = RequestString.GetInt("jianhang", 0);
199
                 int jianhang = RequestString.GetInt("jianhang", 0);
198
-                if (jianhang > 0)
199
-                {
200
-                    sql += " and F_InfoSource != '1' ";
201
-                }
202
-                else
200
+                if (comprehensive<=0)
203
                 {
201
                 {
204
-                    sql += " and F_InfoSource = '1' ";
202
+                    if (jianhang > 0)
203
+                    {
204
+                        sql += " and F_InfoSource != '1' ";
205
+                    }
206
+                    else
207
+                    {
208
+                        sql += " and F_InfoSource = '1' ";
209
+                    }
205
                 }
210
                 }
206
             }
211
             }
207
             string ComTitle = HttpUtility.UrlDecode(RequestString.GetQueryString("ComTitle"));
212
             string ComTitle = HttpUtility.UrlDecode(RequestString.GetQueryString("ComTitle"));
1243
                     }
1248
                     }
1244
                     else
1249
                     else
1245
                     {
1250
                     {
1246
-                        //int[] sts = new int[] { (int)EnumWorkState.submit, (int)EnumWorkState.receive, (int)EnumWorkState.auditreback, (int)EnumWorkState.auditdelay, (int)EnumWorkState.visit, (int)EnumWorkState.reload };
1247
-                        //sql += " and F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ")";
1248
-                        ////sql += " and F_WorkState in (1,2,3,5,7,8)";
1249
-
1250
                        int[] sts = new int[] { (int)EnumWorkState.submit, (int)EnumWorkState.resubmit };
1251
                        int[] sts = new int[] { (int)EnumWorkState.submit, (int)EnumWorkState.resubmit };
1251
-
1252
-
1253
-                        //  sql += " and F_WorkState in (" + (int)EnumWorkState.neworder + "," + (int)EnumWorkState.audit + "," + (int)EnumWorkState.resubmit + ") ";
1254
                         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 ) ";
1252
                         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 ) ";
1255
                         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 ";
1253
                         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 ";
1256
-                        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 ";
1257
-                       
1258
-
1259
                         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")
1254
                         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")
1260
                         {
1255
                         {
1261
                             sql += " and F_CreateUser='" + userModel.F_UserCode + "')))";
1256
                             sql += " and F_CreateUser='" + userModel.F_UserCode + "')))";

+ 8 - 3
CallCenterCommon/CallCenter.Utility/word/ExportWord.cs

66
              //设置表格样式 
66
              //设置表格样式 
67
             for (int i = 1; i < 10; i ++)
67
             for (int i = 1; i < 10; i ++)
68
             {
68
             {
69
+            if (i ==9)
70
+            {
71
+                newTable.Columns[i].Width = 80f;
72
+            }
73
+            else  
69
             newTable.Columns[i].Width = 60f;
74
             newTable.Columns[i].Width = 60f;
70
-          }
75
+            }
71
             for (int i=1;i<19;i++)
76
             for (int i=1;i<19;i++)
72
-          {
77
+           {
73
             newTable.Rows[i].Height = 30f;
78
             newTable.Rows[i].Height = 30f;
74
-          }
79
+           }
75
             //表格外线
80
             //表格外线
76
         newTable.Borders.OutsideLineStyle = Microsoft.Office.Interop.Word.WdLineStyle.wdLineStyleSingle;
81
         newTable.Borders.OutsideLineStyle = Microsoft.Office.Interop.Word.WdLineStyle.wdLineStyleSingle;
77
         //表格内线
82
         //表格内线