工单流转修改，超期修改

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

             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+          //  sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             // var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
             dt.Columns.Add("反馈类型");
             dt.Columns.Add("新乡");
                 {
                     if (i ==5)
                     {
-                        nsg = "and F_IsOver=" + 1;
+                        nsg = "and F_Type !=3  and F_IsOver=" + 1 ;
                     }
                    else  if (i == 6)
                     {
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+          //  sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             List<marketList> markets = new List<marketList>();
 
 
                 {
                     if (i == 5)
                     {
-                        nsg = "and F_IsOver=" + 1;
+                        nsg = "and F_Type !=3 and F_IsOver=" + 1;
                     }
                     else if (i == 6)
                     {
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+         //   sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             var ConsultingNeeds = quesBLL.GetList("  F_Type = '" + EnumWOType.ConsultingNeeds.ToString() + "' and F_IsDelete=0 ").Tables[0];
             var Complaint = quesBLL.GetList("  F_Type = '" + EnumWOType.Complaint.ToString() + "' and F_IsDelete=0 " + "and F_Label=3").Tables[0];
             var SpotCheck = quesBLL.GetList("  F_Type = '" + EnumWOType.SpotCheck.ToString() + "' and F_IsDelete=0 ").Tables[0];
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+           // sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             var ConsultingNeeds = quesBLL.GetList("  F_Type = '" + EnumWOType.ConsultingNeeds.ToString() + "' and F_IsDelete=0 ").Tables[0];
             var Complaint = quesBLL.GetList("  F_Type = '" + EnumWOType.Complaint.ToString() + "' and F_IsDelete=0 " + "and F_Label=3").Tables[0];
             var SpotCheck = quesBLL.GetList("  F_Type = '" + EnumWOType.SpotCheck.ToString() + "' and F_IsDelete=0 ").Tables[0];
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+         //   sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             var ConsultingNeeds = quesBLL.GetList("  F_Type = '" + EnumWOType.ConsultingNeeds.ToString() + "' and F_IsDelete=0 ").Tables[0];
             var Complaint = quesBLL.GetList("  F_Type = '" + EnumWOType.Complaint.ToString() + "' and F_IsDelete=0 " + "and F_Label=3").Tables[0];
             var SpotCheck = quesBLL.GetList("  F_Type = '" + EnumWOType.SpotCheck.ToString() + "' and F_IsDelete=0 ").Tables[0];
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+          //  sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             var ConsultingNeeds = quesBLL.GetList("  F_Type = '" + EnumWOType.ConsultingNeeds.ToString() + "' and F_IsDelete=0 ").Tables[0];
             var Complaint = quesBLL.GetList("  F_Type = '" + EnumWOType.Complaint.ToString() + "' and F_IsDelete=0 " + "and F_Label=3").Tables[0];
             var SpotCheck = quesBLL.GetList("  F_Type = '" + EnumWOType.SpotCheck.ToString() + "' and F_IsDelete=0 ").Tables[0];
                     if (it.F_IsUsed == 0 && it.F_OptType == 1)
                     {
                         pending++;
-                        var Overworkorder = woBLL.GetModelList(sql +"and F_IsOver=1 and F_ID=" + it.F_WoID);
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1  and F_Type !=3 and F_ID=" + it.F_WoID);
                         Overdue++;
                     }
                     if (it.F_OptType == 2 && it.F_IsUsed == 0)
                     {
                         beprocessed++;
-                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_ID=" + it.F_WoID);
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_Type !=3 and F_ID=" + it.F_WoID);
                         Overdue++;
                     }
                 }
                     if (it .F_IsUsed ==0&&it .F_OptType ==1)
                     {
                         pending++;
-                        var Overworkorder = woBLL.GetModelList(sql +"and F_IsOver=1 and F_ID="+ it.F_WoID );
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_Type !=3 and F_ID=" + it.F_WoID );
                         Overdue++;
                     }
                     if (it .F_OptType ==2&& it.F_IsUsed == 0)
                     {
                         beprocessed++;
-                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_ID=" + it.F_WoID);
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_Type !=3 and F_ID=" + it.F_WoID);
                         Overdue++;
                     }
                 }
                     bevisit++;
                 if (it.F_State == 11)
                     visit++;
-                if (it.F_IsOver  == 1)
+                if (it.F_IsOver  == 1&&it .F_Type !="3")
                     Overdue++;
                 if (it.F_VisitResult == "满意" || it.F_VisitResult == "非常满意")
                     satisfied++;
                     bevisit++;
                 if (it.F_State == 11)
                     visit++;
-                if (it.F_IsOver == 1)
+                if (it.F_IsOver == 1&&it .F_Type !="3")
                     Overdue++;
                 if (it.F_VisitResult == "满意" || it.F_VisitResult == "非常满意")
                     satisfied++;
                             total++;
                         break;
                     case 2:
-                        if (it.F_IsOver == 1)
+                        if (it.F_IsOver == 1&&it .F_Type !="3")
                             total++;
                         break;
                     case 3:
             {
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+        //    sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             sql += " order by F_CreateOn desc";
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
             #endregion
                 }
                 drNew["销售基地"] = it.F_SalesBase;//销售基地:新乡、新疆、九江、东北、其他(其它手动输入别的点选)
                 drNew["创建时间"] = it.F_CreateOn.ToString();
-                if (TimeToOver(it.F_ID, it.F_limit) < 0)
-                    drNew["超时时限"] = Math.Abs(TimeToOver(it.F_ID,it .F_limit )).ToString();
+                if (it .F_Type !="3")
+                {
+                    if (TimeToOver(it.F_ID, it.F_limit) < 0)
+                        drNew["超时时限"] = Math.Abs(TimeToOver(it.F_ID, it.F_limit)).ToString();
+                    else
+                        drNew["超时时限"] = "0";
+                }
                 else
                     drNew["超时时限"] = "0";
                 if (it.F_State == 11 && it.F_IsVisit == 1)
             {
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+          //  sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             #endregion
             int recordCount = 0;
             if (!string.IsNullOrWhiteSpace(sql))
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
             sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化肥产品质量问题反馈','化肥服务质量问题反馈','化肥农作物长势问题反馈'") + "') "; ;
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+         //   sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
            sql += " order by F_CreateOn desc";
             #endregion
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
             sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化肥产品质量问题反馈','化肥服务质量问题反馈','化肥农作物长势问题反馈'") + "') "; ;
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+         //   sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             #endregion
             int recordCount = 0;
             if (!string.IsNullOrWhiteSpace(sql))
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
 
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+         //   sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             sql += " order by F_CreateOn desc";
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
             #endregion
             {
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+        //    sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             #endregion
             int recordCount = 0;
             if (!string.IsNullOrWhiteSpace(sql))
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
             sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化工产品质量问题反馈','化工服务质量问题反馈'") + "') "; ;
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+           // sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             sql += " order by F_CreateOn desc";
             var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
             #endregion
                 sql += $"  and T_Wo_WorkOrder.F_CustomerID in ( " + GetCustomerID(channel) + ") "; ;
             }
             sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'化工产品质量问题反馈','化工服务质量问题反馈'") + "') "; ;
