Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -10217,165 +10217,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         //[Authority]
-        public async Task<ActionResult> EditWorkOrderNew()
-        {
-            if (User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXBZ" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD")
-            {
-                string workorderid = RequestString.GetFormString("workorderid");
-                Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
-
-                int source = RequestString.GetInt("source", 0);
-                string cusname = RequestString.GetFormString("cusname");
-                string cussex = RequestString.GetFormString("cussex");
-                string cusphone = RequestString.GetFormString("cusphone");
-                string cusaddress = RequestString.GetFormString("cusaddress");
-                string email = RequestString.GetFormString("email");
-                string zipcode = RequestString.GetFormString("zipcode");
-                string conname = RequestString.GetFormString("conname");
-                string conphone = RequestString.GetFormString("conphone");
-                int state = RequestString.GetInt("state", 0);
-                string title = RequestString.GetFormString("title");
-                string content = RequestString.GetFormString("content");
-                string files = RequestString.GetFormString("files");
-                int sourcearea = RequestString.GetInt("sourcearea", 0);
-                string sourceaddress = RequestString.GetFormString("sourceaddress");
-                int isresult = RequestString.GetInt("isresult", 0);
-                string result = RequestString.GetFormString("result");
-                string keys = RequestString.GetFormString("keys");
-                string splituser = RequestString.GetFormString("splituser");
-                int type = RequestString.GetInt("type", 0);
-                int bigtype = RequestString.GetInt("bigtype", 0);
-                int smalltype = RequestString.GetInt("smalltype", 0);
-                int isprotect = RequestString.GetInt("isprotect", 0);
-                int level = RequestString.GetInt("level", 0);
-                int issubmit = RequestString.GetInt("issubmit", 0);
-                int isopen = RequestString.GetInt("isopen", 0);
-                int business = RequestString.GetInt("business", 0);
-                string workcontent = RequestString.GetFormString("workcontent");
-
-                #region 保存工单信息
-
-                modelT_Bus_WorkOrder.F_InfoSource = source;//信息来源
-
-                modelT_Bus_WorkOrder.F_InfoType = type;//信息类别
-                modelT_Bus_WorkOrder.F_InfoConBigType = bigtype;//内容大类
-                modelT_Bus_WorkOrder.F_InfoConSmallType = smalltype;//内容小类
-                modelT_Bus_WorkOrder.F_SourceArea = sourcearea;//反映地域
-                modelT_Bus_WorkOrder.F_SourceAddress = sourceaddress;//事发地址
-
-                modelT_Bus_WorkOrder.F_CusName = cusname;//投诉人姓名
-                modelT_Bus_WorkOrder.F_CusSex = cussex;//性别
-                modelT_Bus_WorkOrder.F_CusPhone = cusphone;//来电号码
-                modelT_Bus_WorkOrder.F_CusAddress = cusaddress;//地址
-                modelT_Bus_WorkOrder.F_ZipCode = zipcode;//邮编
-                modelT_Bus_WorkOrder.F_ConName = conname;//联系人姓名
-                modelT_Bus_WorkOrder.F_ConPhone = conphone;//联系人电话
-                modelT_Bus_WorkOrder.F_Email = email;//E-mail
-
-                modelT_Bus_WorkOrder.F_ComTitle = title;//标题
-                modelT_Bus_WorkOrder.F_ComContent = content;//情况摘要（投诉内容）
-                modelT_Bus_WorkOrder.F_File = files;//附件
-                modelT_Bus_WorkOrder.F_IsProtect = isprotect;//保密方式0否1是
-                modelT_Bus_WorkOrder.F_Content = workcontent;
-                modelT_Bus_WorkOrder.F_Key = keys;
-                modelT_Bus_WorkOrder.F_Level = level;
-                modelT_Bus_WorkOrder.F_ToBereply = 0;
-                //是否直办（即时答复）0:，否1： 是         
-                modelT_Bus_WorkOrder.F_IsResult = isresult;
-                modelT_Bus_WorkOrder.F_Result = result;//处理结果
-                if (isopen > 0)
-                    modelT_Bus_WorkOrder.F_IsOpen = isopen;
-                modelT_Bus_WorkOrder.F_Business = business;
-                //如果选择即刻答复：是，即为直办，工单结束
-                if (isresult == 1)
-                {
-                    modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;// 9;//已结案
-                    modelT_Bus_WorkOrder.F_DealDeptId = User.F_DeptId;
-                    modelT_Bus_WorkOrder.F_DealUser = User.F_UserCode;
-                    modelT_Bus_WorkOrder.F_DealTime = DateTime.Now;
-                    modelT_Bus_WorkOrder.F_IsClosed = 1;
-                    modelT_Bus_WorkOrder.F_CloseUser = User.F_UserCode;
-                    modelT_Bus_WorkOrder.F_CloseTime = DateTime.Now;
-                }
-                else if (issubmit == 1)
-                {
-                    modelT_Bus_WorkOrder.F_SubmitTime = DateTime.Now;
-                    modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.submit;// 1;//提交领导
-                }
-
-                bool r = workorderBLL.Update(modelT_Bus_WorkOrder);
-
-                #endregion
-                if (r)
-                {
-                    string userinfo = User.depname + "(" + User.F_UserCode + ")";
-                    string message = string.Empty;
-                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.neworder || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.audit)//0)
-                    {
-                        message = userinfo + " 修改了工单";
-                    }
-                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.submit)//1)
-                    {
-                        message = userinfo + " 修改并提交了工单";
-                    }
-                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.resubmit)//1)
-                    {
-                        message = userinfo + " 修改了重办工单";
-                    }
-                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish)//9)
-                    {
-                        message = userinfo + " 修改并结案了工单";
-                    }
-
-                    await Task.Run(()=> {
-                        #region 插入操作记录
-                        Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
-                        oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
-                        oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
-                        oper.F_CallRecordId = modelT_Bus_WorkOrder.F_CallRecordId;
-                        oper.F_File = modelT_Bus_WorkOrder.F_File;
-                        oper.F_Message = message;
-
-                        oper.F_CreateUser = User.F_UserCode;
-                        oper.F_CreateTime = DateTime.Now;
-                        oper.F_IsDelete = 0;
-
-                        operBLL.Add(oper);
-                        #endregion
-                    });
-                    await Task.Run(() => {
-                        #region 插入推送消息
-                        if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.submit)//1)
-                        {
-
-                            var role = new BLL.T_Sys_RoleInfo().GetModelList(" (F_RoleCode='ZXLD' or F_RoleCode='ZXLDGLYGLY'or F_RoleCode='MTDD')  ").Select(p => p.F_RoleId);
-                            var users = userBLL.GetModelList(" F_RoleId in (" + string.Join(",", role) + ")  ");
-
-                            foreach (var u in users)
-                            {
-                                msg.AddInternalMessagesInfo("工单消息", message + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, User.F_UserCode, (int)EnumSmsType.workorder);
-                            }
-                        }
-                        #endregion
-                    });
-                }
-
-                
-
-                return Success("操作成功");
-
-            }
-            else
-            {
-                return Success("权限不足");
-            }
-        }
-
-        /// <summary>
-        /// 修改工单信息
-        /// </summary>
-        /// <returns></returns>
-        //[Authority]
         public ActionResult EditWorkOrderBySource()
         {
             if (User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXBZ" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
@@ -16653,7 +16494,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     Model.T_Bus_RemindRecord modelT_Bus_RemindRecord = new Model.T_Bus_RemindRecord();
                     if (type == 1 && state > 0)
                     {
-                        modelT_Bus_RemindRecord = new BLL.T_Bus_RemindRecord().GetModelList(" F_State=0 and F_IsDelete=0 and F_Type =1 order by F_CreateTime desc").FirstOrDefault();
+                        modelT_Bus_RemindRecord = new BLL.T_Bus_RemindRecord().GetModelList(" F_State=0 and F_IsDelete=0 and F_Type =1 and F_WorkOrderId='"+ modelT_Bus_WorkOrder .F_WorkOrderId + "' order by F_CreateTime desc").FirstOrDefault();
                         if (modelT_Bus_RemindRecord != null)
                         {
                             modelT_Bus_RemindRecord.F_Content = overseeopinion;

CallCenterCommon/CallCenter.Utility/RedisHelper.cs

@@ -725,7 +725,10 @@ namespace CallCenter.Utility
         /// <returns></returns>
         public static bool KeyDelete(string redisKey)
         {
-            return database.KeyDelete(redisKey);
+            if (KeyExists(redisKey))
+                return database.KeyDelete(redisKey);
+            else
+                return true;
         }
 
         /// <summary>

CallCenterCommon/CallCenter.Utility/RedisHelper1.cs

@@ -725,7 +725,10 @@ namespace CallCenter.Utility
         /// <returns></returns>
         public static bool KeyDelete(string redisKey)
         {
-            return database.KeyDelete(redisKey);
+            if (KeyExists(redisKey))
+                return database.KeyDelete(redisKey);
+            else
+                return true;
         }
 
         /// <summary>