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

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

@@ -423,7 +423,7 @@ namespace CallCenterApi.Interface.Controllers.report
 
             if (isdc > 0)
             {
-                string sqls = "select ROW_NUMBER() OVER (ORDER BY F_CreateTime asc) row,F_WorkOrderId,dbo.GetDeptNames(F_MainDeptId ) 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 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;
 
                 var dt = DbHelperSQL.Query(sqls).Tables[0];
                 NPOIHelper npoi = new NPOIHelper();
@@ -439,7 +439,7 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             else
             {
-                string cols = "F_WorkOrderId,dbo.GetDeptNames(F_MainDeptId ) F_DeptName,F_DealTime,F_ComContent,F_Result,dbo.GetDictionaryName(F_InfoSource) F_SourceName, F_CusPhone,F_ConPhone";
+                string cols = "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";
                 int recordCount = 0;
                 var dt = BLL.PagerBLL.GetListPager(
                     "T_Bus_WorkOrder a WITH(NOLOCK)" + sql,