超时时限，短信推送

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -2751,7 +2751,7 @@ question, int page = 1, int limit = 10)
         /// <returns></returns>
         private bool TimeforOver(int id)
         {
-            var itemlasts = itembll.GetModelList("  F_WoID=" + id + " order by F_ID desc");
+            var itemlasts = itembll.GetModelList("  F_WoID=" + id );
             string time1 = "", time2 = ""; int x = 0, y = 0;
             float time = 0;
             if (itemlasts.Count > 0)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -1760,6 +1760,60 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// 查询工单详情
         /// </summary>
         [WechatActionFilter]
+        public ActionResult GetCustomDetails(string OpenId, int id)
+        {
+            if (!string.IsNullOrEmpty(OpenId))
+            {
+                if (id <= 0)
+                {
+                    return Error("请输入正确的id");
+                }
+                DataTable FileUrl = new DataTable();
+                var list = new List<Model.T_Wo_WorkOrder>();
+                var model = woBLL.GetModel(id);
+                if (model != null)
+                    list.Add(model);
+                var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
+                ; var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+                if (!string.IsNullOrEmpty(model.F_Files))
+                {
+                    FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
+                }
+                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
+                if (list.Count > 0)
+                {
+                    List<WorkOrderNewInput> Input = modeltooip(list, ua);
+                    if (Input != null)
+                    {
+                        var obj = new
+                        {
+                            state = "success",
+                            message = "成功",
+                            rows = Input,
+                            FileUrl,
+                            total = itemlasts,
+                        };
+
+                        return Content(obj.ToJson());
+                    }
+                    else
+                    {
+                        return Error("没有查询到此工单");
+                    }
+                }
+                else
+                    return Error("没有查询到此工单");
+
+            }
+            else
+            {
+                return Error("无操作权限！");
+            }
+        }
+        /// <summary>
+        /// 查询工单详情
+        /// </summary>
+        [WechatActionFilter]
         public ActionResult GetDetails(string OpenId, int id)
         {
             if (!string.IsNullOrEmpty(OpenId))
@@ -2995,7 +3049,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_MaterialID = input.F_MaterialID.ToString();//物料编码为11为纯数字
             }
             model.F_Source = input.F_Source.ToString();//工单来源
-            model.F_WxOpenId = input.F_WxOpenId;
+          
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
             model.F_CusName = input.F_CusName;//客户姓名
             model.F_CusPhone = input.F_CusPhone;//客户电话
@@ -3041,7 +3095,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             model.F_CJ_Tonnage = input.F_CJ_Tonnage;//抽检-抽检吨数
             model.F_CJ_BagNo = input.F_CJ_BagNo;//抽检-抽检袋数
             model.F_CJ_Outlay = input.F_CJ_Outlay;//抽检-公关费用金额：单位元】
-                                                  //     model.F_VisitRemarks = input.F_VisitRemarks;//回访备注
+            model.F_WxOpenId = input.F_WxOpenId;                                    //     model.F_VisitRemarks = input.F_VisitRemarks;//回访备注
             if (!string.IsNullOrEmpty(input.F_BatchNumber))
             {
                 if (type == 1)
@@ -3565,6 +3619,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "",int  isbl=0)
         {
 
+            if (model.F_limit > 0)
+                overtime = model.F_limit;
             string smscont = "";
             if (model.F_Type == "1")
             {
@@ -3701,7 +3757,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //工单完结要更新工单的状态
                 //   model.F_DealBy = touser;
                 model.F_State = wostate;
-                model.F_limit = overtime;
+                if (model.F_limit == 0)
+                    model.F_limit = overtime;
                 if (!string.IsNullOrEmpty(F_Files))
                 {
                     if (!string .IsNullOrEmpty(model.F_Files))
@@ -3907,7 +3964,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
         private bool TimeforOver(int id)
         {
-            var itemlasts = itembll.GetModelList("  F_WoID=" + id + " order by F_ID desc");
+            var itemlasts = itembll.GetModelList("  F_WoID=" + id );
             string time1 = "", time2 = ""; int x = 0, y = 0;
             float time = 0;
             if (itemlasts.Count > 0)
@@ -4598,6 +4655,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                     }
                 }
+                if (!string.IsNullOrEmpty(model.F_WxOpenId))
+                    sendwxmsg(model, model.F_WxOpenId, nowUser, "处理");
                 #endregion
                 #endregion
                 return true;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -4678,7 +4678,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         private float TimeToOver(int id, int limit)
         {
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + "order by F_ID desc ");
+            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id );
             string time1 = "", time2 = ""; int x = 0, y = 0;
             if (itemlasts.Count > 0)
             {
@@ -4751,7 +4751,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         private bool  TimeforOver(int id)
         {
-            var itemlasts = itembll.GetModelList("  F_WoID=" + id + " order by F_ID desc");
+            var itemlasts = itembll.GetModelList("  F_WoID=" + id );
            // var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
             string  time1="", time2="" ;int x=0, y=0;
             float  time = 0;
@@ -6483,6 +6483,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
                         sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
                 }
+                if (!string.IsNullOrEmpty(model.F_WxOpenId))
+                    sendwxmsg(model, model.F_WxOpenId, nowUser, "完结");
                 #endregion
                 #endregion
                 return true;
@@ -6599,7 +6601,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                           sendwxmsg(model, cusmodel.F_WxOpenId, nowUser, opt);
                       }
                    }
-               }
+                   if (!string .IsNullOrEmpty(model.F_WxOpenId))
+                    sendwxmsg(model, model.F_WxOpenId, nowUser, "处理");
+                }
                 #endregion
                 #endregion
                 return true;
@@ -6742,6 +6746,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "",int isbl=0)
         {
+            if (model.F_limit > 0)
+                overtime = model.F_limit;
             string smscont = "";
             if (model.F_Type == "1")
             {
@@ -6880,7 +6886,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //工单完结要更新工单的状态
              //   model.F_DealBy = touser;
                 model.F_State = wostate;
-                model.F_limit  = overtime ;
+                if (model.F_limit==0)
+                    model.F_limit  = overtime;
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";
@@ -6973,6 +6980,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             catch { }
             #endregion
         }
+
     }
 }
 public class WorkOrdeDeptment