Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_Api

RMYY_CallCenter_Api.Dal/T_Car_WorkOrder.cs

@@ -41,9 +41,9 @@ namespace RMYY_CallCenter_Api.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Car_WorkOrder(");
-            strSql.Append("F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName,F_ControlManCode,F_ControlManName)");
+            strSql.Append("F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName,F_ControlManCode,F_ControlManName,F_Content,F_UseTime)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderCode,@F_Type,@F_HosId,@F_ProposerDeptId,@F_Source,@F_CallID,@F_DepartPlace,@F_Destination,@F_ProposerCode,@F_Phon,@F_CarType,@F_Remark,@F_CreateTime,@F_CarMessage,@F_DriverCode,@F_DriverPhon,@F_DepartTime,@F_DriverName,@F_ProposerName,@F_State,@F_IsDel,@F_DeleteBy,@F_DeleteTime,@F_CreateUser,@F_AssistMan,@F_IsAssist,@F_FinishTime,@F_CarId,@F_AssistManName,@F_ControlManCode,@F_ControlManName)");
+            strSql.Append("@F_WorkOrderCode,@F_Type,@F_HosId,@F_ProposerDeptId,@F_Source,@F_CallID,@F_DepartPlace,@F_Destination,@F_ProposerCode,@F_Phon,@F_CarType,@F_Remark,@F_CreateTime,@F_CarMessage,@F_DriverCode,@F_DriverPhon,@F_DepartTime,@F_DriverName,@F_ProposerName,@F_State,@F_IsDel,@F_DeleteBy,@F_DeleteTime,@F_CreateUser,@F_AssistMan,@F_IsAssist,@F_FinishTime,@F_CarId,@F_AssistManName,@F_ControlManCode,@F_ControlManName,@F_Content,@F_UseTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
@@ -76,7 +76,10 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_CarId", SqlDbType.Int,4),
                     new SqlParameter("@F_AssistManName", SqlDbType.VarChar,50),
                     new SqlParameter("@F_ControlManCode", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_ControlManName", SqlDbType.VarChar,50)
+                    new SqlParameter("@F_ControlManName", SqlDbType.VarChar,50),
+                     new SqlParameter("@F_Content", SqlDbType.VarChar,-1),
+                    new SqlParameter("@F_UseTime", SqlDbType.VarChar,500)
+                   
             };
             parameters[0].Value = model.F_WorkOrderCode;
             parameters[1].Value = model.F_Type;
@@ -109,7 +112,9 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[28].Value = model.F_AssistManName;
             parameters[29].Value = model.F_ControlManCode;
             parameters[30].Value = model.F_ControlManName;
-
+            parameters[31].Value = model.F_Content;
+            parameters[32].Value = model.F_UseTime;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -157,7 +162,9 @@ namespace RMYY_CallCenter_Api.Dal
             strSql.Append("F_CarId=@F_CarId,");
             strSql.Append("F_AssistManName=@F_AssistManName,");
             strSql.Append("F_ControlManCode=@F_ControlManCode,");
-            strSql.Append("F_ControlManName=@F_ControlManName");
+            strSql.Append("F_ControlManName=@F_ControlManName,");
+            strSql.Append("F_Content=@F_Content,");
+            strSql.Append("F_UseTime=@F_UseTime");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
@@ -191,6 +198,8 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_AssistManName", SqlDbType.VarChar,50),
                     new SqlParameter("@F_ControlManCode", SqlDbType.VarChar,50),
                     new SqlParameter("@F_ControlManName", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Content", SqlDbType.VarChar,-1),
+                    new SqlParameter("@F_UseTime", SqlDbType.VarChar,500),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderCode;
             parameters[1].Value = model.F_Type;
@@ -223,7 +232,9 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[28].Value = model.F_AssistManName;
             parameters[29].Value = model.F_ControlManCode;
             parameters[30].Value = model.F_ControlManName;
-            parameters[31].Value = model.F_ID;
+            parameters[31].Value = model.F_Content;
+            parameters[32].Value = model.F_UseTime;
+            parameters[33].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -288,7 +299,7 @@ namespace RMYY_CallCenter_Api.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName,F_ControlManCode,F_ControlManName from T_Car_WorkOrder ");
+            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_UseTime,F_Content,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName,F_ControlManCode,F_ControlManName from T_Car_WorkOrder ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -444,6 +455,15 @@ namespace RMYY_CallCenter_Api.Dal
                 {
                     model.F_ControlManName = row["F_ControlManName"].ToString();
                 }
+                if (row["F_Content"] != null)
+                {
+                    model.F_Content = row["F_Content"].ToString();
+                }
+                if (row["F_UseTime"] != null)
+                {
+                    model.F_UseTime = row["F_UseTime"].ToString();
+                }
+                
             }
             return model;
         }
@@ -454,7 +474,7 @@ namespace RMYY_CallCenter_Api.Dal
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName,F_ControlManCode,F_ControlManName ");
+            strSql.Append("select F_ID,F_WorkOrderCode,F_UseTime,F_Type,F_HosId,F_Content,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName,F_ControlManCode,F_ControlManName ");
             strSql.Append(" FROM T_Car_WorkOrder ");
             if (strWhere.Trim() != "")
             {
@@ -474,7 +494,7 @@ namespace RMYY_CallCenter_Api.Dal
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_WorkOrderCode,F_Type,F_HosId,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName,F_ControlManCode,F_ControlManName ");
+            strSql.Append(" F_ID,F_WorkOrderCode,F_Type,F_UseTime,F_HosId,F_Content,F_ProposerDeptId,F_Source,F_CallID,F_DepartPlace,F_Destination,F_ProposerCode,F_Phon,F_CarType,F_Remark,F_CreateTime,F_CarMessage,F_DriverCode,F_DriverPhon,F_DepartTime,F_DriverName,F_ProposerName,F_State,F_IsDel,F_DeleteBy,F_DeleteTime,F_CreateUser,F_AssistMan,F_IsAssist,F_FinishTime,F_CarId,F_AssistManName,F_ControlManCode,F_ControlManName ");
             strSql.Append(" FROM T_Car_WorkOrder ");
             if (strWhere.Trim() != "")
             {

RMYY_CallCenter_Api.Dal/T_Con_WorkOrder.cs

@@ -166,10 +166,10 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[51].Value = model.F_BedNum;
             parameters[52].Value = model.F_InpatientNum;
            
-            parameters[53].Value = model.F_CallRecordId;
+              parameters[53].Value = model.F_CallRecordId;
             parameters[54].Value = model.F_LeaveRecordId;
            
-            parameters[55].Value = model.F_Relationship;
+                parameters[55].Value = model.F_Relationship;
             parameters[56].Value = model.F_FullName;
             parameters[57].Value = model.F_IDNumber;
             parameters[58].Value = model.F_ComplaintDept;
@@ -739,12 +739,6 @@ namespace RMYY_CallCenter_Api.Dal
                 {
                     model.F_ComplaintDept = int .Parse(row["F_ComplaintDept"].ToString());
                 }
-
-                if (row["F_ComplaintSource"] != null && row["F_ComplaintSource"].ToString() != "")
-                {
-                    model.F_ComplaintSource = int.Parse(row["F_ComplaintSource"].ToString());
-                }
-
                 if (row["F_ComplaintUser"] != null)
                 {
                     model.F_ComplaintUser = row["F_ComplaintUser"].ToString();

RMYY_CallCenter_Api.Model/T_Car_Message.cs

@@ -114,6 +114,7 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_responsername = value; }
             get { return _f_responsername; }
         }
+        public string F_CarTypeName { set; get; }
         #endregion Model
 
     }

RMYY_CallCenter_Api.Model/T_Car_WorkOrder.cs

@@ -69,6 +69,10 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_type = value; }
             get { return _f_type; }
         }
