1550076451 2 年 前
コミット
3ee175b9db

+ 8 - 0
CallCenterApi/CallCenterApi.BLL/T_Call_CallRecords.cs

96
             DataSet ds = dal.GetList(strWhere);
96
             DataSet ds = dal.GetList(strWhere);
97
             return DataTableToList(ds.Tables[0]);
97
             return DataTableToList(ds.Tables[0]);
98
         }
98
         }
99
+
100
+        /// 获得数据列表
101
+        /// </summary>
102
+        public List<CallCenterApi.Model.T_Call_CallRecords> GetModelList(int Top, string strWhere, string filedOrder)
103
+        {
104
+            DataSet ds = dal.GetList(Top, strWhere, filedOrder);
105
+            return DataTableToList(ds.Tables[0]);
106
+        }
99
         /// <summary>
107
         /// <summary>
100
         /// 获得数据列表
108
         /// 获得数据列表
101
         /// </summary>
109
         /// </summary>

+ 2 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

196
     <Compile Include="Controllers\AreaController.cs" />
196
     <Compile Include="Controllers\AreaController.cs" />
197
     <Compile Include="Controllers\Assessment\DataAssessmentController.cs" />
197
     <Compile Include="Controllers\Assessment\DataAssessmentController.cs" />
198
     <Compile Include="Controllers\Base\BaseController.cs" />
198
     <Compile Include="Controllers\Base\BaseController.cs" />
199
+    <Compile Include="Controllers\BusPushWorkorderController.cs" />
199
     <Compile Include="Controllers\CallOutOptController.cs" />
200
     <Compile Include="Controllers\CallOutOptController.cs" />
200
     <Compile Include="Controllers\callout\CallOutPlanController.cs" />
201
     <Compile Include="Controllers\callout\CallOutPlanController.cs" />
201
     <Compile Include="Controllers\callout\CallPlanController.cs" />
202
     <Compile Include="Controllers\callout\CallPlanController.cs" />
366
   <ItemGroup>
367
   <ItemGroup>
367
     <Folder Include="App_Data\" />
368
     <Folder Include="App_Data\" />
368
     <Folder Include="Views\Affairs\" />
369
     <Folder Include="Views\Affairs\" />
370
+    <Folder Include="Views\BusPushWorkorder\" />
369
     <Folder Include="Views\CustomerNew\" />
371
     <Folder Include="Views\CustomerNew\" />
370
     <Folder Include="Views\Functions\" />
372
     <Folder Include="Views\Functions\" />
371
     <Folder Include="Views\hb_affairs\" />
373
     <Folder Include="Views\hb_affairs\" />

File diff suppressed because it is too large
+ 16947 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/BusPushWorkorderController.cs


+ 5 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

467
 
467
 
468
             if (isdc > 0)
468
             if (isdc > 0)