-            sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+            //sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
             #endregion
             int recordCount = 0;
             if (!string.IsNullOrWhiteSpace(sql))
             model.overdue = new List<Template>();
             string sqloverdue = "";
             sqloverdue += "";
-            var modlelist = workOrder.GetModelList(sql + sqloverdue + "and F_IsOver=1" + time);
+            var modlelist = workOrder.GetModelList(sql + sqloverdue + "and F_IsOver=1 and F_Type !=3 " + time);
             Template templatee = new Template();
             templatee.name = "合计";
             templatee.number =0;
         private bool Refresh()
         {
             int type = 0;
-            var modlelist = workOrder.GetModelList(" F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+            var modlelist = workOrder.GetModelList(" F_IsDelete=0 and F_Type !=3" + "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)
             {
                             //    double t = id.TotalHours;
                                
                             }
-                            if (it.F_IsOver == 1)
+                            if (it.F_IsOver == 1&&it .F_Type !="3")
                             {
                                 worker worker = new worker();
                                 worker.F_WorkOrderCode = it.F_WorkOrderCode;
                                         efficiency++;
                                    
                                     }
-                                    if (it.F_IsOver == 1)
+                                    if (it.F_IsOver == 1&&it .F_Type !="3")
                                     {
                                         worker worker = new worker();
                                         worker.F_WorkOrderCode = it.F_WorkOrderCode;
                     }
                     model.SalesBase = model1[i].F_SalesBase;//销售基地:新乡、新疆、九江、东北、其他(其它手动输入别的点选)
                     model.CreatOn = model1[i].F_CreateOn .ToString ();
-                    if (TimeToOver(model1[i].F_ID, model1[i].F_limit) <0)
-                    model.Overtime = Math .Abs(TimeToOver(model1[i].F_ID, model1[i].F_limit)).ToString ();
+                    if (model1[i].F_Type !="3")
+                    {
+                        if (TimeToOver(model1[i].F_ID, model1[i].F_limit) < 0)
+                            model.Overtime = Math.Abs(TimeToOver(model1[i].F_ID, model1[i].F_limit)).ToString();
+                        else
+                            model.Overtime = "0";
+                    }
                     else
                         model.Overtime = "0";
                     if (model1[i].F_State == 11 && model1[i].F_IsVisit == 1)

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

                 //        nextda = ua.F_DeptId;
                 //        opt = "流转" + deptname;
                 //}
-                
+                else if (ua.F_DeptId == 17 || ua.F_DeptId == 18 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                {
+                    nextda = ua.F_DeptId;
+                    opt = "流转" + deptname;
+                }
+
             }
             if (istrue)
             {
                         }
 
                     }
