更新

RMYY_CallCenter_Api.DB/DbHelperSQL.cs

@@ -1162,7 +1162,7 @@ namespace RMYY_CallCenter_Api.DB
             }
         }
 
-        public static DataSet RunProcedure(string storedProcName, Dictionary<String, String> paras, string tableName)
+        public static DataSet RunProcedure1(string storedProcName, Dictionary<String, String> paras, string tableName)
         {
             List<SqlParameter> ps = new List<SqlParameter>();
             foreach (KeyValuePair<string, string> kvp in paras)
@@ -1182,6 +1182,26 @@ namespace RMYY_CallCenter_Api.DB
         }
 
 
+        public static DataSet RunProcedure(string storedProcName, Dictionary<String, Object> paras, string tableName)
+        {
+            List<SqlParameter> ps = new List<SqlParameter>();
+            foreach (KeyValuePair<string, Object> kvp in paras)
+            {
+                ps.Add(new SqlParameter(kvp.Key, kvp.Value));
+            }
+            using (SqlConnection connection = new SqlConnection(connectionString))
+            {
+                DataSet dataSet = new DataSet();
+                connection.Open();
+                SqlDataAdapter sqlDA = new SqlDataAdapter();
+                sqlDA.SelectCommand = BuildQueryCommand(connection, storedProcName, ps.ToArray());
+                sqlDA.Fill(dataSet, tableName);
+                connection.Close();
+                return dataSet;
+            }
+        }
+
+
         /// <summary>
         /// 构建 SqlCommand 对象(用来返回一个结果集，而不是一个整数值)
         /// </summary>

RMYY_CallCenter_Api.Model/T_Acc_WorkOrder.cs

@@ -51,6 +51,9 @@ namespace RMYY_CallCenter_Api.Model
         private string _f_deleteby;
         private DateTime? _f_deletetime;
         private DateTime? _f_finishtime;
+        private string _f_drivername;
+        private string _f_driverphon;
+        private string _f_carmessage;
         /// <summary>
         /// 
         /// </summary>
@@ -339,6 +342,30 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_finishtime = value; }
             get { return _f_finishtime; }
         }
+        /// <summary>
+        /// 司机信息
+        /// </summary>
+        public string F_DriverName
+        {
+            set { _f_drivername = value; }
+            get { return _f_drivername; }
+        }
+        /// <summary>
+        /// 司机电话
+        /// </summary>
+        public string F_DriverPhon
+        {
+            set { _f_driverphon = value; }
+            get { return _f_driverphon; }
+        }
+        /// <summary>
+        /// 车辆信息
+        /// </summary>
+        public string F_CarMessage
+        {
+            set { _f_carmessage = value; }
+            get { return _f_carmessage; }
+        }
         #endregion Model
 
     }

RMYY_CallCenter_Api.Utility/Helper/DataTableExtensions.cs

