报表

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

@@ -3179,8 +3179,7 @@ question, int page = 1, int limit = 10)
             }
             else
             {
-              //  stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
-              //  sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + DateTime .Now .ToString ("yyyy-MM-01") + " 00:00:01', 120) ";
             }
             if (endtime != null && endtime.Trim() != "")
             {
@@ -3188,8 +3187,7 @@ question, int page = 1, int limit = 10)
             }
             else
             {
-              //  endtime = DateTime.Now.ToString("yyyy-MM-dd");
-              //  sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59', 120) ";
             }
           
             var modellist = workOrder.GetModelList(sql);
@@ -3267,7 +3265,7 @@ question, int page = 1, int limit = 10)
                                 worker.F_SalesBase = it.F_SalesBase;
                                 worker.F_Description = it.F_Description;
                                 string timeover = "", timeover2 = ""; int x = 0, y = 0;
-                                var itemList = itembll.GetModelList("  F_WoID=" + it.F_ID  + " order by F_ID desc");
+                                var itemList = itembll.GetModelList("  F_WoID=" + it.F_ID );
                                 if (itemList[0].F_NextDept > 0)
 
                                 {
@@ -3512,7 +3510,7 @@ question, int page = 1, int limit = 10)
                                         worker.F_SalesBase = it.F_SalesBase;
                                         worker.F_Description = it.F_Description;
                                         string timeover = "", timeover2 = ""; int x = 0, y = 0;
-                                        var itemList = itembll.GetModelList("  F_WoID=" + it.F_ID + " order by F_ID desc");
+                                        var itemList = itembll.GetModelList("  F_WoID=" + it.F_ID );
                                         if (itemList[0].F_NextDept > 0)
 
                                         {

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

@@ -2839,7 +2839,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <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)
             {
@@ -3739,6 +3739,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         return Error("请上传抽检单");
                     if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
                         return Error("请选择抽检时间");
+                    if (overtime==0)
+                    {
+                        overtime = 2160;
+                    }
                 }
                 if (!string.IsNullOrEmpty(input.F_SalesPhone))
                 {
@@ -4829,9 +4833,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and  F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
                             if (modellist != null)
                             {
-                                if (modellist.F_NextUser != ua.F_UserCode)
-                                    return Error("非接单人不可操作工单");
+                            if (modellist != null)
+                            {
+                                string[] sprt = modellist.F_NextUser.Split(',');
+                                if (sprt.Length == 1)
+                                {
+                                    if (modellist.F_NextUser != ua.F_UserCode)
+                                        return Error("非接单人不可操作工单");
+                                }
                             }
+                        }
                         
                         var res = BackWO(ua, model, cont, type);
                         if (res)
@@ -5136,8 +5147,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //        }
                 //    }
                 //}
-                if (!string.IsNullOrEmpty(model.F_WxOpenId))
-                    sendwxmsg(model, model.F_WxOpenId, nowUser, model .F_DealContent );
+                if (isover == 1)
+                {
+                    if (!string.IsNullOrEmpty(model.F_WxOpenId))
+                        sendwxmsg(model, model.F_WxOpenId, nowUser, model.F_DealContent);
+                }
+                  
                 #endregion
                 #endregion
                 return true;
@@ -5301,7 +5316,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     #endregion
 
-                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua, overtime, sms);
+                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua, overtime, sms, "", 1);
                     if (GetUser(input.F_WxOpenId) != null)
                     {
                         var user = GetUser(input.F_WxOpenId);

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

@@ -3760,7 +3760,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             /// 添加工单
             /// </summary>
             /// <returns></returns>
-            public ActionResult Add(WorkOrderNewInput input)
+            public ActionResult Add(WorkOrderNewInput input, int overtime = 0,int sms = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -3841,6 +3841,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 保存客户基本信息
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 model = inputtoobj(model, input, 2);
+                model.F_limit = overtime;
                 if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "YWY")
                 {
                     model.F_State = (int)EnumWorkOrderState.audit;
@@ -3870,8 +3871,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
 
-                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, 0, 0);
-                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
+                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
                             }
                             else
                             {
@@ -3884,7 +3885,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 dapt = deptmodel1.F_ParentId;
                                 deptneme = deptmodel1.F_DeptName;
                             }
-                            AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                            AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
                             string opt = "";
                         
                             if (dapt != 0)
@@ -3937,7 +3938,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else
                         {
-                            AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                            AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
                         }
                     return Success("添加成功！");
 
@@ -4215,7 +4216,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         deptname = deptmodel.F_DeptName + "-";
                     }
                     #endregion
-                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua,0,0);
+                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua,0,0,"",1);
                     if (ro !=null )
                     {
                       if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL"|| ro.F_RoleCode == "YWY")
@@ -5240,7 +5241,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_State = (int)EnumWorkOrderState.neworder;
                 model.F_CreateBy = usercode;
                 model.F_CreateOn = DateTime.Now;
-                model.F_limit =0;
+             //   model.F_limit =0;
             }
             model.F_IsVisit  = 1;
             model.F_IsDelete = 0;
@@ -5388,6 +5389,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(model, input, 2);
+                model.F_limit = overtime;
                 if (clbm == 0 && clid == 0)
                 {
                     return Error("请选择接收部门");
@@ -5648,7 +5650,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public ActionResult CreatOver(WorkOrderNewInput input )
+        public ActionResult CreatOver(WorkOrderNewInput input ,int overtime,int sms)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -5729,7 +5731,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(model, input, 2);
-
+                model.F_limit = overtime;
                 #endregion
                 long n = workOrder.Add(model);
                 if (n > 0)
@@ -5773,7 +5775,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime,sms );
                         var res = Overorder(ua, modlelist, 1);
                         if (res)
                             return Success("完结成功");
@@ -6225,12 +6227,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                        
                             var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                           
                             if (modellist != null)
                             {
-                                if (modellist.F_NextUser != ua.F_UserCode)
-                                    return Error("非接单人不可操作工单");
+                                string[] sprt = modellist.F_NextUser.Split(',');
+                                if (sprt.Length == 1)
+                                {
+                                    if (modellist.F_NextUser != ua.F_UserCode)
+                                        return Error("非接单人不可操作工单");
+                                }
                             }
-                        
                        
                         var res = BackWO(ua, model, cont, type);
                         if (res)
@@ -6820,8 +6826,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                       //    sendwxmsg(model, cusmodel.F_WxOpenId, nowUser, opt);
                      // }
                    }
-                   if (!string .IsNullOrEmpty(model.F_WxOpenId))
-                    sendwxmsg(model, model.F_WxOpenId, nowUser, model.F_DealContent );
+                    if (isover == 1)
+                    {
+                        if (!string.IsNullOrEmpty(model.F_WxOpenId))
+                            sendwxmsg(model, model.F_WxOpenId, nowUser, model.F_DealContent);
+                    }
+                        
                 }
                 #endregion
                 #endregion