111111

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

@@ -1091,7 +1091,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             case 10://已完成的
                                 if (GetDeptUserCode(ua.F_DeptId) != "")
                                 {
-                                    sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
+                                    //sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
+                                    sql += " and ((F_State in(10,11) and F_Flag = null ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
                                     sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
                                 }
                                 //  sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
@@ -1920,7 +1921,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     case 2://已完成的
                         sql = "";
                         sql += $"  F_IsDelete=0";
-                        sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
+                        //sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
+                        sql += " and ((F_State in(10,11) and F_Flag = null ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
                         if (GetDeptUserCode(ua.F_DeptId) != "")
                         {
                             sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
@@ -2703,8 +2705,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (CirculMarket(ua.F_DeptId, 11))
             {
                 isbl = 1;
-                nextda = 37;
-                opt = "流转市场管理科";
+                nextda = 427;
+                opt = "流转运营中心";
                 //nextda2 = 36;
                 //opt2 = "流转质量管理科";
                 //flag = 3;
@@ -4845,8 +4847,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 //{
                                 if (CirculMarket(ua.F_DeptId, 11))
                                 {
-                                    nextda = 37;
-                                    opt = "流转市场管理科";
+                                    nextda = 427;
+                                    opt = "流转运营中心";
                                 }
                                 else if (CirculMarket(ua.F_DeptId, 14))
                                 {
@@ -4890,6 +4892,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 //}
                                 if (nextda != 0)
                                 {
+                                    model.F_State = 1;
+                                    model.F_State2 = 0;
                                     model.F_Flag = 9;
                                     var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms,0,0,0,"",1,3,9);
                                     if (res)
@@ -5462,7 +5466,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 #region 处理工单
                 //工单完结要更新工单的状态
                 //   model.F_DealBy = touser;
-                if (flag == 1)
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                 {
                     model.F_State = wostate;
                 }
@@ -5954,7 +5958,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (itemid > 0)
             {
                 #region 处理工单
-                if (flag == 1)
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                 {
                     model.F_State = wostate;//已接单待处理
                 }
@@ -6474,7 +6478,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 #region 处理工单
                 if (deptid == 2)
                 {
-                    if (flag == 1)
+                    if (flag == 1 || (model.F_Flag == null && flag == 3))
                     {
                         model.F_State = (int)EnumWorkOrderState.reassign;
                     }
@@ -6485,7 +6489,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 else
                 {
-                    if (flag == 1)
+                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                     {
                         model.F_State = wostate;
                     }
@@ -6624,7 +6628,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //}
                 #endregion
                 #region 处理工单
-                if (flag == 1)
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                 {
                     model.F_State = wostate;
                 }
@@ -6712,7 +6716,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (itemid > 0)
             {
                 #region 处理工单
-                if (flag == 1)
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                 {
                     model.F_State = wostate;
                 }
@@ -6753,7 +6757,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             model.F_DealContent += cont + "；";
                         }
                     }
-                    if (flag == 1)
+                    if (flag == 1 || (model.F_Flag == null && flag == 3))
                     {
                         model.F_SuperiorOpinion = cont;
                     }
@@ -7026,8 +7030,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         //{
                             if (CirculMarket(ua.F_DeptId, 11))
                             {
-                                nextda = 37;
-                                opt = "流转市场管理科";
+                                nextda = 427;
+                                opt = "流转运营中心";
                             }
                             else if (CirculMarket(ua.F_DeptId, 14))
                             {

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

@@ -275,7 +275,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //{
                             //    sql += " and F_State2 in(10,11)";
                             //}
-                            sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
+                            //sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
+                            sql += " and ((F_State in(10,11) and F_Flag = null ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
                             sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
                         }
 
@@ -394,7 +395,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             return Success("无操作权限"); ;
                         }
-                        sql += $" and (F_State=" + (int)EnumWorkOrderState.finish + " or F_State2=" + (int)EnumWorkOrderState.finish + ") and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)"; ;
+                        sql += " and ((F_State=10 and ((F_Flag = null or F_Flag=0) and F_State2=10)) or (F_Flag=2 and F_State2=10) or  (F_Flag=1 and F_State=10) or (F_Flag=3 and(F_State=10 or F_State2=10))) and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)";
+                        //sql += $" and (F_State=" + (int)EnumWorkOrderState.finish + " or F_State2=" + (int)EnumWorkOrderState.finish + ") and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)"; ;
                         //sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)"; ;
                         break;
                     case 8://待审批
@@ -636,8 +638,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("无操作权限！");
             }
-            #region 
-            #endregion
 
         }
         /// <summary>
@@ -657,7 +657,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 string uwhere = " ";
                 string sql = "";
-                if (!Refresh() || !Refresh2())
+                if (!Refresh())
                 {
                     return Error("查询失败");
                 }
@@ -809,7 +809,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //{
                             //    sql += " and F_State2 in(10,11)";
                             //}
-                            sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
+                            sql += " and ((F_State in(10,11) and F_Flag = null ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
                             if (GetDeptUserCode(ua.F_DeptId) != "")
                             {
                                 sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
@@ -862,18 +862,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 RV_awaitVist = 0;
                                 break;
-                            }                         
-                            sql += $" and ((F_State=" + (int)EnumWorkOrderState.finish + " and F_State2!=" + (int)EnumWorkOrderState.evaluate + ") or (F_State!=" + (int)EnumWorkOrderState.evaluate + " and F_State2=" + (int)EnumWorkOrderState.finish + "))  and F_IsVisit = '" + "1" + "' " + uwhere; ;
-                            //sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
+                            }
+                            //sql += $" and ((F_State=" + (int)EnumWorkOrderState.finish + " and F_State2!=" + (int)EnumWorkOrderState.evaluate + ") or (F_State!=" + (int)EnumWorkOrderState.evaluate + " and F_State2=" + (int)EnumWorkOrderState.finish + "))  and F_IsVisit = '" + "1" + "' " + uwhere; ;
+                            sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
                             RV_awaitVist = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待回访
 
                             break;
                         case 6://已回访
+                            string zxsql = "";
                             sql = "";
                             sql += $"  F_IsDelete=0";
                             if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                             {
-                                sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
+                                zxsql = " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
                                 sql += $" and (F_State=" + (int)EnumWorkOrderState.evaluate+" or F_State2 = " + (int)EnumWorkOrderState.evaluate+")" ;
                             }
                             else if (ro.F_RoleCode == "XTGLY")
@@ -934,11 +935,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 break;
                             }
                             string where = $"F_IsDelete=0 and (F_State in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}) or F_State2 in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}))"; ;