@@ -0,0 +1,189 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RMYY_CallCenter_Api.Utility
+{
+    public static class DataTableExtensions
+    {
+        /// <summary>    
+
+        /// 转化一个DataTable    
+
+        /// </summary>    
+
+        /// <typeparam name="T"></typeparam>    
+        /// <param name="list"></param>    
+        /// <returns></returns>    
+        public static DataTable ToDataTable<T>(this IEnumerable<T> list)
+        {
+
+            //创建属性的集合    
+            List<PropertyInfo> pList = new List<PropertyInfo>();
+            //获得反射的入口    
+
+            Type type = typeof(T);
+            DataTable dt = new DataTable();
+            //把所有的public属性加入到集合 并添加DataTable的列    
+            Array.ForEach<PropertyInfo>(type.GetProperties(), p => { pList.Add(p); dt.Columns.Add(p.Name, p.PropertyType); });
+            foreach (var item in list)
+            {
+                //创建一个DataRow实例    
+                DataRow row = dt.NewRow();
+                //给row 赋值    
+                pList.ForEach(p => row[p.Name] = p.GetValue(item, null));
+                //加入到DataTable    
+                dt.Rows.Add(row);
+            }
+            return dt;
+        }
+
+
+        /// <summary>    
+        /// DataTable 转换为List 集合    
+        /// </summary>    
+        /// <typeparam name="TResult">类型</typeparam>    
+        /// <param name="dt">DataTable</param>    
+        /// <returns></returns>    
+        public static List<T> ToList<T>(this DataTable dt) where T : class, new()
+        {
+            //创建一个属性的列表    
+            List<PropertyInfo> prlist = new List<PropertyInfo>();
+            //获取TResult的类型实例  反射的入口    
+
+            Type t = typeof(T);
+
+            //获得TResult 的所有的Public 属性 并找出TResult属性和DataTable的列名称相同的属性(PropertyInfo) 并加入到属性列表     
+            Array.ForEach<PropertyInfo>(t.GetProperties(), p => { if (dt.Columns.IndexOf(p.Name) != -1) prlist.Add(p); });
+
+            //创建返回的集合    
+
+            List<T> oblist = new List<T>();
+
+            foreach (DataRow row in dt.Rows)
+            {
+                //创建TResult的实例    
+                T ob = new T();
+                //找到对应的数据  并赋值    
+                prlist.ForEach(p => { if (row[p.Name] != DBNull.Value) p.SetValue(ob, row[p.Name], null); });
+                //放入到返回的集合中.    
+                oblist.Add(ob);
+            }
+            return oblist;
+        }
+
+
+
+
+        /// <summary>    
+        /// 将集合类转换成DataTable    
+        /// </summary>    
+        /// <param name="list">集合</param>    
+        /// <returns></returns>    
+        public static DataTable ToDataTableTow(this IList list)
+        {
+            DataTable result = new DataTable();
+            if (list.Count > 0)
+            {
+                PropertyInfo[] propertys = list[0].GetType().GetProperties();
+
+                foreach (PropertyInfo pi in propertys)
+                {
+                    result.Columns.Add(pi.Name, pi.PropertyType);
+                }
+                for (int i = 0; i < list.Count; i++)
+                {
+                    ArrayList tempList = new ArrayList();
+                    foreach (PropertyInfo pi in propertys)
+                    {
+                        object obj = pi.GetValue(list[i], null);
+                        tempList.Add(obj);
+                    }
+                    object[] array = tempList.ToArray();
+                    result.LoadDataRow(array, true);
+                }
+            }
+            return result;
+        }
+
+
+        /**/
+
+        /// <summary>    
+        /// 将泛型集合类转换成DataTable    
+
+        /// </summary>    
+        /// <typeparam name="T">集合项类型</typeparam>    
+
+        /// <param name="list">集合</param>    
+        /// <returns>数据集(表)</returns>    
+        public static DataTable ToDataTable<T>(this IList<T> list)
+        {
+            return ToDataTable<T>(list, null);
+
+        }
+
+
+        /**/
+
+        /// <summary>    
+        /// 将泛型集合类转换成DataTable    
+        /// </summary>    
+        /// <typeparam name="T">集合项类型</typeparam>    
+        /// <param name="list">集合</param>    
+        /// <param name="propertyName">需要返回的列的列名</param>    
+        /// <returns>数据集(表)</returns>    
+        public static DataTable ToDataTable<T>(this IList<T> list, params string[] propertyName)
+        {
+            List<string> propertyNameList = new List<string>();
+            if (propertyName != null)
+                propertyNameList.AddRange(propertyName);
+            DataTable result = new DataTable();
+            if (list.Count > 0)
+            {
+                PropertyInfo[] propertys = list[0].GetType().GetProperties();
+                foreach (PropertyInfo pi in propertys)
+                {
+                    if (propertyNameList.Count == 0)
+                    {
+                        result.Columns.Add(pi.Name, pi.PropertyType);
+                    }
+                    else
+                    {
+                        if (propertyNameList.Contains(pi.Name))
+                            result.Columns.Add(pi.Name, pi.PropertyType);
+                    }
+                }
+
+                for (int i = 0; i < list.Count; i++)
+                {
+                    ArrayList tempList = new ArrayList();
+                    foreach (PropertyInfo pi in propertys)
+                    {
+                        if (propertyNameList.Count == 0)
+                        {
+                            object obj = pi.GetValue(list[i], null);
+                            tempList.Add(obj);
+                        }
+                        else
+                        {
+                            if (propertyNameList.Contains(pi.Name))
+                            {
+                                object obj = pi.GetValue(list[i], null);
+                                tempList.Add(obj);
+                            }
+                        }
+                    }
+                    object[] array = tempList.ToArray();
+                    result.LoadDataRow(array, true);
+                }
+            }
+            return result;
+        }
+    }
+}

RMYY_CallCenter_Api.Utility/RMYY_CallCenter_Api.Utility.csproj

@@ -68,6 +68,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Helper\DataTableExtensions.cs" />
     <Compile Include="Extention\Object.cs" />
     <Compile Include="Extention\String.cs" />
     <Compile Include="Helper\CacheHelper.cs" />

