修改

RMYY_CallCenter_Api.Bll/RMYY_CallCenter_Api.Bll.csproj

@@ -46,7 +46,7 @@
     <Compile Include="T_Call_CallRecords.cs" />
     <Compile Include="T_Call_LeaveRecord.cs" />
     <Compile Include="T_Con_WorkOrder.cs" />
-    <Compile Include="T_Con_WorkOrderItem_New.cs" />
+    <Compile Include="T_Con_WorkOrderItem.cs" />
     <Compile Include="T_Cus_Customer.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

RMYY_CallCenter_Api.Dal/RMYY_CallCenter_Api.Dal.csproj

@@ -46,7 +46,7 @@
     <Compile Include="T_Call_CallRecords.cs" />
     <Compile Include="T_Call_LeaveRecord.cs" />
     <Compile Include="T_Con_WorkOrder.cs" />
-    <Compile Include="T_Con_WorkOrderItem_New.cs" />
+    <Compile Include="T_Con_WorkOrderItem.cs" />
     <Compile Include="T_Cus_Customer.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

RMYY_CallCenter_Api.Model/RMYY_CallCenter_Api.Model.csproj

@@ -45,7 +45,7 @@
     <Compile Include="T_Call_CallRecords.cs" />
     <Compile Include="T_Call_LeaveRecord.cs" />
     <Compile Include="T_Con_WorkOrder.cs" />
-    <Compile Include="T_Con_WorkOrderItem_New.cs" />
+    <Compile Include="T_Con_WorkOrderItem.cs" />
     <Compile Include="T_Cus_Customer.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

RMYY_CallCenter_Api/Controllers/Con_WorkOrderController.cs

@@ -27,19 +27,33 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <param name="pageindex"></param>
         /// <param name="pagesize"></param>
         /// <returns></returns>
