代码更新

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

@@ -274,8 +274,8 @@ namespace CallCenterApi.Interface.Controllers.report
                 end = DateTime.Now;
             }
             Dictionary<string, string> paras = new Dictionary<string, string>();
-            paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
-            paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));
+            paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd HH:mm:ss"));
+            paras.Add("@edate", end.Value.ToString("yyyy-MM-dd HH:mm:ss"));
             var obj = DbHelperSQL.RunProcedure("P_DeptEfficiencyReport_1", paras, "DeptEfficiencyReport");
             var newSet = new DataSet();
             if (obj != null && obj.Tables[0] != null && obj.Tables[0].Rows.Count > 0)

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

@@ -3130,8 +3130,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
            // int userId = 751;
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
+            int isyq = RequestString.GetInt("isyq", -1);
             //获取待办理工单数量
-            string sql = " select count(*) dblcount from T_Bus_WorkOrder where  F_IsDelete=0  and F_WorkState in (2,4,8) and F_MainDeptId="+userModel.F_DeptId;
+            string sql = " select count(*) dblcount from T_Bus_WorkOrder where  F_IsDelete=0  and F_WorkState in (2,4,8) and F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and "
+                       + " ISNULL(F_FeedbackTime, '')='' and F_MainDeptId =" + userModel.F_DeptId + " and F_IsSure in (0,1)";
+
+            if (isyq != -1)
+            {
+                sql += " and dbo.GetOverState(F_WorkOrderId)=" + isyq;
+            }
+            else
+            {
+                sql += ")";
+            }
             //获取催办数量
             string sql1 = " select count(*) dblcount from T_Bus_WorkOrder where  F_IsDelete=0  and ReminderNum>0 and F_WorkOrderID in(select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_IsSure in (0,1) and F_MainDeptId=" + userModel.F_DeptId + ") ";
             //扫描件未上传数量