二级

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -4020,7 +4020,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             btns.Add(ButtonGroup.auditdeal());
                         }
                         btns.Add(ButtonGroup.feedback());//
-                        btns.Add(ButtonGroup.redo());//
+                       // btns.Add(ButtonGroup.redo());//
                         btns.Add(ButtonGroup.query());
                     }
                     else
@@ -8886,10 +8886,31 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     + "from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
                     string yssql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
                                     + "from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
-                    string blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
-                                    + "from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
-                    string ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
-                                    + "from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                    //  string blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
+                    //  + "from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                    //string ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
+                    //   + "from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                    string blsql = "", ejblsql = "";
+                    if (User.F_RoleCode == "WLDW")
+                    {
+                        blsql = "select TOP 1 *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime desc";
+                        ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime desc";
+
+                    }
+                    else if (User.F_RoleCode == "EJWLDW")
+                    {
+                        blsql = "select TOP 1 *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime desc";
+                        ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_CreateDeptId='" + User.F_DeptId + "' and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime desc";
+
+                    }
+                    else
+                    {
+                        blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                        ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+
+                    }
+
+
                     string hfsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
                                     + "from T_Bus_VisitResult WITH(NOLOCK) where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime ";
                     string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
@@ -9734,8 +9755,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //var dt = DbHelperSQL.Query(sql).Tables[0];
 
                 string sql = "select top 1 * from T_Bus_AssignedInfo_Next WITH(NOLOCK) where F_WorkOrderId='" + strworkorderid + "' and F_IsDelete = 0 order by F_CreateTime desc";
-                string sql1 = "select * from T_Bus_Feedback_Next WITH(NOLOCK) where  F_WorkOrderId='" + strworkorderid + "' and F_IsDelete = 0 ";
+               string sql1 = "select * from T_Bus_Feedback_Next WITH(NOLOCK) where  F_WorkOrderId='" + strworkorderid + "' and F_IsDelete = 0 ";
+             
+                 if (User.F_RoleCode == "EJWLDW")
+                {
+                    sql = "select top 1 * from T_Bus_AssignedInfo_Next WITH(NOLOCK) where F_WorkOrderId='" + strworkorderid + "'and F_MainDeptId='"+User .F_DeptId +"'   and F_IsDelete = 0 order by F_CreateTime desc";
 
+                }
                 var bldt = DbHelperSQL.Query(sql1).Tables[0];
                 var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
                 if (configfj != null)
@@ -9932,17 +9958,31 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 string result = RequestString.GetFormString("result");
                 string flies = RequestString.GetFormString("flies");