-                            RV_resultVisit = new BLL.T_Wo_WorkOrder().GetModelList(where).Count;//
+                            RV_resultVisit = new BLL.T_Wo_WorkOrder().GetModelList(where+ zxsql).Count;//
                             sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
                             sql += $" and F_IsVisit=" + 1; ;
                             sql += $" and F_VisitBy !=''";
-                            RV_haveVisit = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已回访
+                            RV_haveVisit = new BLL.T_Wo_WorkOrder().GetModelList(sql+ zxsql).Count;//已回访
                             break;
                         case 7://待完结
                             sql = "";
@@ -952,7 +953,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 DWJ = 0;
                                 break; ;
                             }
-                            sql += $" and (F_State=" + (int)EnumWorkOrderState.finish + " or F_State2=" + (int)EnumWorkOrderState.finish + ") and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)"; ;
+                            sql += " and ((F_State=10 and ((F_Flag = null or F_Flag=0) and F_State2=10)) or (F_Flag=2 and F_State2=10) or  (F_Flag=1 and F_State=10) or (F_Flag=3 and(F_State=10 or F_State2=10))) and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)";
                             //sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or  F_Type = 3) "; ;
                             DWJ = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待完结
                             break;
@@ -1094,22 +1095,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 17://超期
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            //sql += $" and (F_IsOver=1 or F_IsOver=2)";
-                            //sql += $" and F_State !=" + 11;
-                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
-                            {
-                                sql += $" and((F_IsOver in(1,3) and F_State !=11) or ( F_IsOver in (2,3) and  F_State2!=11))";
-                            }
-                            else if (ua.F_Flag == 1)
-                            {
-                                sql += $" and F_IsOver in (1,3)";
-                                sql += $" and F_State !=" + 11;
-                            }
-                            else if (ua.F_Flag == 2)
-                            {
-                                sql += $" and  F_IsOver in (2,3)";
-                                sql += $" and F_State2 !=" + 11;
-                            }
+                            sql += $" and F_IsOver=" + 1;
+                            sql += $" and F_State !=" + 11;
+                            //if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                            //{
+                            //    sql += $" and((F_IsOver in(1,3) and F_State !=11) or ( F_IsOver in (2,3) and  F_State2!=11))";
+                            //}
+                            //else if (ua.F_Flag == 1)
+                            //{
+                            //    sql += $" and F_IsOver in (1,3)";
+                            //    sql += $" and F_State !=" + 11;
+                            //}
+                            //else if (ua.F_Flag == 2)
+                            //{
+                            //    sql += $" and  F_IsOver in (2,3)";
+                            //    sql += $" and F_State2 !=" + 11;
+                            //}
                             #region 退换货的工单按未超期处理 20220302
                             sql += $" and  F_ID not in (select F_ID from T_Wo_WorkOrder where F_SC_PreliminaryOpinion='退换货')";
                             #endregion