-        public ActionResult GetList(string starttime="",string endtime="", int type = 0, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetList(string keywords, string starttime="",string endtime="", int type = 0, int pageindex = 1, int pagesize = 10,int state=-1)
         {
             int userId = 1;
             if (userId != 0)
             {
+                #region 查询条件
                 string sql = $" and F_IsDel=0";
                 DataTable date = new DataTable();
                 if (type > 0 && type < 5)
-                    sql += $" and F_Type1=" + type;
+                    sql += $" and F_type1=" + type;
                 if (starttime.Trim() != "" && starttime != "undefined")
                     sql += $" and datediff(day,F_CreateTime,'" + starttime + "') <=0 ";
                 if (endtime.Trim() != "" && endtime != "undefined")
                     sql += $" and datediff(day,F_CreateTime,'" + endtime + "')>=0";
+                if (!string.IsNullOrEmpty(keywords))
+                {
+                    sql += $" and (F_Customer like '%" + keywords.Trim() + "%' or F_WorkOrderCode like '%" + keywords.Trim() + "%' or F_Phon like '%" + keywords.Trim() + "%')";
+                }
+                if (state >= 0)
+                {
+                    int[] arr ={0,1,2,3,4,5,6,10 };
+                    if (arr.Contains(state))
+                    {
+                        sql += $"and F_State=" + state;
+                    }
+                }
+                #endregion
                 int recordCount = 0;
                 if(!string.IsNullOrEmpty(sql))
                 {
@@ -58,12 +72,12 @@ namespace RMYY_CallCenter_Api.Controllers
                 List<Model.T_Con_WorkOrder> modellist = orderbll.DataTableToList(date);
                 if (modellist.Count > 0)
                 {
-                    List<Con_WorkOrderInput> Input = modeltoopi(modellist);
+                    //List<Con_WorkOrderInput> Input = modeltoopi(modellist);
                     var obj = new
                     {
                         state = "success",
                         message = "成功",
-                        rows = Input,
+                        rows = modellist,
                         total = recordCount
                     };
                     return Content(obj.ToJson());
@@ -97,14 +111,14 @@ namespace RMYY_CallCenter_Api.Controllers
                 var itemlist = itembll.GetModelList(" F_WoID="+ id +"");
                 if (list.Count > 0)
                 {
-                    List<Con_WorkOrderInput> Input = modeltoopi(list);
-                    if (Input != null)
+                    //List<Con_WorkOrderInput> Input = modeltoopi(list);
+                    if (list != null)
                     {
                         var obj = new
                         {
                             state = "success",
                             message = "成功",
-                            rows = Input,
+                            rows = list,
                             total = ItemList(itemlist)
                         };
                         return Content(obj.ToJson());
@@ -219,7 +233,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// 添加工单
         /// </summary>
         /// <returns></returns>
-        public ActionResult AddWorkOrder(Con_WorkOrderInput input, int overtime=0, int opt = 0, string cont = "")
+        public ActionResult AddWorkOrder(Con_WorkOrderInput input, int overtime=0, int opt = 0,string cont="")
         {
             int userId = 1;
             if (userId != 0)
@@ -227,8 +241,10 @@ namespace RMYY_CallCenter_Api.Controllers
                 string usercode = "8000";
                 Model.T_Sys_UserAccount user = userbll.GetModel(userId);
                 #region 添加判断
-                if (!(input.F_Type1 > 0 && input.F_Type1 < 5))
+                if (!(input.F_Type1 > 0 && input.F_Type1 < 6))
                     return Error("工单类型错误！");
+                if (opt == 0)
+                    return Error("请选择处理方式！");
                 if (string.IsNullOrEmpty(input.F_Customer))
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_Phon))
@@ -282,7 +298,10 @@ namespace RMYY_CallCenter_Api.Controllers
                             if (userleader != null)
                             {
                                 AddLog(work.F_ID, 0, deptname + userleader.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, user);
-                            } 
+                                return Success("已提交审核！");
+                            }
+                            else
+                                return Error("提交审核失败！");
                         }
 
                     }
@@ -514,23 +533,39 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_type1 = input.F_Type1;//工单类型:健康咨询，投诉建议，外聘专家咨询，家庭预约上门，静脉置管维护
             model.F_type2 = input.F_Type2;
 
-            if (!string.IsNullOrEmpty(input.F_Urgency.ToString()))
-                model.F_Urgency = input.F_Urgency;// 紧急程度:0,常规1，紧急
-            else
-                model.F_Urgency = model.F_Urgency;
             model.F_Customer = input.F_Customer;//来电人姓名
             model.F_Sex = input.F_Sex;
             model.F_Phon = input.F_Phon;//来电人电话
             model.F_CusAddress = input.F_CusAddress;//地址
             model.F_IdCard = input.F_IdCard;//身份证号
-            model.F_ServiceItems = input.F_ServiceItems;//服务项目
-            model.F_Address = input.F_Address;//地区
-            model.F_FirstCheckHospital = input.F_FirstCheckHospital;//首次检查医院
-            model.F_NoduleSize = input.F_NoduleSize;//肺结节大小
-            model.F_FirstFindTime = input.F_FirstFindTime;//首次发现肺结节时间
+            if (input.F_Type1 == 4)
+            {
+                model.F_ServiceItems = input.F_ServiceItems;//服务项目
+            }
+            if (input.F_Type1 == 3)
+            {
+                model.F_Address = input.F_Address;//地区
+                model.F_FirstCheckHospital = input.F_FirstCheckHospital;//首次检查医院
+                model.F_NoduleSize = input.F_NoduleSize;//肺结节大小
+                model.F_FirstFindTime = input.F_FirstFindTime;//首次发现肺结节时间
+                if (!string.IsNullOrEmpty(input.F_Urgency.ToString()))
+                    model.F_Urgency = input.F_Urgency;// 紧急程度:0,常规1，紧急
+                else
+                    model.F_Urgency = model.F_Urgency;
+            }
+            if (input.F_Type1 == 5)
+            {
+                model.F_Cathetertype = input.F_Cathetertype;//  
+                model.F_Catheterdept = input.F_Catheterdept;//置管科室
+                model.F_Cathetertime = input.F_Cathetertime;//置管时间
+                model.F_BedNum = input.F_BedNum;//床号
+                model.F_InpatientNum = input.F_InpatientNum;//住院号
+            }
+
+            model.F_DealType = input.F_DealType;//处理方式：立即办理，提交审核，转派部门
             model.F_WorkOrderContents = input.F_WorkOrderContents;//工单内容
-            model.F_DealOpinions = input.F_DealOpinions;//处理意见 
-            model.F_DealType = model.F_DealType; //处理方式: 立即办理，提交审核，转派（健康事业部）
+            model.F_DealOpinions = input.F_DealOpinions;//处理意见  
+            //model.F_DealContents = input.F_DealContents;//处理内容
             if (!string.IsNullOrEmpty(input.F_CallID))
             {
                 model.F_CallID = input.F_CallID;//通话记录id
@@ -686,6 +721,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         Inputmodel.F_StateName = "已完结";
                     }
                     #endregion
+                    Inputmodel.F_Customer = item.F_Customer;//来电人姓名
                     Inputmodel.F_Sex = item.F_Sex;//性别
                     Inputmodel.F_CusAddress = item.F_CusAddress;//地址
                     Inputmodel.F_Phon = item.F_Phon;//电话
@@ -704,7 +740,11 @@ namespace RMYY_CallCenter_Api.Controllers
                     }
                     if (item.F_type1 == 5)
                     {
-
+                        Inputmodel.F_Cathetertype = item.F_Cathetertype;//置管类型
+                        Inputmodel.F_Catheterdept = item.F_Catheterdept;//置管科室
+                        Inputmodel.F_Cathetertime = item.F_Cathetertime;//置管时间
+                        Inputmodel.F_BedNum = item.F_BedNum;//床号
+                        Inputmodel.F_InpatientNum = item.F_InpatientNum;//住院号
                     }
                     Inputmodel.F_DealOpinions = item.F_DealOpinions;//处理意见
                     Inputmodel.F_DealType = item.F_DealType;//处理方式：立即办理，提交审核，转派部门
@@ -835,6 +875,58 @@ namespace RMYY_CallCenter_Api.Controllers
 
         }
 
+
+        /// <summary>
+        /// 审核工单
+        /// </summary>
+        /// <param name="orderid"></param>
+        /// <param name="AuditCont"></param>
+        /// <param name="IsAudit"></param>
+        /// <returns></returns>
+        public ActionResult GetApproval(int orderid,string AuditCont,int IsAudit=0 )
+        {
+            int userId = 1;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = userbll.GetModel(userId);
+                if (ua != null)
+                {
+                    Model.T_Con_WorkOrder wmodel = orderbll.GetModel(orderid);
+                    if (wmodel != null)
+                    {
+                        if (IsAudit == 1)
+                        {
+                        string deptname = "";
+                        var deptmodel = deptbll.GetModel(ua.F_DeptId);
+                        if (deptmodel != null)
+                        {
+                            deptname = deptmodel.F_DeptName + "-";
+                        }               
+                            var res = AddLog(wmodel.F_ID, wmodel.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "工单审批：已同意审批" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, ua.F_UserCode, ua.F_DeptId, ua);
+                            if (res > 0)
+                            {
+                                wmodel.F_State = 0; //待转派
+                                //处理内容
+                                if (!string.IsNullOrEmpty(AuditCont))
+                                wmodel.F_AuditCont += AuditCont + "；";
+                                wmodel.F_IsAudit = IsAudit;
+                                wmodel.F_AuditState = 1;
+                                wmodel.F_AuditUser = ua.F_UserCode;
+                                wmodel.F_AuditTime = DateTime.Now;
+                                orderbll.Update(wmodel);
+                                return Success("审批成功！");
+                            }
+                            else
+                                return Error("审批失败！");
+
+                        }
+                    }
+                }
+
+            }
+            return Error("无操作权限");
+        }
+
         /// <summary>
         /// 处理工单
         /// </summary>
