2222

RMYY_CallCenter_Api.Dal/T_Sys_GongDan.cs

@@ -53,7 +53,7 @@ namespace RMYY_CallCenter_Api.Dal
                      new SqlParameter("@F_TimeOut", SqlDbType.Float,8),
                         new SqlParameter("@F_RepairTimeLimit", SqlDbType.Float,8),
                           new SqlParameter("@F_Identification", SqlDbType.VarChar,50),
-new SqlParameter("@F_AutoDept", SqlDbType.Int,4),
+new SqlParameter("@F_AutoDept", SqlDbType.NVarChar,500),
 new SqlParameter("@F_CanReplayCount", SqlDbType.Int,4),
 new SqlParameter("@F_CanUrgeCount", SqlDbType.Int,4),
 
@@ -126,7 +126,7 @@ new SqlParameter("@F_CanUrgeCount", SqlDbType.Int,4),
                         new SqlParameter("@F_RepairTimeLimit", SqlDbType.Float,8),
                        new SqlParameter("@F_Identification", SqlDbType.VarChar,50),
                     new SqlParameter("@F_ImgUrl", SqlDbType.VarChar,200),
-new SqlParameter("@F_AutoDept", SqlDbType.Int,4),
+new SqlParameter("@F_AutoDept", SqlDbType.NVarChar,500),
 new SqlParameter("@F_CanReplayCount", SqlDbType.Int,4),
 new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
 new SqlParameter("@F_CanUrgeCount", SqlDbType.Int,4),
@@ -318,11 +318,11 @@ new SqlParameter("@F_CanUrgeCount", SqlDbType.Int,4),
                 {
                     model.F_TypeId = int.Parse(row["F_TypeId"].ToString());
                 }
-                if (row["F_AutoDept"] != null && row["F_AutoDept"].ToString() != "")
+                if (row["F_AutoDept"] != null)
                 {
-                    model.F_AutoDept = int.Parse(row["F_AutoDept"].ToString());
+                    model.F_AutoDept = row["F_AutoDept"].ToString();
                 }