@@ -1681,8 +1682,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (CirculMarket(ua.F_DeptId, 11))
             {
                 isbl = 1;
-                nextda = 37;
-                opt = "流转市场管理科";
+                nextda = 427;
+                opt = "流转运营中心";
                 //nextda2 = 36;
                 //opt2 = "流转质量管理科";
                 //flag = 3;
@@ -2450,7 +2451,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (markdepts.Contains(ua.F_DeptId.ToString()))
                     {
                         var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =1 and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
-                        if (itemlast.Count == 2 || itemnext.F_Flag == 9)
+                        if (itemlast.Count == 2 || (itemnext!=null && itemnext.F_Flag == 9))
                         {
                             woflag = 9;
                         }
@@ -3791,7 +3792,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                if (!Refresh() || !Refresh2())
+                if (!Refresh())
                 {
                     return Error("查询失败");
                 }
@@ -3838,27 +3839,28 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += $" and F_TS_Category='" + product.Trim() + "'";
                 }
-                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
-                Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-
                 if (state > 0)
                 {
                     sql += $" and F_State =" + state;
                 }
-                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
-                {
-                    sql += $" and((F_IsOver in(1,3) and F_State !=11) or ( F_IsOver in (2,3) and  F_State2!=11))";
-                }
-                else if (ua.F_Flag == 1)
-                {
-                    sql += $" and F_IsOver in (1,3)";
-                    sql += $" and F_State !=" + 11;
-                }
-                else if (ua.F_Flag == 2)
-                {
-                    sql += $" and  F_IsOver in (2,3)";
-                    sql += $" and F_State2 !=" + 11;
-                }
+                sql += $" and F_IsOver=" + 1;
+                sql += $" and F_State !=" + 11;
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
+                //if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                //{
+                //    sql += $" and((F_IsOver in(1,3) and F_State !=11) or ( F_IsOver in (2,3) and  F_State2!=11))";
+                //}
+                //else if (ua.F_Flag == 1)
+                //{
+                //    sql += $" and F_IsOver in (1,3)";
+                //    sql += $" and F_State !=" + 11;
+                //}
+                //else if (ua.F_Flag == 2)
+                //{
+                //    sql += $" and  F_IsOver in (2,3)";
+                //    sql += $" and F_State2 !=" + 11;
+                //}
                 if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
                 {
                     sql += $" and F_DealBy like '%" + ua.F_UserCode.Trim() + "%'";
@@ -5534,8 +5536,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //{
                             if (CirculMarket(ua.F_DeptId, 11))
                             {
-                                nextda = 37;
-                                opt = "流转市场管理科";
+                                nextda = 427;
+                                opt = "流转运营中心";
                             }
                             else if (CirculMarket(ua.F_DeptId, 14))
                             {
@@ -5579,7 +5581,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //}
                             if (nextda != 0)
                             {
-                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1);
+                                modlelist.F_Flag = 9;
+                                modlelist.F_State = 1;
+                                modlelist.F_State2 = 0;
+                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1,3,9);
                                 if (res)
                                     return Success("添加成功");
                                 else
@@ -5933,8 +5938,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 //{
                                 if (CirculMarket(ua.F_DeptId, 11))
                                 {
-                                    nextda = 37;
-                                    opt = "流转市场管理科";
+                                    nextda = 427;
+                                    opt = "流转运营中心";
                                 }
                                 else if (CirculMarket(ua.F_DeptId, 14))
                                 {
@@ -5977,7 +5982,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 //}
                                 if (nextda != 0)
                                 {
-                                    var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0, 0, 0, 0, "", 1);
+                                    var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0, 0, 0, 0, "",1,1,9);
                                     if (res)
                                         return Success("保存成功");
                                     else
@@ -6137,7 +6142,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     #region 基本字段
                     model.F_ID = model1[i].F_ID;//
                     model.F_WorkOrderCode = model1[i].F_WorkOrderCode;//工单编号
-                    #region
                     if (!string.IsNullOrEmpty(model1[i].F_Source))
                     {
                         model.F_Source = int.Parse(model1[i].F_Source);//工单来源
@@ -6147,7 +6151,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model1[i].F_Source = "1";
                         model.F_Source = int.Parse(model1[i].F_Source);//工单来源
                     }
-                    if (model1[i].F_Source == "1")
+                    if (model1[i].F_Source == "1" || model1[i].F_Source=="0")
                     {
                         model.F_SourceName = "电话";
                     }
@@ -6494,23 +6498,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.RemainingTime = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days, hours, minutes);
                     else
                         model.RemainingTime = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days, hours, minutes);