-                    if (TimeToOver(model1[i].F_ID, model1[i].F_limit) < 0)
+                    if (model1[i].F_Type !="3")
                     {
-                        model.F_IsOver = 1;
-                    }
-                    else
-                    {
-                        model.F_IsOver = model1[i].F_IsOver;
+                        if (TimeToOver(model1[i].F_ID, model1[i].F_limit) < 0)
+                        {
+                            model.F_IsOver = 1;
+                        }
+                        else
+                        {
+                            model.F_IsOver = model1[i].F_IsOver;
+                        }
                     }
                     if (ua != null)
                     {
                                     //    nextda = ua.F_DeptId;
                                     //    opt = "流转"+ deptment;
                                     //}
+                                    else if (ua.F_DeptId == 17 || ua.F_DeptId == 18 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                                    {
+                                        nextda = ua.F_DeptId;
+                                        opt = "流转" + deptment ;
+                                    }
                                 }
                                 if (nextda != 0)
                                 {
                     return Error("查询失败");
                 }
                 string sql = $" and F_IsDelete=0";
+                sql += "and F_Type !=3";
                 DataTable dt = new DataTable();
                 #region 筛选条件
                 if (type > 0 && type < 5)//工单类型
                     else
                         sql += $" and F_Source='" + source + "'";
                 }
+
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
         private bool Refresh()
         {
             int type = 0;
-            var modlelist = woBLL.GetModelList(" F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+            var modlelist = woBLL.GetModelList("  F_Type != 3  and 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)
             {
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期工单，延期说明：" + cont;
             //获取上一级处理人员
             var touser = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by order  F_ID  desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by  F_ID  desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.Delay, optbut, touser, 0, nowUser, limit + model.F_limit, sms, "", 1);
                             //{
                             //    nextda = ua.F_DeptId;
                             //    opt = "流转" + deptname1;
-                               
+
                             //}
+                            else if (ua.F_DeptId == 17 || ua.F_DeptId == 18 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                            {
+                                nextda = ua.F_DeptId;
+                                opt = "流转" + deptname1 ;
+                            }
                         }
                         if (nextda != 0)
                         {

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

                     nextda = 88;
                     opt = "流转销售部";
                 }
+                else if (ua.F_DeptId==17|| ua.F_DeptId == 18 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                {
+                      nextda = ua.F_DeptId;
+                      opt = "流转"+ deptname;
+                }
                 //else
                 //{
                 //    nextda = ua.F_DeptId;
                 //    opt = "流转"+ deptname;
                 //}
+
             }
             if (istrue)
             {
                     return Error("查询失败");
                 }
                 string sql = $" and F_IsDelete=0";
+                sql += "and F_Type !=3";
                 DataTable dt = new DataTable();
                 #region 筛选条件
                 if (type > 0 && type < 5)//工单类型
         private bool  Refresh()
         {
             int type = 0;
-            var modlelist = workOrder .GetModelList(" F_IsDelete=0"+ "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + 
+            var modlelist = workOrder .GetModelList(" F_Type != 3  and 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)
             {
                                 //    nextda = ua.F_DeptId;
                                 //    opt = "流转"+ deptneme;
                                 //}
+                                else if (ua.F_DeptId == 17 || ua.F_DeptId == 18 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                                {
+                                    nextda = ua.F_DeptId;
+                                    opt = "流转" + deptname;
+                                }
                             }
                             if (nextda != 0)
                             {
                                     //    nextda = ua.F_DeptId;
                                     //    opt = "流转" + deptname1;
                                     //}
+                                    else if (ua.F_DeptId == 17 || ua.F_DeptId == 18 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                                    {
+                                        nextda = ua.F_DeptId;
+                                        opt = "流转" + deptname1 ;
+                                    }
 
                                 }
                                 if (nextda != 0)
                         }
 
                     }
-
-                    if (TimeToOver(model1[i].F_ID,model1 [i ].F_limit )<0)
+                    if (model1[i].F_Type !="3")
                     {
-                        model.F_IsOver =1;
-                    }
-                    else
-                    {
-                        model.F_IsOver = model1[i].F_IsOver;
+                        if (TimeToOver(model1[i].F_ID, model1[i].F_limit) < 0)
+                        {
+                            model.F_IsOver = 1;
+                        }
+                        else
+                        {
+                            model.F_IsOver = model1[i].F_IsOver;
+                        }
                     }
+                   
                     if (ua !=null )
                     {
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);