RMYY_CallCenter_Api/Controllers/CallOutOptController.cs

@@ -1,135 +0,0 @@
-using RMYY_CallCenter_Api.Utility;
-using RMYY_CallCenter_Api.Controllers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-
-namespace RMYY_CallCenter_Api.Controllers
-{
-    public class CallOutOptController : BaseController
-    {
-        //外呼判断本地外地以及加前缀返回
-        public ActionResult GetCallOutprefix(string phone)
-        {
-            ActionResult res = NoToken("未知错误，请重新登录");
-            if (Request.IsAuthenticated)
-            {
-                //string phone1 = RequestString.ToDBC(RequestString.RemoveNotNumber(WebHelper.NoHtml(phone)));
-                string tophone = phone;
-                string zipcode = ""; string bfix = ""; string wfix = ""; string fix = "";
-                string userseatgroupid = User.F_SeatGroup.ToString();
-                if (userseatgroupid != "" && userseatgroupid != "0")
-                {
-                    Model.T_Sys_SeatGroup smodel = new Bll.T_Sys_SeatGroup().GetModel(int.Parse(userseatgroupid));
-                    if (smodel != null)
-                    {
-                        zipcode = smodel.F_ZXAtt.Trim();
-                        bfix = smodel.F_WHBDKey.Trim();
-                        wfix = smodel.F_WHWDKey.Trim();
-                    }
-                }
-                int zip = GetZipCodeByPhone(phone, zipcode);
-                #region 
-                if (zip == 1)
-                {//手机本地号码
-                    fix = bfix;
-                }
-                else if (zip == 2)
-                {//手机外地号码
-                    fix = wfix;
-                }
-                else {
-                    tophone = phone.TrimStart('0');
-                    if (zip == 3)
-                    {//本地固话去0加9 比如：988888517，937188888517
-                        fix = bfix;
-                    }
-                    else if (zip == 4)
-                    {//外地固话前加9 比如：9037188888517
-                        fix = wfix;
-                    }
-                }
-                #endregion
-                var obj = new
-                {
-                    phone = fix+tophone,
-                    fix = fix
-                };
-
-                res = Success("外呼号码加前缀", obj);
-            }
-            return res;
-        }
-
-        /// <summary>
-        /// 根据号码和区号判断号码是否为归属地号码
-        /// 返回0为分机号或特殊号码
-        /// 返回1为手机本地号码
-        /// 返回2为手机外地号码
-        /// 返回3为固定电话本地号码
-        /// 返回4为固定电话外地号码
-        /// </summary>
-        /// <param name="phone"></param>
-        /// <param name="zipcode"></param>
-        /// <returns></returns>
-        [NonAction]
-        public int GetZipCodeByPhone(string phone, string zipcode)
-        {
-            int res = 0;
-            if (phone.Trim().Length >= 7)
-            {
-                //7位及7位以上是固定电话或手机
-                //判断是否手机
-                if (phone.Trim().Length == 11 && phone[0] == '1')
-                {//号码为11位，首位是1，为手机号
-                    Bll.T_Sys_MobileData mobile_Bll = new Bll.T_Sys_MobileData();
-                    Model.T_Sys_MobileData mobileModel = mobile_Bll.GetModelList("F_MobileNum='"+ phone.Substring(0, 7) + "'").FirstOrDefault();
-                    if (mobileModel != null)
-                    {
-                        if (mobileModel.F_ZipCode.Equals(zipcode))
-                        {
-                            res = 1;
-                        }
-                        else
-                        {
-                            res = 2;
-                        }
-                    }
-                }
-                else
-                {
-                    if (phone.Trim().Length == 11 && phone.Substring(0, 3).Equals(zipcode))
-                    {//号码为11位
-                        //截取前三位区号判断是否本地
-                        bool resbd3 = phone.Substring(0, 3).Equals(zipcode);
-                        //截取前四位区号判断是否本地
-                        bool resbd4 = phone.Substring(0, 4).Equals(zipcode);
-                        if (resbd3 || resbd4)
-                        {
-                            res = 3;
-                        }
-                        else
-                        {
-                            res = 4;
-                        }
-                    }
-                    else if (phone.Trim().Length < 11)
-                    {//号码小于11位，为本地
-                        res = 3;
-                    }
-                    else if (phone.Trim().Length > 11 && phone.Substring(0, 4).Equals(zipcode))
-                    {//号码大于11位，截取前四位区号判断是否本地
-                        res = 3;
-                    }
-                    else
-                    {
-                        res = 4;
-                    }
-                }
-            }
-            return res;
-        }
-    }
-}

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Mat_WorkOrderController.cs