-                    #endregion
+                    //if (days<=1 && days>=0)
+                    //{
+                    //    SendTimeOverMes(model1[i].F_ID, hours);
+                    //}
 
-                    #region 内线超时时间计算
-                    float c2 = TimeToOver(model1[i].F_ID, model1[i].F_limit, 2);
-                    float a2 = Math.Abs(c2);
-                    int days2 = (int)Math.Floor(Convert.ToDouble(a2 / 24));
-                    int hours2 = days2 > 0
-                                   ? (int)Math.Floor(Convert.ToDouble((a2 - days2 * 24)))
-                                   : (int)Math.Floor(Convert.ToDouble(a2));
-                    float minutes2 = hours2 > 0
-                                   ? a2 * 60 - days2 * 1440 - hours2 * 60
-                                   : 0;
-                    if (c2 > 0)
-                        model.RemainingTime2 = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
-                    else
-                        model.RemainingTime2 = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
-                    #endregion
+                    //#region 内线超时时间计算
+                    //float c2 = TimeToOver(model1[i].F_ID, model1[i].F_limit, 2);
+                    //float a2 = Math.Abs(c2);
+                    //int days2 = (int)Math.Floor(Convert.ToDouble(a2 / 24));
+                    //int hours2 = days2 > 0
+                    //               ? (int)Math.Floor(Convert.ToDouble((a2 - days2 * 24)))
+                    //               : (int)Math.Floor(Convert.ToDouble(a2));
+                    //float minutes2 = hours2 > 0
+                    //               ? a2 * 60 - days2 * 1440 - hours2 * 60
+                    //               : 0;
+                    //if (c2 > 0)
+                    //    model.RemainingTime2 = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
+                    //else
+                    //    model.RemainingTime2 = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
+                    //#endregion
 
                     model.F_VisitOn = model1[i].F_VisitOn;//回访时间
                     model.F_VisitBy = model1[i].F_VisitBy;//回访人
@@ -6646,6 +6653,69 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return null;
             }
         }