+        /// <summary>
+        /// 调度内容
+        /// </summary>
+        public string F_Content { set; get; }
 
         /// <summary>
         /// 申请院区
@@ -271,6 +275,10 @@ namespace RMYY_CallCenter_Api.Model
             get { return _f_finishtime; }
         }
         /// <summary>
+        /// 用车时间
+        /// </summary>
+        public string F_UseTime { set; get; }
+        /// <summary>
         /// 车辆id
         /// </summary>
         public int? F_CarId
@@ -309,6 +317,7 @@ namespace RMYY_CallCenter_Api.Model
 
         public string HosName { get; set; }
         public string F_ProposerDeptName { get; set; }
+        public string F_CarName { get; set; }
         #endregion Model
 
     }

RMYY_CallCenter_Api/Controllers/CarManage/T_Car_MessageController.cs

@@ -18,7 +18,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// <param name="pagesize"></param>
         /// <param name="pageindex"></param>
         /// <returns></returns>
-        public ActionResult GetList(string keywork, string starttime = "", string endtime = "",int pagesize=10,int pageindex=1)
+        public ActionResult GetList(string keyword, string starttime = "", string endtime = "",int pagesize=10,int pageindex=1)
         {
             DataTable date = new DataTable();
             string sql = "";
@@ -27,8 +27,8 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 sql += $"and datediff(day,F_CreateTime,'" + starttime + "')<=0";
             if (endtime.Trim() != "" && endtime != "undefined")
                 sql += $"and datediff(day,F_CreateTime,'" + endtime + "')>=0";
-            if (!string.IsNullOrEmpty(keywork))
-                sql += $" and F_CarName like '%"+ keywork + "%'";
+            if (!string.IsNullOrEmpty(keyword))
+                sql += $" and (F_CarName like '%"+ keyword + "%'or F_Remark like '%" + keyword + "%' )";
             int recordCount = 0;
             if (!string.IsNullOrEmpty(sql))
             {
@@ -37,7 +37,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             date = Bll.PagerBll.GetListPager
                                 ("T_Car_Message aa",
                                   "F_Id",
-                                  "F_Id,F_CarName,F_CarType,F_CarDeptId,F_Responser,F_Phon,F_Remark,F_CreateTime,F_State,(select F_DeptName from T_Sys_Department where F_DeptId=aa.F_CarDeptId )F_DeptName,(select F_UserName from T_Sys_UserAccount where F_UserCode=aa.F_Responser)F_ResponserName",
+                                  "F_Id,dbo.GetDictionaryName(F_CarType) F_CarTypeName,F_CarName,F_CarType,F_CarDeptId,F_Responser,F_Phon,F_Remark,F_CreateTime,F_State,(select F_DeptName from T_Sys_Department where F_DeptId=aa.F_CarDeptId )F_DeptName,(select F_UserName from T_Sys_UserAccount where F_UserCode=aa.F_Responser)F_ResponserName",
                                  where,
                                   "order by F_Id desc",
                                   pagesize,
@@ -47,6 +47,12 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
 
                                 );
             List<Model.T_Car_Message> carlist = new Bll.T_Car_Message().DataTableToList(date);
+            int i = 0;
+            foreach (var item in carlist)
+            {
+                item.F_CarTypeName = date.Rows[i]["F_CarTypeName"].ToString();
+                i++;
+            }
             if (carlist.Count > 0)
             {
                 var obj = new
@@ -94,6 +100,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             {
                 model.F_DeptName = new Bll.T_Sys_Department().GetModel(Convert.ToInt32(model.F_CarDeptId))?.F_DeptName ?? "";
                 model.F_ResponserName = new Bll.T_Sys_UserAccount().GetModel(model.F_Responser)?.F_UserName ?? "";
+                model.F_CarTypeName = new Bll.T_Sys_DictionaryValue ().GetModel(model.F_CarType.Value  )?.F_Name  ?? "";
                 return Success("获取成功", model);
             }
             else return Error("获取失败！");

RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -62,7 +62,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                                     (
                                     "T_Car_WorkOrder",
                                     "F_ID",
-                                    "*,case F_CarType when 1 then '大车' else  '小车'end F_CarTypeName",
+                                    "*,dbo.GetDictionaryName(F_CarType) F_CarTypeName",
                                     where,
                                     "order by F_ID desc",
                                     pagesize,
@@ -188,14 +188,14 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// <param name="source"></param>
         /// <param name="callid"></param>
         /// <returns></returns>
-        public ActionResult AddWorkOrder(int type,int hosid,int detpid,string startplace,string endplace,string needman,string phon,int cartype,string remark,string source,string callid="")
+        public ActionResult AddWorkOrder(int type,int hosid,string content,   
+            int detpid,string startplace,string endplace,string needman,string phon,
+            int cartype,string remark,string source,string usertime,string callid ="")
         {
             if (User!=null)
             {
                 if (type <= 0)
                     return Error("工单类型错误！");
-                if (hosid <= 0)
-                    return Error("请选择院区！");
                 if (detpid == 0)
                     return Error("请选择申请科室！");
                 if (startplace == "")
@@ -218,8 +218,10 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 model.F_DepartPlace = startplace;//出发地
                 model.F_Destination = endplace;//目的地
                 model.F_ProposerCode = needman;//申请人
+                model.F_UseTime = usertime;//用车时间
                 model.F_Phon = phon;//联系电话
                 model.F_CarType = cartype;//车辆大小
+                model.F_Content = content;//调度内容
                 model.F_Remark = remark;//备注
                 model.F_HosId = hosid;
                 model.F_CreateTime = DateTime.Now;
@@ -248,7 +250,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// <param name="cartype"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        public ActionResult UpdateWorkOrder(int orderid, int type,int hosid, int detpid, string startplace, string endplace, string needman,string needmanName, string phon, int cartype, string remark)
+        public ActionResult UpdateWorkOrder(int orderid,string usertime,string content, int type,int hosid, int detpid, string startplace, string endplace, string needman,string needmanName, string phon, int cartype, string remark)
         {
             int userId = 1;
             if (userId != 0)
@@ -258,8 +260,6 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                     return Error("查询不到此工单！");
                 if (type <= 0 )
                     return Error("工单类型错误！");
-                if (hosid <= 0)
-                    return Error("请选择院区！");
                 if (detpid == 0)
                     return Error("请选择申请科室！");
                 if (startplace == "")
@@ -282,6 +282,8 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 model.F_ProposerCode = needman;//申请人
                 model.F_ProposerName = needmanName;//申请人姓名
                 model.F_Phon = phon;//联系电话
+                model.F_UseTime = usertime;//用车时间
+                model.F_Content = content;//调度内容
                 model.F_CarType = cartype;//车辆大小
                 model.F_Remark = remark;//备注
                 #endregion
@@ -329,6 +331,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             model.HosName = new Bll.T_Wowo_repairyqbll().GetModel(model.F_HosId ?? 0)?.T_Woname ?? "";
             model.F_ProposerDeptName = new Bll.T_Sys_Department().GetModel(Convert.ToInt32(model.F_ProposerDeptId))?.F_DeptName ?? "";
             model.F_ProposerName = new Bll.T_Sys_UserAccount().GetModel(model.F_ProposerCode.ToString())?.F_UserName ?? "";
+            model.F_CarName = new Bll.T_Sys_DictionaryValue().GetModel(model.F_CarType.Value)?.F_Name ?? "";
             if (model != null)
             {
                 var obj = new