1

CallCenterApi/CallCenterApi.BLL/T_Call_CallRecords.cs

@@ -96,6 +96,14 @@ namespace CallCenterApi.BLL
             DataSet ds = dal.GetList(strWhere);
             return DataTableToList(ds.Tables[0]);
         }
+
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Call_CallRecords> GetModelList(int Top, string strWhere, string filedOrder)
+        {
+            DataSet ds = dal.GetList(Top, strWhere, filedOrder);
+            return DataTableToList(ds.Tables[0]);
+        }
         /// <summary>
         /// 获得数据列表
         /// </summary>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -196,6 +196,7 @@
     <Compile Include="Controllers\AreaController.cs" />
     <Compile Include="Controllers\Assessment\DataAssessmentController.cs" />
     <Compile Include="Controllers\Base\BaseController.cs" />
+    <Compile Include="Controllers\BusPushWorkorderController.cs" />
     <Compile Include="Controllers\CallOutOptController.cs" />
     <Compile Include="Controllers\callout\CallOutPlanController.cs" />
     <Compile Include="Controllers\callout\CallPlanController.cs" />
@@ -366,6 +367,7 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Views\Affairs\" />
+    <Folder Include="Views\BusPushWorkorder\" />
     <Folder Include="Views\CustomerNew\" />
     <Folder Include="Views\Functions\" />
     <Folder Include="Views\hb_affairs\" />

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -467,7 +467,11 @@ namespace CallCenterApi.Interface.Controllers.report
 
             if (isdc > 0)
             {
-                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;
+                string sqls = "select ROW_NUMBER() OVER (ORDER BY F_CreateTime asc) row,F_WorkOrderId, (case when F_IsResult=1 then '市长热线'  " +
+                    " else c.F_DeptName end) F_DeptName,F_DealTime,F_ComContent,F_Result, " +
+                    "  b.F_Value F_SourceName, F_CusPhone, F_ConPhone From T_Bus_WorkOrder a WITH(NOLOCK) " +
+                    " left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
+                    " left join T_Sys_DictionaryValue as b on b.F_ValueId = a.F_InfoSource " + sql + " where 1=1 " + sqlwhere;
 
                 var dt = DbHelperSQL.Query(sqls).Tables[0];
                 NPOIHelper npoi = new NPOIHelper();

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

@@ -558,17 +558,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (dic.Where(x => x.F_Value == User.F_RoleCode).Count() > 0)
                 {
                     var top = " "; var orderby = " order by F_CreateTime";
-                    if (sql == " and F_IsDelete=0 ")
-                    {
-                        top = " top 1000 "; orderby += " desc ";
-                    }
+                    
                     //20190715调整导出字段 zhengbingbing
                     //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                    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) 反映类别四,"
-                        + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
-                        + " F_Result 办理结果, "
-                        + " (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) 是否满意 "
-                        + " from T_Bus_WorkOrder a WITH(NOLOCK)" + value + value1 + " where 1=1 " + sql + orderby).Tables[0];
+                    var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, users.F_Name 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号, " +
+                        " F_ComTitle 诉求标题, F_ComContent 工单内容, b.names  反映类别, c.F_DeptName 主办单位, F_Result 办理结果, a.F_SpotCheck as F_SpotCheck, " +
+                        "  (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) 是否满意 " +
+                         " from T_Bus_WorkOrder a WITH(NOLOCK)   left join View_Keys as b on b.id = a.F_Key   " +
+                        "  left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
+                        "  left join T_Sys_UserAccount as users on users.F_UserCode = a.F_CreateUser" + value + value1 + " where 1=1 " + sql + orderby).Tables[0];
                     var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
                     if (msg == "")
                     {
@@ -1262,17 +1261,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (isdc > 0)
             {
                 var top = " "; var orderby = " order by F_CreateTime";
-                if (sql == " and F_IsDelete=0 ")
-                {
-                    top = " top 1000 "; orderby += " desc ";
-                }
+               
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                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) 反映类别四,"
-                    + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
-                    + " F_Result 办理结果, "
-                    + " (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) 是否满意 "
-                    + " from T_Bus_WorkOrder a WITH(NOLOCK)" + value + value1 + " where 1=1 " + sql + orderby).Tables[0];
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, users.F_Name 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号, " +
+                        " F_ComTitle 诉求标题, F_ComContent 工单内容, b.names  反映类别, c.F_DeptName 主办单位, F_Result 办理结果, a.F_SpotCheck as F_SpotCheck, " +
+                        "  (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) 是否满意 " +
+                         " from T_Bus_WorkOrder a WITH(NOLOCK)   left join View_Keys as b on b.id = a.F_Key   " +
+                        "  left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
+                        "  left join T_Sys_UserAccount as users on users.F_UserCode = a.F_CreateUser" + value + value1 + " where 1=1 " + sql + orderby).Tables[0];
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
                 if (msg == "")
                 {
@@ -2389,7 +2387,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += "and F_SpotCheck=1";
                     if (visit > -1)
                     {
-                        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 + "' ";
+                        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 + "' ";
 
                     }
                     else
@@ -2620,18 +2619,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (isdc > 0)
             {
                 var top = " "; var orderby = " order by F_CreateTime";
-                if (sql == " and F_IsDelete=0 ")
-                {
-                    top = " top 1000 "; orderby += " desc ";
-                }
+             
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
-                      + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
-
-                    + " F_Result 办理结果, "
-                    + " (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) 是否满意 "
-                    + " from T_Bus_WorkOrder wo WITH(NOLOCK)" + value + " where 1=1 " + sql + orderby).Tables[0];
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, users.F_Name 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号, " +
+                         " F_ComTitle 诉求标题, F_ComContent 工单内容, b.names  反映类别, c.F_DeptName 主办单位, F_Result 办理结果, a.F_SpotCheck as F_SpotCheck, " +
+                         "  (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) 是否满意 " +
+                          " from T_Bus_WorkOrder a WITH(NOLOCK)   left join View_Keys as b on b.id = a.F_Key   " +
+                         "  left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
+                         "  left join T_Sys_UserAccount as users on users.F_UserCode = a.F_CreateUser" + value  + " where 1=1 " + sql + orderby).Tables[0];
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
                 if (msg == "")
                 {
@@ -3481,18 +3478,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (isdc > 0)
             {
                 var top = " "; var orderby = " order by F_CreateTime";
-                if (sql == " and F_IsDelete=0 ")
-                {
-                    top = " top 1000 "; orderby += " desc ";
-                }
+              
                 //20190715调整导出字段 zhengbingbing
                 //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
-                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_WorkOrderId 工单号,F_ComTitle 诉求标题,F_ComContent 工单内容,dbo.GetDictionaryName(F_Key) 主题词, "
-                     + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
-                    + " F_Result 办理结果, "
-                    + " (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) 是否满意 "
-                    + " from T_Bus_WorkOrder wo WITH(NOLOCK)" + value + " where 1=1 " + sql + orderby).Tables[0];
+                var dtdc = DbHelperSQL.Query(" select  F_CreateTime 日期, F_CusName 姓名, users.F_Name 受话员姓名,F_CusPhone 手机号,F_WorkOrderId 工单号, " +
+                        " F_ComTitle 诉求标题, F_ComContent 工单内容, b.names  反映类别, c.F_DeptName 主办单位, F_Result 办理结果, a.F_SpotCheck as F_SpotCheck, " +
+                        "  (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) 是否满意 " +
+                         " from T_Bus_WorkOrder a WITH(NOLOCK)   left join View_Keys as b on b.id = a.F_Key   " +
+                        "  left join T_Sys_Department as c on c.F_DeptId = a.F_MainDeptId " +
+                        "  left join T_Sys_UserAccount as users on users.F_UserCode = a.F_CreateUser" + value  + " where 1=1 " + sql + orderby).Tables[0];
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
                 if (msg == "")
                 {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -67,6 +67,22 @@ namespace CallCenterApi.Interface
             Params.Add("request_url", context.Request.Url.ToString());
 
             bool issafe = true;
+
+
+            if (app != null && app.Context != null)
+
+            {
+
+                //移除Server
+
+                app.Context.Response.Headers.Remove("Server");
+
+                //移除X-AspNetMvc-Version，和上面效果一样
+
+                app.Context.Response.Headers.Remove("X-AspNetMvc-Version");
+
+            }
+
             foreach (var key in context.Request.Params.AllKeys)
             {
                 if (key == "ALL_HTTP")

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -34,8 +34,9 @@
 
   </connectionStrings>
   <system.web>
+   
     <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="3600" />
+    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="3600"  enableVersionHeader="false" />
     <httpModules>
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
     </httpModules>
@@ -81,6 +82,7 @@
         <add name="Access-Control-Allow-Origin" value="*" />
         <add name="Access-Control-Allow-Headers" value="Content-Type" />
         <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
+        <remove name="X-Powered-By" />
       </customHeaders>
     </httpProtocol>
     <!--cors 支持跨域 end-->

CallCenterCommon/CallCenter.QuartzService/Peoplewebsite.cs

@@ -23,30 +23,19 @@ namespace CallCenter.QuartzService
       
         public void GetLY(object sender, EventArgs e)
         {
-
-          
-                while (true)
-                {
-                    if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour < 7)
-                    {
-                        Thread.Sleep(6000);
-                        string t = TSWORKORDER();
-
-                        if (t != "推送成功" && t != "推送失败")
-                        {
-                            LogFactory.GetLogger("22222").Warn(t);
-                        id = id + 1;
-                        Thread.Sleep(6000);
-                        TSWORKORDER();
-                        }
-
-                    }
-                    else
-                        break;
-                }
-            
-           
-
+                //while (true)
+                //{
+                //        Thread.Sleep(6000);
+                //        string t = TSWORKORDER();
+
+                //        if (t != "推送成功" && t != "推送失败")
+                //        {
+                //            LogFactory.GetLogger("22222").Warn(t);
+                //        id = id + 1;
+                //        Thread.Sleep(6000);
+                //        TSWORKORDER();
+                //        }
+                //}
         }
         public class submit_case_info
         {
@@ -144,19 +133,17 @@ namespace CallCenter.QuartzService
             public string CASE_ADDRESS { set; get; }//""
         }
         string AREA_CODE = Configs.GetValue("AREACODE");
-        private int id = 0;
+        private int id = 0; int count = 0;
         public string TSWORKORDER()
         {
             try
             {
-                if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour < 7)
-                {
-
+               
                     string token = GetToken();
                     if (string.IsNullOrEmpty(token))
                         return "token 错误";
 
-                    int count = 0;
+                   
                     DataTable Push = new DataTable();
                     string PushWorkorder = "SELECT top 1  *  FROM T_Bus_PushWorkorder";
                     Push = DbHelperSQL.Query(PushWorkorder).Tables[0];
@@ -165,7 +152,7 @@ namespace CallCenter.QuartzService
                         id = int.Parse(Push.Rows[0]["id"].ToString());
                         count = int.Parse(Push.Rows[0]["count"].ToString());
                     }
-                    var modellist = new CallCenterApi.BLL.T_Bus_WorkOrder().GetModelList(5, "F_CreateTime>='2022-06-01 01:31:35.160'and F_Id>" + id + 
+                    var modellist = new CallCenterApi.BLL.T_Bus_WorkOrder().GetModelList(10, "F_CreateTime>='2022-06-01 01:31:35.160'and F_Id>" + id + 
                         " and F_IsDelete=0 and F_CreateTime <'2023-07-06 09:00:00.000' AND F_Email ='' " 
                        , " F_CreateTime ASC");
                     if (modellist != null && modellist.Count > 0)
@@ -374,11 +361,7 @@ namespace CallCenter.QuartzService
                     {
                         return "推送完结";
                     }
-                }
-                else
-                {
-                    return "等待时间";
-                }
+              
             }
             catch (Exception e)
             {