-                var modelT_Bus_Feedback_Nexts = new BLL.T_Bus_Feedback_Next()
-                    .GetModelList("F_WorkOrderId='" + workorderid + "' and F_IsDelete = 0 order by F_CreateTime desc");
-                if (modelT_Bus_Feedback_Nexts != null && modelT_Bus_WorkOrder != null && modelT_Bus_Feedback_Nexts.Count > 0)
-                {
-                    string message = modelT_Bus_Feedback_Nexts[0].F_Result;
-                    modelT_Bus_Feedback_Nexts[0].F_Result = result;//反馈内容
-                    modelT_Bus_Feedback_Nexts[0].F_File = flies;
-                    bool n = new BLL.T_Bus_Feedback_Next().Update(modelT_Bus_Feedback_Nexts[0]);
+                int  feedbackid = RequestString.GetInt ("feedbackid",0);
+                var modelT_Bus_Feedback_Nexts = new Model.T_Bus_Feedback_Next();
+                if (feedbackid>0)
+                {
+                    modelT_Bus_Feedback_Nexts = new BLL.T_Bus_Feedback_Next().GetModel(feedbackid);
+                }
+                else
+                {
+                 var  modelT_Bus_Feedback= new BLL.T_Bus_Feedback_Next()
+                  .GetModelList("F_WorkOrderId='" + workorderid + "' and F_IsDelete = 0 order by F_CreateTime desc");
+                    if (modelT_Bus_Feedback!=null&& modelT_Bus_Feedback.Count >0)
+                    {
+                        modelT_Bus_Feedback_Nexts = modelT_Bus_Feedback[0];
+                    }
+                }
+               
+                if ( modelT_Bus_WorkOrder != null)
+                {
+                    string message = modelT_Bus_Feedback_Nexts.F_Result;
+                    modelT_Bus_Feedback_Nexts.F_Result = result;//反馈内容
+                    modelT_Bus_Feedback_Nexts.F_File = flies;
+                    bool n = new BLL.T_Bus_Feedback_Next().Update(modelT_Bus_Feedback_Nexts);
                     Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
                     oper.F_WorkOrderId = workorderid;
-                    oper.F_AssignedId = modelT_Bus_Feedback_Nexts[0].F_Id;
+                    oper.F_AssignedId = modelT_Bus_Feedback_Nexts.F_Id;
                     oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
 
                     string userinfo = User.depname + "(" + User.F_UserCode + ")";
@@ -13259,6 +13299,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
                         modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
                         modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
+                        modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
                         modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
                         #endregion
 
@@ -13354,7 +13395,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
                     modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
                     modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
-
+                    modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
                     modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
                     #endregion
 
@@ -13483,6 +13524,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     modelT_Bus_AssignedInfo_Next.F_IsDelete = 0;
                                     modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
                                     modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
+                                    modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
                                     modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
                                     modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
                                     #endregion
@@ -13567,6 +13609,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
                                         modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
                                         modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
+                                        modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
                                         modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
                                         #endregion
 
@@ -14306,6 +14349,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new BLL.T_Bus_Feedback().GetModel(rebackid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
                 Model.T_Bus_AssignedInfo_Next modelAssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
+
+
+
                 Model.T_Bus_RemindRecord modelT_Bus_RemindRecord = new BLL.T_Bus_RemindRecord().GetNewModelByWorkOrderID(workorderid);
 
 
@@ -14368,6 +14414,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 if (modelAssignedInfo_Next != null)
                                 {
                                     modelAssignedInfo_Next.F_State = 2;
+                                    modelAssignedInfo_Next.F_IsNotice = 2;
                                     new BLL.T_Bus_AssignedInfo_Next().Update(modelAssignedInfo_Next);
                                 }
 
@@ -16410,22 +16457,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
-                Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
 
-                if (modelT_Bus_WorkOrder != null && modelT_Bus_AssignedInfo_Next != null && modelT_Bus_AssignedInfo.F_MainDeptId == User.F_DeptId)
+
+               // Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
+
+                var Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetModelList("F_WorkOrderId='" + workorderid + "'" +
+                   " and F_IsDelete=0 and F_State=1  " +
+                   "and F_IsSure in (0,1) and (F_IsNotice is null or F_IsNotice =0)   order by F_Id desc ");
+
+
+                if (modelT_Bus_WorkOrder != null && Bus_AssignedInfo_Next != null&& Bus_AssignedInfo_Next.Count >0 && modelT_Bus_AssignedInfo.F_MainDeptId == User.F_DeptId)
                 {
 
                     using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                     {
                         #region 保存撤单信息
-                        modelT_Bus_AssignedInfo_Next.F_IsDelete = 1;
-                        modelT_Bus_AssignedInfo_Next.F_DeleteUser = User.F_UserCode;
-                        modelT_Bus_AssignedInfo_Next.F_DeleteTime = DateTime.Now;
-                        new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
+                        //modelT_Bus_AssignedInfo_Next.F_IsDelete = 1;
+                        //modelT_Bus_AssignedInfo_Next.F_DeleteUser = User.F_UserCode;
+                        //modelT_Bus_AssignedInfo_Next.F_DeleteTime = DateTime.Now;
+                        //new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
+                        
+                        foreach (var cg in Bus_AssignedInfo_Next)
+                        {
+                            cg.F_IsDelete  = 1;
+                            cg.F_DeleteUser = User.F_UserCode;
+                            cg.F_DeleteTime = DateTime.Now;
+
+                            new BLL.T_Bus_AssignedInfo_Next().Update(cg);
+                        }
+
                         #endregion
 
                         #region 删除处理信息
-                        var cglist = new BLL.T_Bus_Feedback_Next().GetModelList(" F_IsDelete=0 and F_AssignedId='" + modelT_Bus_AssignedInfo_Next.F_Id + "'");
+                        var cglist = new BLL.T_Bus_Feedback_Next().GetModelList(" F_IsDelete=0 and F_AssignedId in(" +
+                            string .Join (",", Bus_AssignedInfo_Next.Select (x=>x.F_Id )) + ")");
 
                         foreach (var cg in cglist)
                         {
@@ -16451,7 +16516,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         #region 插入操作记录
                         Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
                         oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
-                        oper.F_AssignedId = modelT_Bus_AssignedInfo_Next.F_Id;
+                        //oper.F_AssignedId = modelT_Bus_AssignedInfo_Next.F_Id;
                         oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
 
                         string userinfo = User.depname + "(" + User.F_UserCode + ")";
@@ -16615,6 +16680,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 3;//签收
                             modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
                             modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
+                            modelT_Bus_AssignedInfo_Next.F_IsNotice = 2;
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
                             #endregion
 
@@ -16712,6 +16778,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             #region 保存签收信息
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
+                            modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
                             //  modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
                             //  modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
@@ -16794,6 +16861,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             #region 
                             modelT_Bus_AssignedInfo_Next.F_FeedbackTime = null;
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
+                            modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
                             //  modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
                             //  modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
@@ -16989,9 +17057,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                     #region 保存派单信息
                                     modelT_Bus_AssignedInfo_Next.F_FeedbackTime = DateTime.Now;
+                                modelT_Bus_AssignedInfo_Next.F_IsNotice = 1;
                                     if (modelT_Bus_AssignedInfo_Next.F_LimitTime < DateTime.Now)
                                     {
                                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 1;
+                                       
                                     }
 
                                     new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
@@ -17109,6 +17179,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                         {
+
                             modelT_Bus_Feedback_Next.F_IsAudit = state;
                             modelT_Bus_Feedback_Next.F_AuditUser = User.F_UserCode;
                             modelT_Bus_Feedback_Next.F_AuditTime = DateTime.Now;
@@ -17129,12 +17200,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 strmsg = "同意";
 
                                 #region 插入反馈记录
+                                Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next1 = new BLL.T_Bus_AssignedInfo_Next().GetModel(modelT_Bus_Feedback_Next.F_AssignedId.Value);
+                                modelT_Bus_AssignedInfo_Next1.F_IsNotice  = 2;
+                                new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next1);
+
                                 Model.T_Bus_Feedback modelT_Bus_Feedback = new Model.T_Bus_Feedback();
                                 modelT_Bus_Feedback.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单编号
                                 modelT_Bus_Feedback.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;//交办id
                                 modelT_Bus_Feedback.F_DealUser = modelT_Bus_Feedback_Next.F_DealUser;
                                 modelT_Bus_Feedback.F_Result = message;//反馈内容
                                 #region 20200114新增字段 zhengbingbing
+
+
+                                modelT_Bus_Feedback.F_AuditPost = modelT_Bus_Feedback_Next.F_AuditPost;
+                                modelT_Bus_Feedback.F_AuditReason  = modelT_Bus_Feedback_Next.F_AuditReason;
+                                modelT_Bus_Feedback.F_AuditUser  = modelT_Bus_Feedback_Next.F_AuditUser;
+                                modelT_Bus_Feedback.F_AuditContact = modelT_Bus_Feedback_Next.F_AuditContact;
+
                                 modelT_Bus_Feedback.F_IsProResult = modelT_Bus_Feedback_Next.F_IsProResult;//是否有处理结果:0默认，1是，2否
                                 modelT_Bus_Feedback.F_ProSituation = modelT_Bus_Feedback_Next.F_ProSituation;//处理情况/方案/进程
                                 modelT_Bus_Feedback.F_IsProtect = modelT_Bus_Feedback_Next.F_IsProtect;//是否保密(0:否1:是)
@@ -17181,16 +17263,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     // modelT_Bus_WorkOrder.F_ToBereply = 1;
                                     // modelT_Bus_WorkOrder.F_IsProResult = 1;
                                 }
-                                var modeBus_Feedback_Next = new BLL.T_Bus_Feedback_Next()
-                                 .GetModelList(" F_WorkOrderId='"+ modelT_Bus_WorkOrder .F_WorkOrderId + "' and F_Type=1 and F_IsDelete=0" +
+                                var modeBus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next ()
+                                 .GetModelList(" F_WorkOrderId='"+ modelT_Bus_WorkOrder .F_WorkOrderId + "'  and F_IsDelete=0 " +
                                  "  ");
-                                if (modeBus_Feedback_Next != null && modeBus_Feedback_Next.Count > 0)
+                                if (modeBus_AssignedInfo_Next != null && modeBus_AssignedInfo_Next.Count > 0)
                                 {
-                                    if (modeBus_Feedback_Next.Count >1)
+                                    if (modeBus_AssignedInfo_Next.Count >1)
                                     {
-                                        if (modeBus_Feedback_Next.Where(x => x.F_IsAudit == 0).Count() > 0)
+                                        if (modeBus_AssignedInfo_Next.Where(x => x.F_IsNotice  == 1).Count() > 0)
+                                        {
                                             modelT_Bus_AssignedInfo.F_FeedbackTime = null;
-                                        else
+                                        }
+                                        else if (modeBus_AssignedInfo_Next.Where(x => x.F_IsNotice == 0).Count() > 0)
+                                        {
+                                            modelT_Bus_AssignedInfo.F_IsNext = 2;
+                                            modelT_Bus_AssignedInfo.F_FeedbackTime = null;
+                                        }
+                                        else 
                                         {
                                             keyValuePairs.Add("F_WorkState", (int)EnumWorkState.dealed);
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.dealed;//待回访
@@ -17270,11 +17359,30 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 strmsg = "拒绝";
                                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next1 = new BLL.T_Bus_AssignedInfo_Next().GetModel(modelT_Bus_Feedback_Next.F_AssignedId.Value);
                                 modelT_Bus_AssignedInfo_Next1.F_FeedbackTime = null;
+                                modelT_Bus_AssignedInfo_Next1.F_IsNotice = 0;
                                 new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next1);
 
-                                modelT_Bus_AssignedInfo.F_IsNext = 2;
-                                assignBLL.Update(modelT_Bus_AssignedInfo);
 
+                                var modeBus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next()
+                                .GetModelList(" F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "'  and F_IsDelete=0 " +
+                                "  ");
+                                if (modeBus_AssignedInfo_Next != null && modeBus_AssignedInfo_Next.Count > 0)
+                                {
+                                    if (modeBus_AssignedInfo_Next.Count > 1)
+                                    {
+                                        if (modeBus_AssignedInfo_Next.Where(x => x.F_IsNotice == 1).Count() > 0)
+                                        {
+                                            modelT_Bus_AssignedInfo.F_FeedbackTime = null;
+                                            assignBLL.Update(modelT_Bus_AssignedInfo);
+                                        }
+                                        else if (modeBus_AssignedInfo_Next.Where(x => x.F_IsNotice == 0).Count() > 0)
+                                        {
+                                            modelT_Bus_AssignedInfo.F_IsNext = 2;
+                                            modelT_Bus_AssignedInfo.F_FeedbackTime = null;
+                                            assignBLL.Update(modelT_Bus_AssignedInfo);
+                                        }
+                                    }
+                                }
 
                             }
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

@@ -862,22 +862,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 if (modelT_Bus_AssignedInfo.F_IsNext == 1 || modelT_Bus_AssignedInfo.F_IsNext == 2)
                 {
-                    Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
-                    var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId = " + (modelT_Bus_AssignedInfo_Next.F_MainDeptId ?? 0) + " and F_DeleteFlag=0");
-                    if (user != null)
+                    // Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
+                    var modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetModelList("F_State=1 and F_IsDelete=0 and F_IsSure in (0,1) and F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "'  order by F_CreateTime desc");
+                    if (modelT_Bus_AssignedInfo_Next!=null && modelT_Bus_AssignedInfo_Next.Count >0)
                     {
-                        foreach (var iv in user)
+                        var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in(" + string.Join(",", modelT_Bus_AssignedInfo_Next.Select(x => x.F_MainDeptId)) + ") and F_DeleteFlag=0");
+                        if (user != null)
                         {
-
-                          
-                            if (!string.IsNullOrEmpty(iv.F_Mobile))
+                            foreach (var iv in user)
                             {
-                                string count = "您的工单" + workorderid + "收到催办，请及时处理！";
-                                bool n = SMSController.AddSmS(0, count, workorderid, iv.F_Mobile, "2764366");
 
+
+                                if (!string.IsNullOrEmpty(iv.F_Mobile))
+                                {
+                                    string count = "您的工单" + workorderid + "收到催办，请及时处理！";
+                                    bool n = SMSController.AddSmS(0, count, workorderid, iv.F_Mobile, "2764366");
+
+                                }
                             }
                         }
                     }
+                   
 
                 }
                 else