11111

CallCenterApi/CallCenterApi.BLL/T_Bus_WorkOrder.cs

@@ -52,14 +52,7 @@ namespace CallCenterApi.BLL
             return dal.UpdateWorkOrder(F_Id, keyValues);
         }
 
-        /// <summary>
-        /// 更新一条数据
-        /// </summary>
-        public bool UpdateYS(CallCenterApi.Model.T_Bus_WorkOrder model)
-        {
-            return dal.UpdateYS(model);
-        }
-
+       
         /// <summary>
         /// 删除一条数据
         /// </summary>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -277,13 +277,10 @@
     <Compile Include="Controllers\Wiki\NounInterpretationController.cs" />
     <Compile Include="Controllers\Wiki\PolicyController.cs" />
     <Compile Include="Controllers\Wiki\ProfessorController.cs" />
-    <Compile Include="Controllers\workorder\AffairsController.cs" />
-    <Compile Include="Controllers\workorder\APPSController.cs" />
     <Compile Include="Controllers\workorder\AYWorkOrderController.cs" />
     <Compile Include="Controllers\workorder\NoticeCriticismController.cs" />
     <Compile Include="Controllers\workorder\ShangQiuWorkOrderController.cs" />
     <Compile Include="Controllers\workorder\WorkOrderController.cs" />
-    <Compile Include="Controllers\workorder\WorkOrderNewController.cs" />
     <Compile Include="Controllers\workorder\WOVisitRecordsController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/APPController.cs

