报表修改

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

@@ -246,13 +246,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //根据回传时间判断
             if (hcstrstarttime.Trim() != "" && hcstrstarttime != "undefined")
             {
-                //sql += " and F_Hcdatetime >= '"+ hcstrstarttime + "'";
-                sql += " and datediff(day,F_Hcdatetime,'" + hcstrstarttime + "')<=0 ";
+                sql += " and F_Hcdatetime >= '"+ hcstrstarttime + "  00:00:00'";
+                //sql += " and datediff(day,F_Hcdatetime,'" + hcstrstarttime + "')<=0 ";
             }
             if (hcstrendtime.Trim() != "" && hcstrendtime != "undefined")
             {
-                // sql += "  and F_Hcdatetime<='"+ hcstrendtime + "'   ";
-                sql += " and datediff(day,F_Hcdatetime,'" + hcstrendtime + "')>=0   ";
+                 sql += "  and F_Hcdatetime<='"+ hcstrendtime + " 23::59:59'   ";
+                //sql += " and datediff(day,F_Hcdatetime,'" + hcstrendtime + "')>=0   ";
             }
             #endregion
 
@@ -2255,7 +2255,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string colst = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
             if (isdc > 0)
             {
-                var dtdc = DbHelperSQL.Query(" select " + colst + " from T_Bus_WorkOrder WITH(NOLOCK) where 1=1 " + sql).Tables[0];
+                var top = ""; 
+                if (sql == " and F_IsDelete=0 ")
+                {
+                    top = " top 1000 ";
+                }
+                //日期，工单号，诉求标题，诉求内容，承办单位，办理结果，是否满意，备注
+                var dtdc = DbHelperSQL.Query(" select " + top + " F_CreateTime 日期, F_OldWorkOrderId 工单号,F_ComTitle 诉求标题,F_CusName 反映人,F_CusPhone 电话号码,F_ComContent 诉求内容,dbo.GetDictionaryName(F_Key) 主题词, "
+                   + " dbo.GetDeptNames(F_MainDeptId) 承办单位, "
+                   + " (select top 1 F_Situation from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =wo.F_WorkOrderId order by F_CreateTime) 办理结果,"
+                   + " (select top 1 (case F_IsSatisfie when 1 then'满意' when 0 then '不满意'when 2 then '基本满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_WorkOrderId = wo.F_WorkOrderId order by F_Id desc) 承办单位回访结果, case F_Satisfaction when 0 then '不满意'when 1 then" +
+                   "'基本满意' when 2 then '满意' else '未评价'end 郑州回访结果"
+                   + " from T_Bus_WorkOrder wo WITH(NOLOCK) where 1=1 " + sql + sort).Tables[0];
+
+                //var dtdc = DbHelperSQL.Query(" select " + colst + " from T_Bus_WorkOrder WITH(NOLOCK) where 1=1 " + sql).Tables[0];
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
                 if (msg == "")
                 {