+
+
+        /// <summary>
+        /// 工单超期24小时提醒市场管理科
+        /// </summary>
+        /// <param name="woid"></param>
+        /// <returns></returns>
+        public ActionResult SmsOverTimeMs()
+        {
+            LogFactory.GetLogger("定时任务发短信").Error("开始了");
+            var modlelist = workOrder.GetModelList("  F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+               (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish + ")");
+            if (modlelist.Count > 0)
+            {
+                foreach (var it in modlelist)
+                {
+                    float c = TimeToOver(it.F_ID, it.F_limit);
+                    float a = Math.Abs(c);
+                    int days = (int)Math.Floor(Convert.ToDouble(a / 24));
+                    if (days >= 0 && days <= 1)
+                    {
+                        int hours = (int)Math.Floor(Convert.ToDouble((a - days * 24)));
+                        SendTimeOverMes(it.F_ID, hours);
+                    }
+                }
+
+            }
+            return Success("发送成功");
+        }
+        public bool SendTimeOverMes(int woid,int hours)
+        {
+            //你有工单{ 1}已超期{ 2}，请及时处理
+            var model = workOrder.GetModel(woid);
+            if (model != null)
+            {
+                LogFactory.GetLogger("工单id：").Error(model.F_WorkOrderCode);
+                string touser = "";
+                string[] mag = { hours.ToString(),model.F_WorkOrderCode };
+                string smsmsg = $"您有一个工单即将超期，剩余时间{hours}小时，请尽快办理，工单编号：{model.F_WorkOrderCode }";
+                string strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427) order by F_CreateTime desc)";
+                var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
+                if (deptmodel != null)
+                {
+                    var userlist = sysUserAccountBll.GetModelList("F_DeptId=" + deptmodel.F_DeptId);
+                    if (userlist.Count > 0)
+                    {
+                        foreach (var item in userlist)  
+                        {
+                            touser = item.F_UserCode; ;
+                            if (!string.IsNullOrEmpty(item.F_Mobile))
+                            {
+                                LogFactory.GetLogger("手机号码：").Error(item.F_Mobile);
+                                //SmsSingleSenderResult result = new SMSController().SMSSingleshot(1458874, mag, item.F_Mobile.Trim());
+                                //bool n = new SMSController().AddSmS(item.F_Mobile.Trim(), smsmsg, userId);
+                            }
+                        }
+                        return true;
+                    }
+                }
+                return false;
+            }
+            else return false;
+        }
         private string AssCont(int id)
         {
             string cont = "";
@@ -7770,7 +7840,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 工单处理
             int sms = 0;
-            int woflag = model.F_Flag;
+            int? woflag = model.F_Flag;
             string strsql = "";
             if (woflag == 1)
             {
@@ -9158,7 +9228,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 处理工单
                 if (deptid == 2)
                 {
-                    if (flag == 1)
+                    if (flag == 1 ||((model.F_Flag==null || model.F_Flag == 0) && model.F_State2==10 && flag==3))
                     {
                         model.F_State = (int)EnumWorkOrderState.reassign;
                     }
@@ -9169,7 +9239,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    if (flag == 1)
+                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                     {
                         model.F_State = wostate;
                     }
@@ -9307,7 +9377,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //}
                 #endregion
                 #region 处理工单
-                if (flag == 1)
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                 {
                     model.F_State = wostate;
                 }
@@ -9588,7 +9658,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (itemid > 0)
             {
                 #region 处理工单
-                if (flag == 1)
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                 {
                     model.F_State = wostate;
                 }
@@ -9631,11 +9701,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
 
                     }
-                    if (flag == 1 && model.F_Flag != 2)
+                    if (flag == 1 || (model.F_Flag == null && flag == 3))
                     {
                         model.F_SuperiorOpinion = cont;
                     }
-                    else if (flag == 2 && model.F_Flag != 1)
+                    else if (flag == 2)
                     {
                         model.F_SuperiorOpinion2= cont;
                     }                 
@@ -9762,7 +9832,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (itemid > 0)
             {
                 #region 处理工单
-                if (flag == 1)
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                 {
                     model.F_State = wostate;//已接单待处理
                 }
@@ -10083,7 +10153,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 处理工单
                 //工单完结要更新工单的状态
                 //   model.F_DealBy = touser;
-                if (flag == 1)
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
                 {
                     model.F_State = wostate;
                 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -1009,7 +1009,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string SuperiorOpinion2 { get; set; }
 
-        public int F_Flag { get; set; }
+        public int? F_Flag { get; set; }
         
         public int? inout { get; set; }
         public int? woflag { get; set; }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -1059,7 +1059,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 1单线外2单线内3双线9市场科可以双线指派工单
         /// </summary>
-        public int F_Flag { get; set; }
+        public int? F_Flag { get; set; }
 
         #endregion Model
 

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrderItem_New.cs

@@ -180,7 +180,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 1单线外2单线内3双线9自动流转市场管理科可以双线指派的工单
         /// </summary>
-        public int F_Flag { get; set; }
+        public int? F_Flag { get; set; }
         #endregion Model
 
     }

codegit/ConsoleApp1/App.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+  <appSettings>
+    <add key="smsurl" value="http://192.168.8.9:1005/"/>
+   </appSettings>
+</configuration>

codegit/ConsoleApp1/Program.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Timers;
+using System.Configuration;
+
+namespace Task
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            System.Timers.Timer aTimer = new System.Timers.Timer();
+            aTimer.Elapsed += new ElapsedEventHandler(TimeEvent);
+            // 设置引发时间的时间间隔 此处设置为１秒（１０００毫秒）
+            aTimer.Interval = 2000;
+            aTimer.Enabled = true;
+            Console.WriteLine("按回车键结束程序");
+            Console.WriteLine(" 等待程序的执行．．．．．．");
+            Console.ReadKey();
+        }
+
+        private static void TimeEvent(object source, ElapsedEventArgs e)
+        {
+            Console.WriteLine("进入定时监控程序......");
+            // 得到 hour minute second   如果等于某个值就开始执行某个程序。
+            DateTime date1 = e.SignalTime;
+            int intHour = e.SignalTime.Hour;
+            int intMinute = e.SignalTime.Minute;
+            int intSecond = e.SignalTime.Second;
+            //Console.WriteLine(intHour);
+            //Console.WriteLine(intMinute);
+            //Console.WriteLine(intSecond);
+            // 定制时间； 比如 在10：30 ：00 的时候执行某个函数
+            int iHour = 9;
+            int iMinute = 53;
+            int iSecond = 01;
+            // 设置 多少秒的时候开始执行
+            if (intSecond == iSecond)
+            {
+                Console.WriteLine("每秒钟的开始执行一次！");
+            }
+            // 设置 每个小时的３０分钟开始执行
+            if (intMinute == iMinute && intSecond == iSecond)
+            {
+                Console.WriteLine("每个小时的３０分钟开始执行一次！");
+            }
+
+            // 设置 每天的１０：３０：００开始执行程序
+            //if (intHour == iHour && intMinute == iMinute && intSecond == iSecond)
+            //{
+            //}
+
+            using (var client = new WebClient())
+            {
+
+                client.Encoding = Encoding.UTF8;
+                try
+                {
+                    // 读取配置文件进行所有的连接初始化操作
+                   //var Configs = AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "\\FlightChangeAutomation.config"; ////（配置文件名字）
+                   // string url = ConfigurationManager.AppSettings[""];
+                    string serviceAddress = "http://192.168.8.9:1005/WorkOrderNew/SmsOverTimeMs";
+                    //var data = client.DownloadString(serviceAddress);
+                }
+                catch
+                {
+                }
+                          
+
+            }
+
+
+        }
+    }
+}

codegit/ConsoleApp1/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("ConsoleApp1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ConsoleApp1")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("305fe8dd-4b18-401a-b242-1793d562e451")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
+// 方法是按如下所示使用“*”: :
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

codegit/ConsoleApp1/Task.csproj

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{305FE8DD-4B18-401A-B242-1793D562E451}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ConsoleApp1</RootNamespace>
+    <AssemblyName>ConsoleApp1</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

codegit/XinXiangXLXCallCenter.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1525
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CallCenterApi", "CallCenterApi", "{2E2CE78D-00E7-45A0-AED8-2FB60B3E8F06}"
 EndProject
@@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CallCenterAPI.WechatSDK", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CallCenter.QuartzService", "CallCenterCommon\CallCenter.QuartzService\CallCenter.QuartzService.csproj", "{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Task", "ConsoleApp1\Task.csproj", "{305FE8DD-4B18-401A-B242-1793D562E451}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,6 +75,10 @@ Global
 		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{305FE8DD-4B18-401A-B242-1793D562E451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{305FE8DD-4B18-401A-B242-1793D562E451}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{305FE8DD-4B18-401A-B242-1793D562E451}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{305FE8DD-4B18-401A-B242-1793D562E451}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -89,4 +95,7 @@ Global
 		{C8841B5E-5072-4B5E-B656-6E06C95A6B47} = {2E2CE78D-00E7-45A0-AED8-2FB60B3E8F06}
 		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD} = {0AA6CF16-D74D-4FD4-A921-F9A4D8E74E59}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D8B8293E-B198-4124-82AE-BCB665BAA089}
+	EndGlobalSection
 EndGlobal