469
             {
469
             {
470
-                string sqls = "select ROW_NUMBER() OVER (ORDER BY F_CreateTime asc) row,F_WorkOrderId, (case when F_IsResult=1 then '市长热线' else dbo.GetDeptNames(F_MainDeptId) end) F_DeptName,F_DealTime,F_ComContent,F_Result,dbo.GetDictionaryName(F_InfoSource) F_SourceName, F_CusPhone,F_ConPhone From T_Bus_WorkOrder a WITH(NOLOCK) " + sql + " where 1=1 " + sqlwhere;
470
+                string sqls = "select ROW_NUMBER() OVER (ORDER BY F_CreateTime asc) row,F_WorkOrderId, (case when F_IsResult=1 then '市长热线'  " +
471
+                    " else c.F_DeptName end) F_DeptName,F_DealTime,F_ComContent,F_Result, " +
472
+                    "  b.F_Value F_SourceName, F_CusPhone, F_ConPhone From T_Bus_WorkOrder a WITH(NOLOCK) " +
473
+                    " left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
474
+                    " left join T_Sys_DictionaryValue as b on b.F_ValueId = a.F_InfoSource " + sql + " where 1=1 " + sqlwhere;
471
 
475
 
472
                 var dt = DbHelperSQL.Query(sqls).Tables[0];
476
                 var dt = DbHelperSQL.Query(sqls).Tables[0];
473
                 NPOIHelper npoi = new NPOIHelper();
477
                 NPOIHelper npoi = new NPOIHelper();

+ 34 - 39
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

558
                 if (dic.Where(x => x.F_Value == User.F_RoleCode).Count() > 0)
558
                 if (dic.Where(x => x.F_Value == User.F_RoleCode).Count() > 0)
559
                 {
559
                 {
560
                     var top = " "; var orderby = " order by F_CreateTime";
560
                     var top = " "; var orderby = " order by F_CreateTime";
561
-                    if (sql == " and F_IsDelete=0 ")
562
-                    {
563
-                        top = " top 1000 "; orderby += " desc ";
564
-                    }
561
+                    
565
                     //20190715调整导出字段 zhengbingbing
562
                     //20190715调整导出字段 zhengbingbing
566
                     //日期,工单号,诉求标题,诉求内容,承办单位,办理结果,是否满意,备注
563
                     //日期,工单号,诉求标题,诉求内容,承办单位,办理结果,是否满意,备注
567
-                    var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, dbo.GetUserName(F_CreateUser ) 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetKeyName(F_Key,0) 反映类别一, dbo.GetKeyName(F_Key,1) 反映类别二,dbo.GetKeyName(F_Key,2) 反映类别三,dbo.GetKeyName(F_Key,3) 反映类别四,"
568
-                        + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
569
-                        + " F_Result 办理结果, "
570
-                        + " (select top 1 (case F_IsSatisfie when 1 then'满意'  when 2 then'基本满意'  when 0 then '不满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 "
571
-                        + " from T_Bus_WorkOrder a WITH(NOLOCK)" + value + value1 + " where 1=1 " + sql + orderby).Tables[0];
564
+                    var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, users.F_Name 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号, " +
565
+                        " F_ComTitle 诉求标题, F_ComContent 工单内容, b.names  反映类别, c.F_DeptName 主办单位, F_Result 办理结果, a.F_SpotCheck as F_SpotCheck, " +
566
+                        "  (select top 1(case F_IsSatisfie when 1 then'满意'  when 2 then'基本满意'  when 0 then '不满意' else '未评价' end) F_Satisfie " +
567
+                        "  from T_Bus_VisitResult WITH(NOLOCK) where F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 " +
568
+                         " from T_Bus_WorkOrder a WITH(NOLOCK)   left join View_Keys as b on b.id = a.F_Key   " +
569
+                        "  left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
570
+                        "  left join T_Sys_UserAccount as users on users.F_UserCode = a.F_CreateUser" + value + value1 + " where 1=1 " + sql + orderby).Tables[0];
572
                     var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
571
                     var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
573
                     if (msg == "")
572
                     if (msg == "")
574
                     {
573
                     {
1262
             if (isdc > 0)
1261
             if (isdc > 0)
1263
             {
1262
             {
1264
                 var top = " "; var orderby = " order by F_CreateTime";
1263
                 var top = " "; var orderby = " order by F_CreateTime";
1265
-                if (sql == " and F_IsDelete=0 ")
1266
-                {
1267
-                    top = " top 1000 "; orderby += " desc ";
1268
-                }
1264
+               
1269
                 //20190715调整导出字段 zhengbingbing
1265
                 //20190715调整导出字段 zhengbingbing
1270
                 //日期,工单号,诉求标题,诉求内容,承办单位,办理结果,是否满意,备注
1266
                 //日期,工单号,诉求标题,诉求内容,承办单位,办理结果,是否满意,备注
1271
-                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, dbo.GetUserName(F_CreateUser ) 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetKeyName(F_Key,0) 反映类别一, dbo.GetKeyName(F_Key,1) 反映类别二,dbo.GetKeyName(F_Key,2) 反映类别三,dbo.GetKeyName(F_Key,3) 反映类别四,"
1272
-                    + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
1273
-                    + " F_Result 办理结果, "
1274
-                    + " (select top 1 (case F_IsSatisfie when 1 then'满意'  when 2 then'基本满意'  when 0 then '不满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 "
1275
-                    + " from T_Bus_WorkOrder a WITH(NOLOCK)" + value + value1 + " where 1=1 " + sql + orderby).Tables[0];
1267
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, users.F_Name 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号, " +
1268
+                        " F_ComTitle 诉求标题, F_ComContent 工单内容, b.names  反映类别, c.F_DeptName 主办单位, F_Result 办理结果, a.F_SpotCheck as F_SpotCheck, " +
1269
+                        "  (select top 1(case F_IsSatisfie when 1 then'满意'  when 2 then'基本满意'  when 0 then '不满意' else '未评价' end) F_Satisfie " +
1270
+                        "  from T_Bus_VisitResult WITH(NOLOCK) where F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 " +
1271
+                         " from T_Bus_WorkOrder a WITH(NOLOCK)   left join View_Keys as b on b.id = a.F_Key   " +
1272
+                        "  left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
1273
+                        "  left join T_Sys_UserAccount as users on users.F_UserCode = a.F_CreateUser" + value + value1 + " where 1=1 " + sql + orderby).Tables[0];
1276
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
1274
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
1277
                 if (msg == "")
1275
                 if (msg == "")
1278
                 {
1276
                 {
2389
                     sql += "and F_SpotCheck=1";
2387
                     sql += "and F_SpotCheck=1";
2390
                     if (visit > -1)
2388
                     if (visit > -1)
2391
                     {
2389
                     {
2392
-                        sql += "and F_WorkOrderId in(select F_WorkOrderId from T_Bus_VisitResult WITH(NOLOCK) where F_Id in (select max(F_Id) from T_Bus_VisitResult WITH(NOLOCK) group by F_WorkOrderId ) and F_IsSatisfie = '" + visit + "' ";
2390
+                        sql += "and F_WorkOrderId in(select F_WorkOrderId from T_Bus_VisitResult WITH(NOLOCK) where F_Id in (select max(F_Id) " +
2391
+                            "from T_Bus_VisitResult WITH(NOLOCK) group by F_WorkOrderId ) and F_IsSatisfie = '" + visit + "' ";
2393
 
2392
 
2394
                     }
2393
                     }
2395
                     else
2394
                     else
2620
             if (isdc > 0)
2619
             if (isdc > 0)
2621
             {
2620
             {
2622
                 var top = " "; var orderby = " order by F_CreateTime";
2621
                 var top = " "; var orderby = " order by F_CreateTime";
2623
-                if (sql == " and F_IsDelete=0 ")
2624
-                {
2625
-                    top = " top 1000 "; orderby += " desc ";
2626
-                }
2622
+             
2627
                 //20190715调整导出字段 zhengbingbing
2623
                 //20190715调整导出字段 zhengbingbing
2628
                 //日期,工单号,诉求标题,诉求内容,承办单位,办理结果,是否满意,备注
2624
                 //日期,工单号,诉求标题,诉求内容,承办单位,办理结果,是否满意,备注
2629
-                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
2630
-                      + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
2631
-
2632
-                    + " F_Result 办理结果, "
2633
-                    + " (select top 1 (case F_IsSatisfie when 1 then'满意' when 2 then'基本满意' when 0 then '不满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_IsDelete = 0 and F_WorkOrderId = wo.F_WorkOrderId order by F_Id desc) 是否满意 "
2634
-                    + " from T_Bus_WorkOrder wo WITH(NOLOCK)" + value + " where 1=1 " + sql + orderby).Tables[0];
2625
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, users.F_Name 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号, " +
2626
+                         " F_ComTitle 诉求标题, F_ComContent 工单内容, b.names  反映类别, c.F_DeptName 主办单位, F_Result 办理结果, a.F_SpotCheck as F_SpotCheck, " +
2627
+                         "  (select top 1(case F_IsSatisfie when 1 then'满意'  when 2 then'基本满意'  when 0 then '不满意' else '未评价' end) F_Satisfie " +
2628
+                         "  from T_Bus_VisitResult WITH(NOLOCK) where F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 " +
2629
+                          " from T_Bus_WorkOrder a WITH(NOLOCK)   left join View_Keys as b on b.id = a.F_Key   " +
2630
+                         "  left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
2631
+                         "  left join T_Sys_UserAccount as users on users.F_UserCode = a.F_CreateUser" + value  + " where 1=1 " + sql + orderby).Tables[0];
2635
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
2632
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
2636
                 if (msg == "")
2633
                 if (msg == "")
2637
                 {
2634
                 {
3481
             if (isdc > 0)
3478
             if (isdc > 0)
3482
             {
3479
             {
3483
                 var top = " "; var orderby = " order by F_CreateTime";
3480
                 var top = " "; var orderby = " order by F_CreateTime";
3484
-                if (sql == " and F_IsDelete=0 ")
3485
-                {
3486
-                    top = " top 1000 "; orderby += " desc ";
3487
-                }
3481
+              
3488
                 //20190715调整导出字段 zhengbingbing
3482
                 //20190715调整导出字段 zhengbingbing
3489
                 //日期,工单号,诉求标题,诉求内容,承办单位,办理结果,是否满意,备注
3483
                 //日期,工单号,诉求标题,诉求内容,承办单位,办理结果,是否满意,备注
3490
-                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
3491
-                     + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
3492
-                    + " F_Result 办理结果, "
3493
-                    + " (select top 1 (case F_IsSatisfie when 1 then'满意' when 2 then'基本满意' when 0 then '不满意' else '未评价' end) " +
3494
-                    "F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where  F_IsDelete = 0 and F_WorkOrderId = wo.F_WorkOrderId order by F_Id desc) 是否满意 "
3495
-                    + " from T_Bus_WorkOrder wo WITH(NOLOCK)" + value + " where 1=1 " + sql + orderby).Tables[0];
3484
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, users.F_Name 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号, " +
3485
+                        " F_ComTitle 诉求标题, F_ComContent 工单内容, b.names  反映类别, c.F_DeptName 主办单位, F_Result 办理结果, a.F_SpotCheck as F_SpotCheck, " +
3486
+                        "  (select top 1(case F_IsSatisfie when 1 then'满意'  when 2 then'基本满意'  when 0 then '不满意' else '未评价' end) F_Satisfie " +
3487
+                        "  from T_Bus_VisitResult WITH(NOLOCK) where F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 " +
3488
+                         " from T_Bus_WorkOrder a WITH(NOLOCK)   left join View_Keys as b on b.id = a.F_Key   " +
3489
+                        "  left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
3490
+                        "  left join T_Sys_UserAccount as users on users.F_UserCode = a.F_CreateUser" + value  + " where 1=1 " + sql + orderby).Tables[0];
3496
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
3491
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
3497
                 if (msg == "")
3492
                 if (msg == "")
3498
                 {
3493
                 {

+ 16 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

67
             Params.Add("request_url", context.Request.Url.ToString());
67
             Params.Add("request_url", context.Request.Url.ToString());
68
 
68
 
69
             bool issafe = true;
69
             bool issafe = true;
70
+
71
+
72
+            if (app != null && app.Context != null)
73
+
74
+            {
75
+
76
+                //移除Server
77
+
78
+                app.Context.Response.Headers.Remove("Server");
79
+
80
+                //移除X-AspNetMvc-Version,和上面效果一样
81
+
82
+                app.Context.Response.Headers.Remove("X-AspNetMvc-Version");
83
+
84
+            }
85
+
70
             foreach (var key in context.Request.Params.AllKeys)
86
             foreach (var key in context.Request.Params.AllKeys)
71
             {
87
             {
72
                 if (key == "ALL_HTTP")
88
                 if (key == "ALL_HTTP")

+ 3 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

34
 
34
 
35
   </connectionStrings>
35
   </connectionStrings>
36
   <system.web>
36
   <system.web>
37
+   
37
     <compilation debug="true" targetFramework="4.5" />
38
     <compilation debug="true" targetFramework="4.5" />
38
-    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="3600" />
39
+    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="3600"  enableVersionHeader="false" />
39
     <httpModules>
40
     <httpModules>
40
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
41
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
41
     </httpModules>
42
     </httpModules>
81
         <add name="Access-Control-Allow-Origin" value="*" />
82
         <add name="Access-Control-Allow-Origin" value="*" />
82
         <add name="Access-Control-Allow-Headers" value="Content-Type" />
83
         <add name="Access-Control-Allow-Headers" value="Content-Type" />
83
         <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
84
         <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
85
+        <remove name="X-Powered-By" />
84
       </customHeaders>
86
       </customHeaders>
85
     </httpProtocol>
87
     </httpProtocol>
86
     <!--cors 支持跨域 end-->
88
     <!--cors 支持跨域 end-->

+ 18 - 35
CallCenterCommon/CallCenter.QuartzService/Peoplewebsite.cs

23
       
23
       
24
         public void GetLY(object sender, EventArgs e)
24
         public void GetLY(object sender, EventArgs e)
25
         {
25
         {
26
-
27
-          
28
-                while (true)
29
-                {
30
-                    if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour < 7)
31
-                    {
32
-                        Thread.Sleep(6000);
33
-                        string t = TSWORKORDER();
34
-
35
-                        if (t != "推送成功" && t != "推送失败")
36
-                        {
37
-                            LogFactory.GetLogger("22222").Warn(t);
38
-                        id = id + 1;
39
-                        Thread.Sleep(6000);
40
-                        TSWORKORDER();
41
-                        }
42
-
43
-                    }
44
-                    else
45
-                        break;
46
-                }
47
-            
48
-           
49
-
26
+                //while (true)
27
+                //{
28
+                //        Thread.Sleep(6000);
29
+                //        string t = TSWORKORDER();
30
+
31
+                //        if (t != "推送成功" && t != "推送失败")
32
+                //        {
33
+                //            LogFactory.GetLogger("22222").Warn(t);
34
+                //        id = id + 1;
35
+                //        Thread.Sleep(6000);
36
+                //        TSWORKORDER();
37
+                //        }
38
+                //}
50
         }
39
         }
51
         public class submit_case_info
40
         public class submit_case_info
52
         {
41
         {
144
             public string CASE_ADDRESS { set; get; }//""
133
             public string CASE_ADDRESS { set; get; }//""
145
         }
134
         }
146
         string AREA_CODE = Configs.GetValue("AREACODE");
135
         string AREA_CODE = Configs.GetValue("AREACODE");
147
-        private int id = 0;
136
+        private int id = 0; int count = 0;
148
         public string TSWORKORDER()
137
         public string TSWORKORDER()
149
         {
138
         {
150
             try
139
             try
151
             {
140
             {
152
-                if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour < 7)
153
-                {
154
-
141
+               
155
                     string token = GetToken();
142
                     string token = GetToken();
156
                     if (string.IsNullOrEmpty(token))
143
                     if (string.IsNullOrEmpty(token))
157
                         return "token 错误";
144
                         return "token 错误";
158
 
145
 
159
-                    int count = 0;
146
+                   
160
                     DataTable Push = new DataTable();
147
                     DataTable Push = new DataTable();
161
                     string PushWorkorder = "SELECT top 1  *  FROM T_Bus_PushWorkorder";
148
                     string PushWorkorder = "SELECT top 1  *  FROM T_Bus_PushWorkorder";
162
                     Push = DbHelperSQL.Query(PushWorkorder).Tables[0];
149
                     Push = DbHelperSQL.Query(PushWorkorder).Tables[0];
165
                         id = int.Parse(Push.Rows[0]["id"].ToString());
152
                         id = int.Parse(Push.Rows[0]["id"].ToString());
166
                         count = int.Parse(Push.Rows[0]["count"].ToString());
153
                         count = int.Parse(Push.Rows[0]["count"].ToString());
167
                     }
154
                     }
168
-                    var modellist = new CallCenterApi.BLL.T_Bus_WorkOrder().GetModelList(5, "F_CreateTime>='2022-06-01 01:31:35.160'and F_Id>" + id + 
155
+                    var modellist = new CallCenterApi.BLL.T_Bus_WorkOrder().GetModelList(10, "F_CreateTime>='2022-06-01 01:31:35.160'and F_Id>" + id + 
169
                         " and F_IsDelete=0 and F_CreateTime <'2023-07-06 09:00:00.000' AND F_Email ='' " 
156
                         " and F_IsDelete=0 and F_CreateTime <'2023-07-06 09:00:00.000' AND F_Email ='' " 
170
                        , " F_CreateTime ASC");
157
                        , " F_CreateTime ASC");
171
                     if (modellist != null && modellist.Count > 0)
158
                     if (modellist != null && modellist.Count > 0)
374
                     {
361
                     {
375
                         return "推送完结";
362
                         return "推送完结";
376
                     }
363
                     }
377
-                }
378
-                else
379
-                {
380
-                    return "等待时间";
381
-                }
364
+              
382
             }
365
             }
383
             catch (Exception e)
366
             catch (Exception e)
384
             {
367
             {