@@ -341,7 +341,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             model.F_ProposerPhon = phon;
             model.F_SendDeptId = senddeptid;//送达科室
             model.F_SendDeptName = deptname;//科室姓名
-            model.F_ItemMessages = itemessage;//物质转移内容
+            model.F_ItemMessages = itemessage;//物资转移内容
             model.F_Remark = remark;
             model.F_CreateTime = DateTime.Now;
             model.F_CreateCode = User1.F_UserCode;

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkOrderReportController.cs

@@ -0,0 +1,87 @@
+using RMYY_CallCenter_Api.DB;
+using RMYY_CallCenter_Api.Models.Dto;
+using RMYY_CallCenter_Api.Models.Enum;
+using RMYY_CallCenter_Api.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+
+namespace RMYY_CallCenter_Api.Controllers.WorkOrder
+{
+    public class WorkOrderReportController : BaseController
+    {
+        public ActionResult GetList(string keyword="", string starttime = "", string endtime = "", int pageindex = 1, int pagesize = 10, int state = -1)
+        {
+            Dictionary<string, object> paras = new Dictionary<string, object>();
+            paras.Add("@keyword", keyword);
+            paras.Add("@sdate",starttime);
+            paras.Add("@edate", endtime);
+            paras.Add("@pageindex", pageindex);
+            paras.Add("@pagesize", pagesize);
+            var data = DbHelperSQL.RunProcedure("P_GetComWorkOrder", paras, "AllWokerOrder").Tables[0];
+            var workklist = DataTableExtensions.ToList<TotalWorkeOrderDto>(data).ToList();
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = workklist.Select(p => new
+                {
+                 WoName= Utility.EnumHelper.GetDescription((EnumWorkOrder)p.swotype),
+                 WoState=GetWoState(p.fwotype,p.swotype,p.wostate),
+                 modellist=p
+                })
+
+
+            };
+            return Content(obj.ToJson());
+        }
+
+        private string GetWoState(int ftype,int stype,int wstate)
+        {
+            string WstateName = "";
+            if (ftype == 1)
+            {
+
+            }
+            else if (ftype == 2)
+            {
+                switch (stype)
+                {
+                    case (int)EnumWorkOrder.Dev:
+                        WstateName= Utility.EnumHelper.GetDescription((EnumDevWorkOrderState)wstate);
+                        break;
+      
+                    case (int)EnumWorkOrder.Mat:
+                        WstateName= Utility.EnumHelper.GetDescription((EnumMatWorkOrderState)wstate);
+                        break; 
+                    case (int)EnumWorkOrder.Hos:
+                        WstateName= Utility.EnumHelper.GetDescription((EnumHosWorkOrderState)wstate);
+                        break;
+                    case (int)EnumWorkOrder.BloodDis:
+                    case (int)EnumWorkOrder.RedDis:
+                    case (int)EnumWorkOrder.OrtherDis:
+                    case (int)EnumWorkOrder.UrgDis:
+                        WstateName = Utility.EnumHelper.GetDescription((EnumDisWorkOrderState)wstate);
+                        break;
+                    case (int)EnumWorkOrder.Serve:
+                    case (int)EnumWorkOrder.TakeBlood:
+                        WstateName = Utility.EnumHelper.GetDescription((EnumAccWorkOrderState)wstate);
+                        break;
+                }
+            }
+            else if (ftype == 3)
+            {
+
+            }
+            else if (ftype == 4)
+            {
+
+            }
+
+            return WstateName;
+        }
+    }
+}

