我得提交

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Web;
 using RMYY_CallCenter_Api.Utility;
 using RMYY_CallCenter_Api.Models.Dto;
+using RMYY_CallCenter_Api.Models;
 
 namespace RMYY_CallCenter_Api
 {
@@ -223,5 +224,34 @@ namespace RMYY_CallCenter_Api
             typename = "";
             return restr;
         }
+
+        /// <summary>
+        /// 根据工单状态获取操作按钮
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public static List<FaultButtonGroup.button> GetbuttonList(int type,int state)
+        {
+            List<FaultButtonGroup.button> buttons = new List<FaultButtonGroup.button>();
+            if (type > 0)
+            {
+               string sql = $" F_Type={type} and F_State={state}";
+                var modelist = new Bll.T_Wo_StatusOpt().GetModelList(sql);
+                if (modelist.Count > 0)
+                {
+                    foreach (var item in modelist)
+                    {
+                        FaultButtonGroup.button itembutton = null;
+                        itembutton.key =Convert.ToInt32(item.F_MenuId);
+                        itembutton.value = new Bll.T_Sys_Menu().GetModel(Convert.ToInt32(item.F_MenuId))?.F_MenuName ?? "";
+                        buttons.Add(itembutton);
+                    }
+                    return buttons;
+                }
+                return null;
+            }
+            return null;
+        }
     }
 }

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkOrderReportController.cs

@@ -29,16 +29,16 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (User != null)
             {
                 int recordCount = 0;
-                string sql = $" and prosercode={User.F_UserCode}";
-                if (string.IsNullOrEmpty(name))
+                string sql = $" and prosercode='{User.F_UserCode}'";
+                if (!string.IsNullOrEmpty(name))
                 {
                     sql += $" and prosername like '%{name}%'";
                 }
-                if (string.IsNullOrEmpty(phone))
+                if (!string.IsNullOrEmpty(phone))
                 {
                     sql += $" and proserphone like '%{phone}%'";
                 }
-                if (string.IsNullOrEmpty(wocode))
+                if (!string.IsNullOrEmpty(wocode))
                 {
                     sql += $" and wocode like '%{wocode}%'";
                 }
@@ -67,9 +67,35 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 foreach (var item in workklist)
                 {
                     item.WstateName = GetWoState(item.fwotype, item.swotype, item.wostate);
-                    //item.WoName = Utility.EnumHelper.GetDescription((EnumWorkOrder)item.swotype);
-                    item.WoName = new Bll.T_Sys_GongDan().GetModel(item.fwotype)?.F_Name ?? "";
-                    item.WoName = new Bll.T_Sys_GongDan().GetModel(item.swotype)?.F_Name ?? "";
+                    item.WoTopName = new Bll.T_Sys_GongDan().GetModel(item.fwotype)?.F_Name ?? "";
+                    #region  超时时间
+                    if (!string.IsNullOrEmpty(item.swotype.ToString()))
+                    {
+                        var gdmodel = new Bll.T_Sys_GongDan().GetModel(item.swotype);
+                        if (gdmodel != null)
+                        {
+                            DateTime deadline = item.createtime.AddHours(gdmodel.F_TimeOut);
+                            TimeSpan ts = deadline.Subtract(DateTime.Now);
+                            double tss = double.Parse(Math.Round(ts.TotalSeconds, 0).ToString());
+                            if (tss < 0) { tss = -tss; }
+                            string gshsj = DateTimeConvert.parseTimeSeconds(tss, 1);
+
+                            if (deadline > DateTime.Now)
+                            {
+
+                                item.GapTime = "剩余" + gshsj;
+                            }
+                            else
+                            {
+
+                                item.GapTime = "超期" + gshsj;
+                            }
+                        }
+                    }
+                    #endregion
+                    #region 操作按钮
+                    item.buttons = WorkOrderBase.GetbuttonList(item.swotype,item.wostate);
+                    #endregion
 
                 }
                 var obj = new
@@ -126,8 +152,6 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             foreach (var item in workklist)
             {
                 item.WstateName = GetWoState(item.fwotype, item.swotype, item.wostate);
-                //item.WoName = Utility.EnumHelper.GetDescription((EnumWorkOrder)item.swotype);
-                item.WoName = new Bll.T_Sys_GongDan().GetModel(item.swotype)?.F_Name ?? "";
             }
             var obj = new
             {
@@ -178,27 +202,24 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 //0 代派工 1 已转派 2 已处理 3已完结 4异常结束 5已拒单 6外协作单子
                 switch (wstate)
                 {
-                    case 0:
-                        WstateName = "代派工";
+                    case (int)EnumFaultRepairWorkOrderState.neworder:
+                        WstateName = "待接单";
                         break;
 
-                    case 1:
-                        WstateName = "已转派";
+                    case (int)EnumFaultRepairWorkOrderState.receive:
+                        WstateName = "待接单";
                         break;
-                    case 2:
-                        WstateName = "已处理";
+                    case (int)EnumFaultRepairWorkOrderState.dealing:
+                        WstateName = "已接单";
                         break;                   
-                    case 3:
-                        WstateName = "已完结";
-                        break;
-                    case 4:
-                        WstateName = "异常结束";
+                    case (int)EnumFaultRepairWorkOrderState.dealed:
+                        WstateName = "待评价";
                         break;
-                    case 5:
-                        WstateName = "已拒单";
+                    case (int)EnumFaultRepairWorkOrderState.exceptionended:
+                        WstateName = "已完成";
                         break;
-                    case 6:
-                        WstateName = "外协作单子";
+                    case (int)EnumFaultRepairWorkOrderState.finish:
+                        WstateName = "已完成";
                         break;
                 }
             }

RMYY_CallCenter_Api/Models/Dto/TotalWorkeOrderDto.cs

@@ -86,13 +86,13 @@ namespace RMYY_CallCenter_Api.Models.Dto
         /// 工单状态名称
         /// </summary>
         public string WstateName { get; set; }
-        /// <summary>
-        /// 工单名称
-        /// </summary>
-        public string WoName { get; set; }
+
         /// <summary>
         /// 业务类型
         /// </summary>
         public string WoTopName { get; set; }
+
+        public List<FaultButtonGroup.button> buttons { get; set; }
+        public string GapTime { get; set; }
     }
 }