Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

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

                     {
                        int[] sts = new int[] { (int)EnumWorkState.submit, (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 ";
-                        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 + "')))";
-                        }
-                        else
-                        {
-                            sql += ")))";
-                        }
+                        sql += "and F_WorkState in(1,11) ";
+                        //sql += " and (F_WorkState in(1,11) or ( F_WorkState in (1,11) and F_WorkOrderID in (select v.F_WorkOrderID from T_Bus_AssignedInfo v WITH(NOLOCK) INNER JOIN T_Bus_WorkOrder b  on v.F_WorkOrderID = b.F_WorkOrderID and b.F_WorkState in(1, 11) where v.F_State = 1 and v.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 + "')))";
+                        //}
+                        //else
+                        //{
+                        //    sql += ")))";
+                        //}
                     }
                     break;
                 case "1"://已交办的工单
                     sql += " and (F_IsRelease !='" + 3 + "' or " +
                        "F_IsRelease is null) ";
                     sql += " and F_WorkState=" + (int)EnumWorkState.submit;
-                    sql += "and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type = 3 and F_IsAudit=1 ) ";
-
-                   
-
-
-
+                    sql += "and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback b WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_Type = 3 and F_IsAudit = 1 and 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  ) ) ) ";
                     if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "ZXLD"&& userModel.F_RoleCode != "MTDD")
                     {
                         sql += " and F_CreateUser='" + userModel.F_UserCode + "'";

CallCenterCommon/CallCenter.Utility/word/ExportWord.cs

 /// </summary>
 public class ExportWord
   {
-      public ExportWord()
-      {
-          //
-          //TODO: 在此处添加构造函数逻辑
-         //
-     }
-  
-     // public DataTable dat = null;
-      public void ProcessRequest(HttpContext context, string id, string name)
-      {
-          context.Response.ContentType = "text/plain";
-        //  GetDataTable(id);
-       //   CreateWord(name);  
-          //此处为了批量操作，把下面这个注掉
-          //context.Response.End();
-  
-      }
       public string CreateWord(string name)
       {
             string message = "";