RMYY_CallCenter_Api/Models/Dto/TotalWorkeOrderDto.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace RMYY_CallCenter_Api.Models.Dto
+{
+    public class TotalWorkeOrderDto
+    {
+
+
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public int F_Id { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string WoCode { get; set; }
+        /// <summary>
+        /// 工单分类一级
+        /// </summary>
+        public int fwotype { get; set; }
+        /// <summary>
+        /// 工单类型二级
+        /// </summary>
+        public int swotype { get; set; }
+        /// <summary>
+        /// 工单分类三级
+        /// </summary>
+        public int twotype { get; set; }
+        /// <summary>
+        /// 工单状态
+        /// </summary>
+        public int wostate { get; set; }
+        /// <summary>
+        /// 工单来源
+        /// </summary>
+        public string wosource { get; set; }
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string wocontent { get; set; }
+        /// <summary>
+        /// 申请部门
+        /// </summary>
+        public string proserdept { get; set; }
+        /// <summary>
+        /// 申请人电话
+        /// </summary>
+        public string proserphone { get; set; }
+        /// <summary>
+        /// 申请人姓名
+        /// </summary>
+        public string prosername { get; set; }
+        /// <summary>
+        /// 位置
+        /// </summary>
+        public string position { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime createtime { get; set; }
+        /// <summary>
+        /// 调度员
+        /// </summary>
+        public string controlman { get; set; }
+        /// <summary>
+        /// 转运人信息
+        /// </summary>
+        public string transperson { get; set; }
+        /// <summary>
+        /// 维修人信息
+        /// </summary>
+        public string repairman { get; set; }
+        /// <summary>
+        /// 检查项目
+        /// </summary>
+        public string checkitem { get; set; }
+        /// <summary>
+        /// 司机信息
+        /// </summary>
+        public string drivermessage { get; set; }
+    }
+}

RMYY_CallCenter_Api/Models/Enum/EnumAccWorkOrderState.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web;
+
+namespace RMYY_CallCenter_Api.Models.Enum
+{
+    /// <summary>
+    /// 工单状态枚举
+    /// </summary>
+    public enum EnumAccWorkOrderState
+    {
+        [Description("新工单待指派")]
+        neworder,
+        [Description("已指派待查收")]
+        assign,
+        [Description("已查收待到达")]
+        receive,
+        [Description("已到达待陪检")]
+        arrive,
+        //[Description("已退回待处理")]
+        //reback,
+        //[Description("异常退回待接单")]
+        //abreback,
+        [Description("陪检中")]
+        keep,
+        [Description("处理中")]
+        dealing,
+        [Description("已完成")]
+        end,
+        [Description("已完结")]
+        finish = 10,
+        [Description("已评价")]
+        evaluate,
+        //[Description("已退回待指派")]
+        //reassign,
+    }
+
+    /// <summary>
+    /// 工单记录类型枚举
+    /// </summary>
+    public enum EnumAccItemType
+    {
+        [Description("办理")]
+        deal = 1,
+        [Description("催办")]
+        urge = 2,
+        [Description("评价")]
+        evaluate = 3,
+        [Description("修改")]
+        update = 4,
+        [Description("删除")]
+        delete = 5,
+        [Description("回访")]
+        visit = 6,
+        [Description("审批")]
+        audit = 7,
+        [Description("延期")]
+        Delay = 8,
+    }
+    /// <summary>
+    /// 工单记录操作
+    /// </summary>
+    public enum EnumAccItemOpt
+    {
+        [Description("添加")]
+        create,
+        [Description("指派")]
+        assign,
+        [Description("查收")]
+        receive,
+        [Description("到达")]
+        arrive,
+        [Description("陪检")]
+        keep,
+        [Description("处理")]
+        deal,
+        [Description("完成")]
+        end,
+        [Description("处理完结")]
+        over,
+        [Description("评价")]
+        evaluate,
+        [Description("修改")]
+        update,
+        [Description("删除")]
+        delete
+
+    }
+
+}

RMYY_CallCenter_Api/RMYY_CallCenter_Api.csproj

@@ -149,11 +149,14 @@
     <Compile Include="Controllers\WorkOrder\T_Dis_WorkOrderController.cs" />
     <Compile Include="Controllers\WorkOrder\T_Hos_WorkOrderController.cs" />
     <Compile Include="Controllers\WorkOrder\T_Mat_WorkOrderController.cs" />
+    <Compile Include="Controllers\WorkOrder\WorkOrderReportController.cs" />
     <Compile Include="Filter\AuthorizeFilter.cs" />
     <Compile Include="Filter\ExceptionFilter.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="Models\Dto\TotalWorkeOrderDto.cs" />
+    <Compile Include="Models\Enum\EnumAccWorkOrderState.cs" />
     <Compile Include="Models\Enum\EnumDevWorkOrderState.cs" />
     <Compile Include="Models\Enum\EnumDisWorkOrderState.cs" />
     <Compile Include="Models\Enum\EnumHosWorkOrderState.cs" />
@@ -189,6 +192,7 @@
     <Folder Include="Views\T_Dis_WorkOrder\" />
     <Folder Include="Views\T_Hos_WorkOrder\" />
     <Folder Include="Views\WorkBase\" />
+    <Folder Include="Views\WorkOrderReport\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Configs\log4net.config" />