@@ -26,6 +26,8 @@ namespace CallCenterApi.Interface.Controllers
     {
         // GET: APP
 
+
+        
         /// <summary>
         /// 登录
         /// </summary>
@@ -497,7 +499,7 @@ namespace CallCenterApi.Interface.Controllers
                     modelT_Bus_WorkOrder.F_IsOverdue = 0;//是否逾期(0:否，1：是)
                     modelT_Bus_WorkOrder.F_IsDelete = 0;//是否删除(0:否，1：是)
                     modelT_Bus_WorkOrder.F_ToBereply = 0;
-                    modelT_Bus_WorkOrder.F_Business = business;
+                   
                     //如果选择即刻答复：是，即为直办，工单结束
                     
                     #region

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SmsNewController.cs

@@ -359,6 +359,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
             int t = 0;
             try
             {
+                return "";
                 var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
                 var currentTime = Convert.ToInt64(ts.TotalMilliseconds).ToString();
                 HttpClient client = new HttpClient();

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -329,6 +329,7 @@ namespace CallCenterApi.Interface.Controllers
                 return Success("新增成功！");
             else
                 return Error("新增失败！");
+           
         }
         //[Authority]
         //修改用户信息

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallleaveController.cs

@@ -14,7 +14,7 @@ namespace CallCenterApi.Interface.Controllers.tel
     public class CallleaveController : BaseController
     {
         //获取留言列表
-        public ActionResult GetList(string strtelnum)
+        public ActionResult GetList(string tel)
         {
                 string sql = "";
                 DataTable dt = new DataTable();
@@ -22,15 +22,16 @@ namespace CallCenterApi.Interface.Controllers.tel
                 string strsettime = HttpUtility.UrlDecode(RequestString.GetQueryString("settime"));
                 string strremovetime = HttpUtility.UrlDecode(RequestString.GetQueryString("removetime"));
                 string status = HttpUtility.UrlDecode(RequestString.GetQueryString("status"));
+            string workorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("workorderid"));
 
-                string strpageindex = RequestString.GetQueryString("page");
+            string strpageindex = RequestString.GetQueryString("page");
                 int pageindex = 1;
                 string strpagesize = RequestString.GetQueryString("pagesize");
                 int pagesize = 10;
 
-                if (strtelnum != null && strtelnum.Trim() != "")
+                if (tel != null && tel.Trim() != "")
                 {
-                    sql += " and F_Phone= '" + strtelnum.Trim() + "' ";
+                    sql += " and F_Phone like'%" + tel.Trim() + "%' ";
                 }
                 if (strsettime.Trim() != "" && strsettime != "undefined")
                 {
@@ -40,7 +41,11 @@ namespace CallCenterApi.Interface.Controllers.tel
                 {
                     sql += " and CONVERT(varchar(10),F_DealTime, 23) = '" + strremovetime.Trim() + "' ";
                 }
-                if (status.Trim() != "-1" && status != "undefined")
+            if (workorderid.Trim() != "" && workorderid != "undefined")
+            {
+                sql += " and F_Id in( select F_LeaveRecordId from T_Bus_WorkOrder where F_WorkOrderId='"+ workorderid + "' )  ";
+            }
+            if (status.Trim() != "-1" && status != "undefined")
                 {
                     sql += " and F_Status = " + Convert.ToInt32(status);
                 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -15,34 +15,17 @@ namespace CallCenterApi.Interface
 {
     public class MvcApplication : System.Web.HttpApplication
     {
-        private static QuartzWorker _worker;
+   
         protected void Application_Start()
         {
             AreaRegistration.RegisterAllAreas();
             RouteConfig.RegisterRoutes(RouteTable.Routes);
             //clq 增加异常日志记录 自定义 HandleErrorAttribute
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
-            _worker = new QuartzWorker();
-          var satisfactionClose = new SatisfactionClose();
-           _worker.AddWork(satisfactionClose);
-          _worker.Start();
-           var ZhengWuDuiJie = new ZhengWuDuiJie();
-           _worker.AddWork(ZhengWuDuiJie);
-           _worker.Start();
-           var Peoplewebsite = new Peoplewebsite();
-        _worker.AddWork(Peoplewebsite);
-          _worker.Start();
-        //   var PushWorkorder = new PushWorkorder();
-       //    _worker.AddWork(PushWorkorder);
-       //   _worker.Start();
-        }
-        protected void Application_End()
-        {
-            if (_worker != null)
-            {
-                _worker.Stop();
-            }
+
+
         }
+     
 
         protected void Application_AuthenticateRequest(object sender, EventArgs e)
         {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -183,18 +183,8 @@ namespace CallCenterApi.Interface.Models.Common
         {
             return new button(46, "退回申请延时");
         }
-        public static button visits()
-        {
-            return new button(47, "省平台结案");
-        }
-        public static button ejdelay()
-        {
-            return new button(48, "省平台申请延时");
-        }
-        public static button Report()
-        {
-            return new button(49, "上报");
-        }
+       
+       
         public static button Unsuccessful()
         {
             return new button(50, "已办未果");
@@ -211,7 +201,6 @@ namespace CallCenterApi.Interface.Models.Common
         {
             return new button(53, "审核通过转办");
         }
-
         public static button AuditDispatch()
         {
             return new button(54, "审核通过");
@@ -224,6 +213,10 @@ namespace CallCenterApi.Interface.Models.Common
        {
            return new button(56, "解释");
         }
+        public static button AuditReturn ()
+        {
+            return new button(58, "退回审核");
+        }
         /// <summary>
         /// 审核员退回
         /// </summary>
@@ -328,14 +321,14 @@ namespace CallCenterApi.Interface.Models.Common
                         }
                         else
                         {
-                            buttons.Add(Report());
+                          //  buttons.Add(Report());
                             buttons.Add(edit());
                             buttons.Add(back());
                             // buttons.Add(assign());
                             // buttons.Add(approval());
                             //20190315提出需求 操作-领导批示改为转督办 (20190327 zhengbingbing)
                             //  buttons.Add(turnsee());
-                            buttons.Add(instruct());
+                           // buttons.Add(instruct());
                         }
                        
                     }
@@ -371,13 +364,13 @@ namespace CallCenterApi.Interface.Models.Common
                     //二级网络单位 管理员
                     if (code == "WLDW" || code == "GLY" || code == "DDZG")
                     {
-                        buttons.Add(feedback()); buttons.Add(reback());
+                        buttons.Add(feedback());// buttons.Add(reback());
                         if (iszbdw == "1" || code == "GLY" || code == "DDZG")
                         {
                             
-                                if (user =="省平台")
-                                buttons.Add(ejdelay());
-                            else 
+                            //    if (user =="省平台")
+                            //    buttons.Add(ejdelay());
+                            //else 
                             buttons.Add(delay());
                             if (ispd == "0" || ispd == "")
                             {
@@ -410,13 +403,13 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                         if (ispd == "1")
                         {
-                            buttons.Add(sign()); buttons.Add(refuse());
+                            buttons.Add(sign()); //buttons.Add(refuse());
                         }
                         if (ispd == "2")
                         {
-                            buttons.Add(EJredo());
+                           // buttons.Add(EJredo());
                             //三级单位签收后，加个退回按钮，可以退回工单到二级单位，退回时必须输入退回原因
-                            buttons.Add(feedback());
+                           buttons.Add(feedback());
                             //三级单位签收后，加个退回按钮，可以退回工单到二级单位，退回时必须输入退回原因
                         }
                     }
@@ -433,7 +426,7 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                         if (ispd == "1")
                         {
-                            buttons.Add(sign()); buttons.Add(refuse());
+                            buttons.Add(sign()); //buttons.Add(refuse());
                         }
                         if (ispd == "2")
                         {
@@ -455,7 +448,7 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                         if (isproresult == 2)
                         {
-                            if (code == "WLDW" || code == "GLY" || code == "DDZG")
+                            if (code == "WLDW" )
                             {
                                buttons.Add(feedback());
                             }
@@ -573,7 +566,7 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                         if (isproresult == 2)
                         {
-                            if (code == "WLDW" || code == "GLY" || code == "DDZG")
+                            if (code == "WLDW" )
                             {
                                 buttons.Add(feedback());
                             }
@@ -582,17 +575,17 @@ namespace CallCenterApi.Interface.Models.Common
                         {
                             if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD")
                             {
-                                if (user == "省平台")
-                                    buttons.Add(visits());
-                                else
+                                //if (user == "省平台")
+                                //    buttons.Add(visits());
+                                //else
                                     buttons.Add(visit());
                                 //  buttons.Add(modify());
                             }
                             if (code == "ZXHWY")
                             {
-                                if (user == "省平台")
-                                    buttons.Add(visits());
-                                else
+                                //if (user == "省平台")
+                                //    buttons.Add(visits());
+                                //else
                                     buttons.Add(visit());
                             }
                         }
@@ -628,13 +621,10 @@ namespace CallCenterApi.Interface.Models.Common
                     {
 
                         buttons.Add(feedback());
-                        if (user == "省平台")
-                            buttons.Add(ejdelay());
-                        else
                             buttons.Add(delay());
                         buttons.Add(split());
 
-                        buttons.Add(reback());
+                       // buttons.Add(reback());
 
                     }
                     //调度专员 中心领导管理员 管理员
@@ -650,11 +640,11 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                         if (ispd == "1")
                         {
-                            buttons.Add(sign()); buttons.Add(refuse());
+                            buttons.Add(sign()); //buttons.Add(refuse());
                         }
                         if (ispd == "2")
                         {
-                            buttons.Add(EJredo());
+                           // buttons.Add(EJredo());
                             //三级单位签收后，加个退回按钮，可以退回工单到二级单位，退回时必须输入退回原因
                             buttons.Add(feedback());
                             //三级单位签收后，加个退回按钮，可以退回工单到二级单位，退回时必须输入退回原因
@@ -711,6 +701,14 @@ namespace CallCenterApi.Interface.Models.Common
                         buttons.Add(subreload());
                     }
                     break;
+                case "14":
+                    if (code == "ZJZY" || code == "ZXLD" || code == "GLY" || code == "DDZG")
+                    {
+                        buttons.Add(AuditReturn());
+                        
+                    }
+                   
+                    break;
             }
             //buttons.Add(export());
             //调度专员 中心领导管理员 管理员

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/EnumWorkState.cs

@@ -46,6 +46,9 @@ namespace CallCenterApi.Interface.Models.Common
 
         [Description("重办驳回")]
         rejload =13,
-      
+
+        [Description("退回待审核")]
+        backaudit = 14,
+
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Properties/PublishProfiles/bb.pubxml

@@ -11,7 +11,7 @@
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>D:\安阳12345API发布地址</publishUrl>
+    <publishUrl>D:\项目\鹤壁12345\发布</publishUrl>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -667,14 +667,14 @@ namespace CallCenterApi.Model
             get { return _f_isopen; }
         }
 
-        /// <summary>
-        /// 三方通话
-        /// </summary>
-        public int F_Business
-        {
-            set { _f_business = value; }
-            get { return _f_business; }
-        }
+        ///// <summary>
+        ///// 三方通话
+        ///// </summary>
+        //public int F_Business
+        //{
+        //    set { _f_business = value; }
+        //    get { return _f_business; }
+        //}
         /// <summary>
         /// 行政区
         /// </summary>
@@ -702,7 +702,7 @@ namespace CallCenterApi.Model
         /// 子工单编号
         /// </summary>
         public string F_SubWorkorder1 { set; get; }
-        public string F_PhoneType { set; get; }
+     //   public string F_PhoneType { set; get; }
         /// <summary>
         /// 重办标识
         /// </summary>
@@ -712,67 +712,32 @@ namespace CallCenterApi.Model
         /// </summary>
         public int F_VisitType { set; get; }
         public int F_IsMedia { set; get; }
-        public int? F_IsSendBack{ set; get; }
+     //   public int? F_IsSendBack{ set; get; }
         /// <summary>
-        /// 登记人工号
+        /// 修改人工号
         /// </summary>
-        public string F_EditUser
-        { set; get; }
+     //   public string F_EditUser
+      //  { set; get; }
 
         /// <summary>
         /// 0未审核1已审核2回访审核
         /// </summary>
-        public int? F_IsExamine { set; get; }
+      //  public int? F_IsExamine { set; get; }//删除
         /// <summary>
         /// 交办审核时间
         /// </summary>
-        public DateTime? F_AssignExamineTime { set; get; }
-        public string F_AssignExamineUser { set; get; }
+      //  public DateTime? F_AssignExamineTime { set; get; }//删除
+    //    public string F_AssignExamineUser { set; get; }//删除
         /// <summary>
         /// 回访审核时间
         /// </summary>
-        public DateTime? F_VisitExamineTime { set; get; }
-        public string F_VisitAssignUser { set; get; }
+     //   public DateTime? F_VisitExamineTime { set; get; }//删除
+      //  public string F_VisitAssignUser { set; get; }//删除
         /// <summary>
         /// 是否营商
         /// </summary>
-        public int ? F_IsBusiness { set; get; }
-        ///// <summary>
-        /////任务单唯一标识
-        ///// </summary>
-        //public string TROWGUID { set; get; }
-        ///// <summary>
-        /////工单编号
-        ///// </summary>
-        //public string CASE_SERIAL { set; get; }
-        ///// <summary>
-        /////应签收时限
-        ///// </summary>
-        //public string TSIGNTIME_BF { set; get; }
-        ///// <summary>
-        /////应退回时限
-        ///// </summary>
-        //public string TBACKTIME_BF { set; get; }
-        ///// <summary>
-        /////交办时间
-        ///// </summary>
-        //public string SEND_TIME { set; get; }
-        ///// <summary>
-        /////交办意见
-        ///// </summary>
-        //public string SEND_CONTENT { set; get; }
-        ///// <summary>
-        /////登记时间
-        ///// </summary>
-        //public string CASE_TIME { set; get; }
-        ///// <summary>
-        /////应办结时间
-        ///// </summary>
-        //public string TFDBACKTIME_BF { set; get; }
-        ///// <summary>
-        /////结案回传附件
-        ///// </summary>
-        //public string FILES { set; get; }
+     //   public int ? F_IsBusiness { set; get; }//删除
+      
         #endregion Model
 
     }