-               
+
                 if (row["F_ImgUrl"] != null)
                 {
                     model.F_ImgUrl = row["F_ImgUrl"].ToString();

RMYY_CallCenter_Api.Model/T_Sys_GongDan.cs

@@ -21,7 +21,7 @@ namespace RMYY_CallCenter_Api.Model
         private DateTime? _f_createtime;
         private int? _f_typeid;
         private string _f_imgurl;
-        private int? _f_autodept;
+        private string _f_autodept;
         private int _f_canreplaycount = 0;
 
         private int _f_canurgecount = 0;
@@ -57,7 +57,7 @@ namespace RMYY_CallCenter_Api.Model
         /// <summary>
         /// 设置自动流转的部门
         /// </summary>
-        public int? F_AutoDept
+        public string F_AutoDept
         {
             set { _f_autodept = value; }
             get { return _f_autodept; }

RMYY_CallCenter_Api.Utility/Tree/TreeModel.cs

@@ -55,7 +55,7 @@ namespace RMYY_CallCenter_Api.Utility
         public string location { get; set; }
         public string phone { get; set; }
         //自动流转部门
-        public int? autoDept { get; set; }
+        public string autoDept { get; set; }
         private List<TreeModel> _children;
         public List<TreeModel> children
         {

RMYY_CallCenter_Api/Common/InvokeZD.cs

@@ -23,7 +23,7 @@ namespace RMYY_CallCenter_Api
             string url = ConfigHelper.GetValue("zdaddurl");
 
             requestHeaders.Add("userCode", $"{usercode }");
-            requestHeaders.Add("authorization", $"{token }");
+            requestHeaders.Add("Authorization", $"{token }");
             requestHeaders.Add("domainUrl", $"{domainUrl }");
 
             foreach (var item in requestHeaders)

RMYY_CallCenter_Api/Controllers/DictionaryType/GongDanTypeController.cs

@@ -74,7 +74,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public ActionResult AddGongDan(T_Sys_GongDan input)
+        public ActionResult AddGongDan(T_Sys_GongDan input,  List<AutoDept> autodept)
         {
             T_Sys_GongDan model = new T_Sys_GongDan();
             model.F_TimeOut = input.F_TimeOut;
@@ -85,7 +85,7 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_ParentID = input.F_ParentID;
             model.F_CreateTime = DateTime.Now;
             model.F_TypeId = input.F_TypeId;
-            model.F_AutoDept = input.F_AutoDept;
+            model.F_AutoDept = autodept.ToString();
             model.F_CanReplayCount = input.F_CanReplayCount;
             //if (!string .IsNullOrEmpty (input.F_Identification))
             //{
@@ -188,7 +188,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult EditGongDan(T_Sys_GongDan input)
+        public ActionResult EditGongDan(T_Sys_GongDan input,List<AutoDept> autodept)
         {
             var ModuleInfo = gongdanBll.GetModel(input.F_GDId);
             if (ModuleInfo != null)
@@ -199,7 +199,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 ModuleInfo.F_Sort = input.F_Sort;
                 ModuleInfo.F_TypeId = input.F_TypeId;
                 ModuleInfo.F_TimeOut = input.F_TimeOut;
-                ModuleInfo.F_AutoDept = input.F_AutoDept;
+                ModuleInfo.F_AutoDept = autodept.ToJson();
                 ModuleInfo.F_CanReplayCount = input.F_CanReplayCount;
                 ModuleInfo.F_CanUrgeCount = input.F_CanUrgeCount;
                 //if (!string.IsNullOrEmpty(input.F_Identification))
@@ -316,6 +316,7 @@ namespace RMYY_CallCenter_Api.Controllers
         [AllowAnonymous]
         public ActionResult GetBBXXList( string typename,int pid = 0, int flag = 0)
         {
+          
             string sql = "";
             DataTable gModel = new DataTable();
             if (flag != 0)

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -24,8 +24,12 @@ using Newtonsoft.Json;
 using System.Configuration;
 using System.Net.Http.Headers;
 using Newtonsoft.Json.Linq;
+<<<<<<< .merge_file_a74564
  
 >>>>>>> .merge_file_a27384
+=======
+
+>>>>>>> .merge_file_a11624
 
 namespace RMYY_CallCenter_Api.Controllers
 {
@@ -620,6 +624,70 @@ namespace RMYY_CallCenter_Api.Controllers
             }
             model.F_ReplayCount = 0;
             int returnid = baseBll.Add(model);
+<<<<<<< .merge_file_a74564
+=======
+           
+            #region    如果工单是信息类工单，调接口推送到支点
+
+            int gdid = int.Parse( DbHelperSQL.GetSingle("select F_GDId from T_Sys_GongDan where F_ParentID = 3000 and F_Name = '信息类' ").ToString());
+    
+           DataTable dtcate=   DbHelperSQL.Query("select * from  dbo.GetValueId('" + gdid + "')").Tables[0];
+            string cate = model.F_WorkOrderCategory;           
+            if (dtcate.Select("F_GDId='" + cate + "'").Count() > 0)
+            {
+                try
+                {
+                    Dictionary<string, object> dic = new Dictionary<string, object>();
+                    dic.Add("incidentTitle", model.F_Content);//咱的项目没有标题
+                    dic.Add("incidentDescription", model.F_Content);
+                    dic.Add("departmentNo", model.F_ApplicationDept);
+                    dic.Add("userNo", model.F_Applicant);
+                    dic.Add("itilServiceName",  "");//这个不知道传啥
+                    
+                    if (!string.IsNullOrEmpty( model.F_Maintenancer))
+                    {
+                        dic.Add("resaveUserNo", model.F_Maintenancer);
+                    }
+                    if (!string.IsNullOrEmpty(model.F_DeviceEncode))
+                    {
+                        dic.Add("equipmentNumber", model.F_DeviceEncode);
+                    }
+                    if (!string.IsNullOrEmpty(model.F_File))
+                    {
+                        List<Files> filelist = new List<Files>();
+                       DataTable dt= GetFileData(model.F_File, fileurlpath);
+                        foreach (DataRow item in dt.Rows)
+                        {
+                            Files filemodel  = new Files();
+                            filemodel.fileExt = item["F_FileType"].ToString();
+                            filemodel.fileName = item["F_FileName"].ToString();
+                            filemodel.fileUrl = item["F_FileUrl"].ToString();
+                            filelist.Add(filemodel);
+                        }
+                        dic.Add("files", filelist);
+
+                    }
+                    
+                        string orderno = InvokeZD.ZDSubmitWorkOrder(dic, User.F_UserCode);
+                        if (!string.IsNullOrEmpty(orderno))
+                        {
+                            T_FaultRepair_Base updatemodel = baseBll.GetModel(model.F_WorkOrderCode);
+                            updatemodel.F_OrderNo = orderno;
+                            baseBll.Update(updatemodel);
+                        }
+                    
+                    
+                }
+                catch (Exception)
+                {
+
+                     
+                }
+             
+            }
+            #endregion
+
+>>>>>>> .merge_file_a11624
             if (User.F_RoleCode != "DDZX" && model.F_WorkOrderState == 0)
             {
                 //新工单提醒发给调度中心值班的人
@@ -807,14 +875,44 @@ namespace RMYY_CallCenter_Api.Controllers
                 if (string.IsNullOrEmpty(ToDept) || ToDept == "0")
                 {
                     //根据工单类别判断 是否有指派部门
-                    List<Model.T_Sys_GongDan> gd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
-                    int deptid = listgd.First().F_AutoDept != null ? listgd.First().F_AutoDept.Value : 0;
-                    if (deptid == 0)
+                  //  List<Model.T_Sys_GongDan> gd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
+
+                    string yqsql = " select  dbo.[GetYQByUserCode]('" + model.F_Applicant + "')";
+                    string yqid = DbHelperSQL.GetSingle(yqsql).ToString() ;
+                    if (listgd.Count>0 && !string.IsNullOrEmpty( listgd.First().F_AutoDept))
                     {
-                        return Error("当前工单类型没有设置指派部门，请前往设置或者选择指派部门");
+                         
+                       List<AutoDept> listautodept =listgd.First().F_AutoDept.ToList<AutoDept>();
+                        var modelauto = listautodept.Find(x => x.autoyq == yqid);
+                        if (modelauto!=null && !string.IsNullOrEmpty(modelauto.autodept))
+                        {                            
+                                ToDept = modelauto.autodept;                            
+                           
+                        }
+                        else
+                        {
+                            var modelauto2 = listautodept.Find(x => x.autoyq == "0");
+                            if (modelauto2!=null &&!string.IsNullOrEmpty(modelauto2.autodept))
+                            {
+                                ToDept = modelauto2.autodept;
+                            }
+                            else
+                            {
+                                return Error("当前工单类型没有设置指派部门，请前往设置或者选择指派部门");
+                            }
+
+                        }
+
                     }
-                    else
-                        ToDept = deptid.ToString();
+
+
+                    //string deptid = listgd.First().F_AutoDept != null ? listgd.First().F_AutoDept : "0";
+                    //if (deptid == "0")
+                    //{
+                    //    return Error("当前工单类型没有设置指派部门，请前往设置或者选择指派部门");
+                    //}
+                    //else
+                    //    ToDept = deptid.ToString();
                 }
 
                 if (!string.IsNullOrEmpty(ToUserCode))
@@ -1630,19 +1728,49 @@ namespace RMYY_CallCenter_Api.Controllers
                 //int timeout = listgd.First().F_TimeOut;
                 //model.F_Deadline = DateTime.Now.AddHours(timeout);
                 string message = "";
-
+                
                 //当工单没有选择指派部门的时候，当前工单类型shezhi指派部门，该工单默认到这个指派的部门
                 if (string.IsNullOrEmpty(ToDept) || ToDept == "0")
                 {
                     //根据工单类别判断 是否有指派部门
-                    List<Model.T_Sys_GongDan> gd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
-                    int deptid = listgd.First().F_AutoDept != null ? listgd.First().F_AutoDept.Value : 0;
-                    if (deptid == 0)
+
+                    string yqsql = " select  dbo.[GetYQByUserCode]('" + model.F_Applicant + "')";
+                    string yqid = DbHelperSQL.GetSingle(yqsql).ToString();
+                    if (listgd.Count > 0 && !string.IsNullOrEmpty(listgd.First().F_AutoDept))
                     {
-                        return Error("当前工单类型没有设置指派部门，请前往设置或者选择指派部门");
+
+                        List<AutoDept> listautodept = listgd.First().F_AutoDept.ToList<AutoDept>();
+                        var modelauto = listautodept.Find(x => x.autoyq == yqid);
+                        if (modelauto != null && !string.IsNullOrEmpty(modelauto.autodept))
+                        {
+                            ToDept = modelauto.autodept;
+
+                        }
+                        else
+                        {
+                            var modelauto2 = listautodept.Find(x => x.autoyq == "0");
+                            if (modelauto2 != null && !string.IsNullOrEmpty(modelauto2.autodept))
+                            {
+                                ToDept = modelauto2.autodept;
+                            }
+                            else
+                            {
+                                return Error("当前工单类型没有设置指派部门，请前往设置或者选择指派部门");
+                            }
+
+                        }
+
                     }
-                    else
-                        ToDept = deptid.ToString();
+
+
+                    //List<Model.T_Sys_GongDan> gd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
+                    //string deptid = listgd.First().F_AutoDept != null ? listgd.First().F_AutoDept : "0";
+                    //if (deptid == "0")
+                    //{
+                    //    return Error("当前工单类型没有设置指派部门，请前往设置或者选择指派部门");
+                    //}
+                    //else
+                    //    ToDept = deptid.ToString();
                 }
 
                 if (!string.IsNullOrEmpty(ToUserCode))
@@ -3501,7 +3629,11 @@ namespace RMYY_CallCenter_Api.Controllers
         /// </summary>
         /// <param name="timestamp"></param>
         /// <returns></returns>
+<<<<<<< .merge_file_a74564
         public ActionResult AddWorkOrder(long timestamp)
+=======
+        public ActionResult SubmitWorkOrder(long timestamp,string filestr)
+>>>>>>> .merge_file_a11624
         {
             string port_password = HttpUtility.UrlDecode(RequestString.GetQueryString("port_password"));   //加密信息(安全验证用)
             string uuid = HttpUtility.UrlDecode(RequestString.GetQueryString("uuid"));          //客户唯一标识（安全验证用）
@@ -3545,19 +3677,40 @@ namespace RMYY_CallCenter_Api.Controllers
                 ajresult.message = "安全验证未通过";
                 return Process();
             }
+<<<<<<< .merge_file_a74564
             if (string.IsNullOrEmpty(ApplicationDeptCode))
             {
                 ajresult.state = (int)CodeStatus.必填字段为空;
                 ajresult.message = "科室编码不能为空";
                 return Process();
             }
+=======
+            //if (string.IsNullOrEmpty(ApplicationDeptid))
+            //{
+            //    ajresult.state = (int)CodeStatus.必填字段为空;
+            //    ajresult.message = "科室编码不能为空";
+            //    return Process();
+            //}
+>>>>>>> .merge_file_a11624
             if (string.IsNullOrEmpty(WorkOrderCategory))
             {
                 ajresult.state = (int)CodeStatus.必填字段为空;
                 ajresult.message = "工单类别不能为空";
                 return Process();
             }
+<<<<<<< .merge_file_a74564
             Model.T_FaultRepair_Base model = new Model.T_FaultRepair_Base();      
+=======
+
+            List<Files> files = new List<Files>();
+            if (!string.IsNullOrEmpty(filestr))
+            {
+                files = filestr.ToList<Files>();
+            }
+
+           
+            Model.T_FaultRepair_Base model = new Model.T_FaultRepair_Base();
+>>>>>>> .merge_file_a11624
 
             string sql = "select F_DeptId from T_Sys_Department where F_DeptCode='" + ApplicationDeptCode + "' ";
             string deptid = DbHelperSQL.GetSingle(sql).ToString();
@@ -3579,8 +3732,19 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_Content = Content;
             model.F_PlaceOfRepair = PlaceOfRepair;//报修地点       
 
+<<<<<<< .merge_file_a74564
 
          
+=======
+            string strfile = "";
+            //有文件
+            if (files != null && files.Count > 0)
+            {
+                strfile = kinfo_upload(files, applicant);
+                model.F_File = strfile;
+            }
+
+>>>>>>> .merge_file_a11624
             model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
             model.F_EmergencyTypes = EmergencyTypes;
          
@@ -3603,7 +3767,362 @@ namespace RMYY_CallCenter_Api.Controllers
                 AddOperatorLog(applicant + "创建报修工单", (int)EnumOperatorType.add, model.F_WorkOrderCode);
                 return Success("添加成功！", returnid);
             }
+<<<<<<< .merge_file_a74564
              return Error("添加失败！");
+=======
+            return Error("添加失败！");
+
+        }
+
+        [AllowAnonymous]
+        public ActionResult OperateWorkOrder(long timestamp, string filestr)
+        {
+            string port_password = HttpUtility.UrlDecode(RequestString.GetQueryString("port_password"));   //加密信息(安全验证用)
+            string uuid = HttpUtility.UrlDecode(RequestString.GetQueryString("uuid"));          //客户唯一标识（安全验证用）
+          //  string OrderNo = HttpUtility.UrlDecode(RequestString.GetQueryString("workorderid"));
+           // 1交办2接单3完结
+            string type = HttpUtility.UrlDecode(RequestString.GetQueryString("type"));
+            //交办/接单人/处理人
+            string usercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
+            string ordercontent = HttpUtility.UrlDecode(RequestString.GetQueryString("Content"));
+            string operatorusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("operator"));
+
+            List<Files> files = new List<Files>();
+            if (!string.IsNullOrEmpty(filestr))
+            {
+                files = filestr.ToList<Files>();
+            }
+
+
+            if (string.IsNullOrEmpty(operatorusercode))
+            {
+                operatorusercode = usercode;
+            }          
+
+
+            if (string.IsNullOrEmpty(usercode))
+            {
+                ajresult.state = (int)CodeStatus.必填字段为空;
+                ajresult.message = "usercode不能为空";
+                return Process();
+            }
+            if (string.IsNullOrEmpty(type))
+            {
+                ajresult.state = (int)CodeStatus.必填字段为空;
+                ajresult.message = "类型不能为空";
+                return Process();
+            }
+
+            if (string.IsNullOrEmpty(uuid))
+            {
+                ajresult.state = (int)CodeStatus.ID不存在;
+                ajresult.message = "客户唯一标识不能为空";
+                return Process();
+            }
+            else if (uuid.Length > 50)
+            {
+                ajresult.state = (int)CodeStatus.字符串超出长度;
+                ajresult.message = "客户唯一标识超出长度";
+                return Process();
+            }
+            try
+            {
+                DateTime time = DateTimeConvert.FromTimetag(timestamp);
+            }
+            catch
+            {
+                var err = new
+                {
+                    code = "1",
+                    message = "时间戳错误"
+                };
+                return Error(err.ToJson());
+            }
+            if (!ICodeValidates(uuid + timestamp, port_password))
+            {
+                ajresult.state = (int)CodeStatus.安全验证未通过;
+                ajresult.message = "安全验证未通过";
+                return Process();
+            }
+
+            string sql = "select F_DeptId from T_Sys_UserAccount where F_UserCode='" + usercode + "'";
+            string userdeptid=   DbHelperSQL.GetSingle(sql).ToString();
+
+            List<Model.T_FaultRepair_Base> modellist = baseBll.GetModelList("F_OrderNo ='" + uuid + "' ");
+            Model.T_FaultRepair_Base model = new T_FaultRepair_Base();
+            if (modellist == null || modellist.Count == 0)
+            {
+                ajresult.state = (int)CodeStatus.ID不存在;
+                ajresult.message = "工单不存在";
+                return Process();
+            }
+            else
+            {
+                model = modellist.First();
+            }
+
+            if (type == "1")
+            {
+                if (model != null)
+                {
+                    if (model.F_WorkOrderState == (int)EnumFaultRepairWorkOrderState.receive)
+                    {
+                        ajresult.state = (int)CodeStatus.执行失败;
+                        ajresult.message = "工单已经指派";
+                        return Process();
+                    }
+                    model.F_AssignUser = operatorusercode;
+                    model.F_AssignTime = DateTime.Now;
+
+                    List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_GDId='" + model.F_WorkOrderCategory + "'");
+                    double timeout = listgd.First().F_TimeOut;
+                    model.F_Deadline = DateTime.Now.AddHours(timeout);
+                    string message = "";
+
+                    message = "转派工单给" + GetDeptModel(userdeptid) + "部门" + GetUserModel(usercode);
+                    model.F_Maintenancer = usercode;
+                    model.F_MaintenanceDept = userdeptid;
+                    model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.receive;
+                    model.F_UpdateTime = DateTime.Now;
+                    AddOperatorLogNew(message, (int)EnumOperatorType.assign, model.F_WorkOrderCode,operatorusercode);
+                    baseBll.Update(model);
+
+                    ajresult.state = (int)CodeStatus.SUCCESS;
+                    ajresult.message = "转派成功";
+                    return Process();
+                   
+
+                }
+            }
+            else if (type == "2")
+            {
+                if (model.F_MaintenanceDept == userdeptid)
+                {
+                    model.F_UpdateTime = DateTime.Now;
+
+                    if (string.IsNullOrEmpty(model.F_Maintenancer))
+                    {
+                        model.F_Maintenancer = usercode;
+                    }
+                    model.F_AcceptTime = DateTime.Now;
+                    model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealing;
+                    baseBll.Update(model);
+                    AddOperatorLogNew("查收了工单", (int)EnumOperatorType.check, model.F_WorkOrderCode,usercode);
+
+
+                    ajresult.state = (int)CodeStatus.SUCCESS;
+                    ajresult.message = "查收成功";
+                    return Process();
+               
+                }
+                else
+                {
+                    ajresult.state = (int)CodeStatus.异常结果类型;
+                    ajresult.message = "你没有权限查收！";
+                    return Process();
+
+                }
+            }
+            else if (type == "3")
+            {
+                DataTable dt = new DataTable();
+
+
+                if (model != null)
+                {
+                    string strfile = "";
+                    //正常完成 
+                    if (files!=null &&files.Count>0)
+                    {
+                        strfile =  kinfo_upload(files, usercode);
+                    }
+                        model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealed;               
+                        Model.T_FaultRepair_Process promodel = new Model.T_FaultRepair_Process();
+                        promodel.F_Isdelete = 0;
+                        promodel.F_MaintenanceDept = userdeptid;// model.F_MaintenanceDept;
+                        promodel.F_Maintenancer = usercode;// model.F_Maintenancer;
+                        promodel.F_ProcessingTime = DateTime.Now;
+                        promodel.F_Result = ordercontent;
+                        promodel.F_File = strfile;
+                        promodel.F_WorkOrderCode =model.F_WorkOrderCode;
+                        promodel.F_IsInvolvedEquip = 0;//0 否 1 是
+                        promodel.F_FinishType = "远程"; //报修工单完工时增加处理方式：“远程”、“现场”，默认现场，另外工单详情中需要显示该字段信息
+
+                        promodel.F_DealType = (int)EnumFaultRepairDealType.normal;
+
+                        int id = dealBll.Add(promodel);
+
+                    if (id > 0)
+                    {
+                        if (model.F_IsStop != 1)
+                        { model.F_Endtime = DateTime.Now; }
+                        model.F_IsStop = 0;
+                        baseBll.Update(model);
+                        msg.AddInternalMessagesInfo("您提交的工单已处理完毕，请及时进行评价", "您提交的工单已处理完毕，请及时进行评价\n" + "工单编号:" + model.F_WorkOrderCode, model.F_Applicant, operatorusercode, EnumSmsType.repair
+               , 0, model.F_WorkOrderCode);
+                        AddOperatorLogNew("完结了工单", (int)EnumOperatorType.dealed, model.F_WorkOrderCode,usercode);
+                        ajresult.state = (int)CodeStatus.SUCCESS;
+                        ajresult.message = "处理完成";
+                        return Process();
+
+                    }
+                    else
+                    {
+                        ajresult.state = (int)CodeStatus.无法预测的程序错误;
+                        ajresult.message = "处理失败";
+                        return Process();
+                    }
+                }
+                
+                
+            }
+            ajresult.state = (int)CodeStatus.无法预测的程序错误;
+            ajresult.message = "失败";
+            return Process();
+
+        }
+        [AllowAnonymous]
+        public ActionResult RevokeWorkOrder(long timestamp,string Operator,string workorderid,string Content)
+        {
+            string port_password = HttpUtility.UrlDecode(RequestString.GetQueryString("port_password"));   //加密信息(安全验证用)
+            string uuid = HttpUtility.UrlDecode(RequestString.GetQueryString("uuid"));          //客户唯一标识（安全验证用）
+          //  string OrderNo = HttpUtility.UrlDecode(RequestString.GetQueryString("workorderid"));
+
+            if (string.IsNullOrEmpty(Operator))
+            {
+                ajresult.state = (int)CodeStatus.必填字段为空;
+                ajresult.message = "操作人不能为空";
+                return Process();
+            }
+
+            if (string.IsNullOrEmpty(uuid))
+            {
+                ajresult.state = (int)CodeStatus.ID不存在;
+                ajresult.message = "客户唯一标识不能为空";
+                return Process();
+            }
+            else if (uuid.Length > 50)
+            {
+                ajresult.state = (int)CodeStatus.字符串超出长度;
+                ajresult.message = "客户唯一标识超出长度";
+                return Process();
+            }
+            try
+            {
+                DateTime time = DateTimeConvert.FromTimetag(timestamp);
+            }
+            catch
+            {
+                var err = new
+                {
+                    code = "1",
+                    message = "时间戳错误"
+                };
+                return Error(err.ToJson());
+            }
+            if (!ICodeValidates(uuid + timestamp, port_password))
+            {
+                ajresult.state = (int)CodeStatus.安全验证未通过;
+                ajresult.message = "安全验证未通过";
+                return Process();
+            }
+
+            List<Model.T_FaultRepair_Base> modellist= baseBll.GetModelList(" F_OrderNo='" + uuid + "'");
+
+            Model.T_FaultRepair_Base model = new T_FaultRepair_Base();
+
+            if (modellist!=null && modellist.Count>0)
+            {
+                model = modellist.First();
+            }
+            if (model == null)
+            {
+                ajresult.state = (int)CodeStatus.ID不存在;
+                ajresult.message = "工单id不存在";
+                return Process();
+            }
+            string s = "";
+            if (!string.IsNullOrEmpty(Content))
+            {
+                s += ",撤回原因:" + Content;
+            }
+            model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.revoke;
+            model.F_Maintenancer = "";
+            model.F_MaintenanceDept = "";
+            model.F_AssignTime = null;
+            model.F_AssignUser = "";
+            model.F_UpdateTime = DateTime.Now;
+            model.F_Deadline = null;
+
+            baseBll.Update(model);
+
+
+
+            AddOperatorLogNew(  "撤回了工单" + s, (int)EnumOperatorType.retract, model.F_WorkOrderCode, Operator);
+            return Success("撤回操作成功");
+
+
+
+        }
+
+        public static bool ICodeValidates(string strParams, string ICode)
+        {
+            string SecurityCode = "wuyuan%#@6"; //ConfigurationManager.AppSettings["SecurityCode"];
+            string pwd = Md5(SecurityCode + strParams);
+            return pwd.Equals(ICode);
+            //return true;
+        }
+        public static string Md5(string txt)
+        {
+            byte[] sor = Encoding.UTF8.GetBytes(txt);
+            MD5 md5 = MD5.Create();
+            byte[] result = md5.ComputeHash(sor);
+            StringBuilder strbul = new StringBuilder(40);
+            for (int i = 0; i < result.Length; i++)
+            {
+                //加密结果"x2"结果为32位,"x3"结果为48位,"x4"结果为64位
+                strbul.Append(result[i].ToString("x2"));
+            }
+            return strbul.ToString().ToLower(); ;
+        }
+
+
+        public string kinfo_upload(List<Files> files,string usercode)
+        {
+            string returnfileids = "";
+            foreach (Files item in files)
+            {
+                //文件下载地址
+                try
+                {
+                    string path = "/Upload/Files/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
+                    HttpWebRequest request = (HttpWebRequest)WebRequest.Create(item.fileUrl);
+                    HttpWebResponse response = request.GetResponse() as HttpWebResponse;
+                    Stream responseStream = response.GetResponseStream();
+
+                    string Currentpath = Server.MapPath("..") + path;
+                    // 如果不存在就创建file文件夹
+                    if (!Directory.Exists(Currentpath))
+                    {
+                        if (Currentpath != null) Directory.CreateDirectory(Currentpath);
+                    }
+                    Stream stream = new FileStream(Currentpath + item.fileName, FileMode.Create);
+                    byte[] bArr = new byte[1024];
+                    int size = responseStream.Read(bArr, 0, bArr.Length);
+                    while (size > 0)
+                    {
+                        stream.Write(bArr, 0, size);
+                        size = responseStream.Read(bArr, 0, bArr.Length);
+                    }
+                    stream.Close();
+                    responseStream.Close();
+
+                        Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                        model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                        model_T_Sys_Accessories.F_FileName = item.fileName;//附件名称
+                       model_T_Sys_Accessories.F_FileType = item.fileExt; //Path.GetExtension(file.FileName);//附件类型
+                        model_T_Sys_Accessories.F_FileUrl = path + item.fileName;//附件地址
+>>>>>>> .merge_file_a11624
             
         }
              /// <summary>
@@ -3643,6 +4162,25 @@ namespace RMYY_CallCenter_Api.Controllers
 
         #endregion
     }
+<<<<<<< .merge_file_a74564
 
      
+=======
+    public class Files
+    {
+        public string fileName { get; set; }
+        public string fileExt { get; set; }
+        public string fileUrl { get; set; }
+    }
+
+    public class  AutoDept
+    {
+        public string  autoyq { get; set; }
+        public string  autodept { get; set; }
+        public string  autousercode { get; set; }
+
+    }
+
+  
+>>>>>>> .merge_file_a11624
 }

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

@@ -435,6 +435,38 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 {
                     touserlist.Add(ordermodel.F_DealUser);
                 }
+<<<<<<< .merge_file_a52468
+=======
+            #region 申请人催单并且类型是xinxilei的工单，调用支点接口去催单
+
+                int gdid = int.Parse(DbHelperSQL.GetSingle("select F_GDId from T_Sys_GongDan where F_ParentID = 3000 and F_Name = '信息类' ").ToString());
+
+                DataTable dtcate = DbHelperSQL.Query("select * from  dbo.GetValueId('" + gdid + "')").Tables[0];
+                int cate = ordermodel.F_SonType;
+                if (dtcate.Select("F_GDId='" + cate + "'").Count() > 0)
+                {
+                    try
+                    {
+                        Dictionary<string, object> dic = new Dictionary<string, object>();
+                        dic.Add("incidentNo",ordermodel.F_OrderNo);
+                        dic.Add("userNo", User.F_UserCode);
+                        if (!string.IsNullOrEmpty(reason)  )
+                        {
+                            reason = "请加快处理进度";
+                        }
+                        dic.Add("urgeMessage", reason);
+                        
+                     var obj=   InvokeZD.ZDUrgeWorkOrder(dic, User.F_UserCode);
+                    }
+                    catch (Exception e)
+                    {
+                        LogHelper.Info("UrgeWorkOrder接口异常， "+ e.Message);
+                    }
+                 
+
+                }
+             #endregion
+>>>>>>> .merge_file_a72180
             }
             if (touserlist != null && touserlist.Count > 0)
             {