@@ -903,7 +995,7 @@ namespace RMYY_CallCenter_Api.Controllers
             }
             else
             {
-                model.F_DealResult = "未处理";//处理结果
+                model.F_DealResult = "处理中";//处理结果
             }
             #region 读取当前登录人部门
             string deptname = "";
@@ -948,8 +1040,8 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <returns></returns>
         public ActionResult AssignWorkOrder(int orderid,string cont,int clbm=0,int clid=0)
         {
-            var userId = User.F_UserId;
-            string usercode = User.F_UserCode;
+            var userId =1 ;
+            string usercode = "8000";
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = userbll.GetModel(userId);

RMYY_CallCenter_Api/Controllers/GongDanTypeController.cs

@@ -62,7 +62,6 @@ namespace RMYY_CallCenter_Api.Controllers
             {
                 return Error("添加失败，请重试");
             }
-
         }
 
         /// <summary>

RMYY_CallCenter_Api/Controllers/HomeController.cs

@@ -30,7 +30,7 @@ namespace RMYY_CallCenter_Api.Controllers
             Dictionary<string, string> paras = new Dictionary<string, string>();
             string sql = " select * from T_Sys_UserAccount where F_UserCode=@F_UserCode and F_PassWord=@F_PassWord";
             paras.Add("@F_UserCode", usercode);
-            paras.Add("@F_PassWord", password.ToMD5String());
+            paras.Add("@F_PassWord", password);
             var dt = DbHelperSQL.Query(sql, paras).Tables[0];
             if (dt != null && dt.Rows.Count > 0)
             {