duhongyu лет назад: 3
Родитель
Сommit
0d7cbbd7d1

+ 140 - 32
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

4020
                             btns.Add(ButtonGroup.auditdeal());
4020
                             btns.Add(ButtonGroup.auditdeal());
4021
                         }
4021
                         }
4022
                         btns.Add(ButtonGroup.feedback());//
4022
                         btns.Add(ButtonGroup.feedback());//
4023
-                        btns.Add(ButtonGroup.redo());//
4023
+                       // btns.Add(ButtonGroup.redo());//
4024
                         btns.Add(ButtonGroup.query());
4024
                         btns.Add(ButtonGroup.query());
4025
                     }
4025
                     }
4026
                     else
4026
                     else
8886
                                     + "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";
8886
                                     + "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";
8887
                     string yssql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
8887
                     string yssql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
8888
                                     + "from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
8888
                                     + "from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
8889
-                    string blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
8890
-                                    + "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";
8891
-                    string ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
8892
-                                    + "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";
8889
+                    //  string blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
8890
+                    //  + "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";
8891
+                    //string ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
8892
+                    //   + "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";
8893
+                    string blsql = "", ejblsql = "";
8894
+                    if (User.F_RoleCode == "WLDW")
8895
+                    {
8896
+                        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";
8897
+                        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";
8898
+
8899
+                    }
8900
+                    else if (User.F_RoleCode == "EJWLDW")
8901
+                    {
8902
+                        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";
8903
+                        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";
8904
+
8905
+                    }
8906
+                    else
8907
+                    {
8908
+                        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";
8909
+                        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";
8910
+
8911
+                    }
8912
+
8913
+
8893
                     string hfsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
8914
                     string hfsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
8894
                                     + "from T_Bus_VisitResult WITH(NOLOCK) where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime ";
8915
                                     + "from T_Bus_VisitResult WITH(NOLOCK) where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime ";
8895
                     string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
8916
                     string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
9734
                 //var dt = DbHelperSQL.Query(sql).Tables[0];
9755
                 //var dt = DbHelperSQL.Query(sql).Tables[0];
9735
 
9756
 
9736
                 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";
9757
                 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";
9737
-                string sql1 = "select * from T_Bus_Feedback_Next WITH(NOLOCK) where  F_WorkOrderId='" + strworkorderid + "' and F_IsDelete = 0 ";
9758
+               string sql1 = "select * from T_Bus_Feedback_Next WITH(NOLOCK) where  F_WorkOrderId='" + strworkorderid + "' and F_IsDelete = 0 ";
9759
+             
9760
+                 if (User.F_RoleCode == "EJWLDW")
9761
+                {
9762
+                    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";
9738
 
9763
 
9764
+                }
9739
                 var bldt = DbHelperSQL.Query(sql1).Tables[0];
9765
                 var bldt = DbHelperSQL.Query(sql1).Tables[0];
9740
                 var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
9766
                 var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
9741
                 if (configfj != null)
9767
                 if (configfj != null)
9932
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
9958
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
9933
                 string result = RequestString.GetFormString("result");
9959
                 string result = RequestString.GetFormString("result");
9934
                 string flies = RequestString.GetFormString("flies");
9960
                 string flies = RequestString.GetFormString("flies");
9935
-                var modelT_Bus_Feedback_Nexts = new BLL.T_Bus_Feedback_Next()
9936
-                    .GetModelList("F_WorkOrderId='" + workorderid + "' and F_IsDelete = 0 order by F_CreateTime desc");
9937
-                if (modelT_Bus_Feedback_Nexts != null && modelT_Bus_WorkOrder != null && modelT_Bus_Feedback_Nexts.Count > 0)
9938
-                {
9939
-                    string message = modelT_Bus_Feedback_Nexts[0].F_Result;
9940
-                    modelT_Bus_Feedback_Nexts[0].F_Result = result;//反馈内容
9941
-                    modelT_Bus_Feedback_Nexts[0].F_File = flies;
9942
-                    bool n = new BLL.T_Bus_Feedback_Next().Update(modelT_Bus_Feedback_Nexts[0]);
9961
+                int  feedbackid = RequestString.GetInt ("feedbackid",0);
9962
+                var modelT_Bus_Feedback_Nexts = new Model.T_Bus_Feedback_Next();
9963
+                if (feedbackid>0)
9964
+                {
9965
+                    modelT_Bus_Feedback_Nexts = new BLL.T_Bus_Feedback_Next().GetModel(feedbackid);
9966
+                }
9967
+                else
9968
+                {
9969
+                 var  modelT_Bus_Feedback= new BLL.T_Bus_Feedback_Next()
9970
+                  .GetModelList("F_WorkOrderId='" + workorderid + "' and F_IsDelete = 0 order by F_CreateTime desc");
9971
+                    if (modelT_Bus_Feedback!=null&& modelT_Bus_Feedback.Count >0)
9972
+                    {
9973
+                        modelT_Bus_Feedback_Nexts = modelT_Bus_Feedback[0];
9974
+                    }
9975
+                }
9976
+               
9977
+                if ( modelT_Bus_WorkOrder != null)
9978
+                {
9979
+                    string message = modelT_Bus_Feedback_Nexts.F_Result;
9980
+                    modelT_Bus_Feedback_Nexts.F_Result = result;//反馈内容
9981
+                    modelT_Bus_Feedback_Nexts.F_File = flies;
9982
+                    bool n = new BLL.T_Bus_Feedback_Next().Update(modelT_Bus_Feedback_Nexts);
9943
                     Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
9983
                     Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
9944
                     oper.F_WorkOrderId = workorderid;
9984
                     oper.F_WorkOrderId = workorderid;
9945
-                    oper.F_AssignedId = modelT_Bus_Feedback_Nexts[0].F_Id;
9985
+                    oper.F_AssignedId = modelT_Bus_Feedback_Nexts.F_Id;
9946
                     oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
9986
                     oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
9947
 
9987
 
9948
                     string userinfo = User.depname + "(" + User.F_UserCode + ")";
9988
                     string userinfo = User.depname + "(" + User.F_UserCode + ")";
13259
                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
13299
                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
13260
                         modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
13300
                         modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
13261
                         modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
13301
                         modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
13302
+                        modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
13262
                         modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
13303
                         modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
13263
                         #endregion
13304
                         #endregion
13264
 
13305
 
13354
                     modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
13395
                     modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
13355
                     modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
13396
                     modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
13356
                     modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
13397
                     modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
13357
-
13398
+                    modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
13358
                     modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
13399
                     modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
13359
                     #endregion
13400
                     #endregion
13360
 
13401
 
13483
                                     modelT_Bus_AssignedInfo_Next.F_IsDelete = 0;
13524
                                     modelT_Bus_AssignedInfo_Next.F_IsDelete = 0;
13484
                                     modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
13525
                                     modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
13485
                                     modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
13526
                                     modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
13527
+                                    modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
13486
                                     modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
13528
                                     modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
13487
                                     modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
13529
                                     modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
13488
                                     #endregion
13530
                                     #endregion
13567
                                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
13609
                                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 0;
13568
                                         modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
13610
                                         modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
13569
                                         modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
13611
                                         modelT_Bus_AssignedInfo_Next.F_IsReload = 0;
13612
+                                        modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
13570
                                         modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
13613
                                         modelT_Bus_AssignedInfo_Next.F_Id = new BLL.T_Bus_AssignedInfo_Next().Add(modelT_Bus_AssignedInfo_Next);
13571
                                         #endregion
13614
                                         #endregion
13572
 
13615
 
14306
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new BLL.T_Bus_Feedback().GetModel(rebackid);
14349
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new BLL.T_Bus_Feedback().GetModel(rebackid);
14307
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
14350
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
14308
                 Model.T_Bus_AssignedInfo_Next modelAssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
14351
                 Model.T_Bus_AssignedInfo_Next modelAssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
14352
+
14353
+
14354
+
14309
                 Model.T_Bus_RemindRecord modelT_Bus_RemindRecord = new BLL.T_Bus_RemindRecord().GetNewModelByWorkOrderID(workorderid);
14355
                 Model.T_Bus_RemindRecord modelT_Bus_RemindRecord = new BLL.T_Bus_RemindRecord().GetNewModelByWorkOrderID(workorderid);
14310
 
14356
 
14311
 
14357
 
14368
                                 if (modelAssignedInfo_Next != null)
14414
                                 if (modelAssignedInfo_Next != null)
14369
                                 {
14415
                                 {
14370
                                     modelAssignedInfo_Next.F_State = 2;
14416
                                     modelAssignedInfo_Next.F_State = 2;
14417
+                                    modelAssignedInfo_Next.F_IsNotice = 2;
14371
                                     new BLL.T_Bus_AssignedInfo_Next().Update(modelAssignedInfo_Next);
14418
                                     new BLL.T_Bus_AssignedInfo_Next().Update(modelAssignedInfo_Next);
14372
                                 }
14419
                                 }
14373
 
14420
 
16410
 
16457
 
16411
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
16458
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
16412
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
16459
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
16413
-                Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
16414
 
16460
 
16415
-                if (modelT_Bus_WorkOrder != null && modelT_Bus_AssignedInfo_Next != null && modelT_Bus_AssignedInfo.F_MainDeptId == User.F_DeptId)
16461
+
16462
+               // Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
16463
+
16464
+                var Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetModelList("F_WorkOrderId='" + workorderid + "'" +
16465
+                   " and F_IsDelete=0 and F_State=1  " +
16466
+                   "and F_IsSure in (0,1) and (F_IsNotice is null or F_IsNotice =0)   order by F_Id desc ");
16467
+
16468
+
16469
+                if (modelT_Bus_WorkOrder != null && Bus_AssignedInfo_Next != null&& Bus_AssignedInfo_Next.Count >0 && modelT_Bus_AssignedInfo.F_MainDeptId == User.F_DeptId)
16416
                 {
16470
                 {
16417
 
16471
 
16418
                     using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
16472
                     using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
16419
                     {
16473
                     {
16420
                         #region 保存撤单信息
16474
                         #region 保存撤单信息
16421
-                        modelT_Bus_AssignedInfo_Next.F_IsDelete = 1;
16422
-                        modelT_Bus_AssignedInfo_Next.F_DeleteUser = User.F_UserCode;
16423
-                        modelT_Bus_AssignedInfo_Next.F_DeleteTime = DateTime.Now;
16424
-                        new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
16475
+                        //modelT_Bus_AssignedInfo_Next.F_IsDelete = 1;
16476
+                        //modelT_Bus_AssignedInfo_Next.F_DeleteUser = User.F_UserCode;
16477
+                        //modelT_Bus_AssignedInfo_Next.F_DeleteTime = DateTime.Now;
16478
+                        //new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
16479
+                        
16480
+                        foreach (var cg in Bus_AssignedInfo_Next)
16481
+                        {
16482
+                            cg.F_IsDelete  = 1;
16483
+                            cg.F_DeleteUser = User.F_UserCode;
16484
+                            cg.F_DeleteTime = DateTime.Now;
16485
+
16486
+                            new BLL.T_Bus_AssignedInfo_Next().Update(cg);
16487
+                        }
16488
+
16425
                         #endregion
16489
                         #endregion
16426
 
16490
 
16427
                         #region 删除处理信息
16491
                         #region 删除处理信息
16428
-                        var cglist = new BLL.T_Bus_Feedback_Next().GetModelList(" F_IsDelete=0 and F_AssignedId='" + modelT_Bus_AssignedInfo_Next.F_Id + "'");
16492
+                        var cglist = new BLL.T_Bus_Feedback_Next().GetModelList(" F_IsDelete=0 and F_AssignedId in(" +
16493
+                            string .Join (",", Bus_AssignedInfo_Next.Select (x=>x.F_Id )) + ")");
16429
 
16494
 
16430
                         foreach (var cg in cglist)
16495
                         foreach (var cg in cglist)
16431
                         {
16496
                         {
16451
                         #region 插入操作记录
16516
                         #region 插入操作记录
16452
                         Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
16517
                         Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
16453
                         oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
16518
                         oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
16454
-                        oper.F_AssignedId = modelT_Bus_AssignedInfo_Next.F_Id;
16519
+                        //oper.F_AssignedId = modelT_Bus_AssignedInfo_Next.F_Id;
16455
                         oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
16520
                         oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
16456
 
16521
 
16457
                         string userinfo = User.depname + "(" + User.F_UserCode + ")";
16522
                         string userinfo = User.depname + "(" + User.F_UserCode + ")";
16615
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 3;//签收
16680
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 3;//签收
16616
                             modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
16681
                             modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
16617
                             modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
16682
                             modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
16683
+                            modelT_Bus_AssignedInfo_Next.F_IsNotice = 2;
16618
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
16684
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
16619
                             #endregion
16685
                             #endregion
16620
 
16686
 
16712
                         {
16778
                         {
16713
                             #region 保存签收信息
16779
                             #region 保存签收信息
16714
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
16780
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
16781
+                            modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
16715
                             //  modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
16782
                             //  modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
16716
                             //  modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
16783
                             //  modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
16717
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
16784
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
16794
                             #region 
16861
                             #region 
16795
                             modelT_Bus_AssignedInfo_Next.F_FeedbackTime = null;
16862
                             modelT_Bus_AssignedInfo_Next.F_FeedbackTime = null;
16796
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
16863
                             modelT_Bus_AssignedInfo_Next.F_IsSure = 0;
16864
+                            modelT_Bus_AssignedInfo_Next.F_IsNotice = 0;
16797
                             //  modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
16865
                             //  modelT_Bus_AssignedInfo_Next.F_SureUser = User.F_UserCode;
16798
                             //  modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
16866
                             //  modelT_Bus_AssignedInfo_Next.F_SureTime = DateTime.Now;
16799
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
16867
                             new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
16989
 
17057
 
16990
                                     #region 保存派单信息
17058
                                     #region 保存派单信息
16991
                                     modelT_Bus_AssignedInfo_Next.F_FeedbackTime = DateTime.Now;
17059
                                     modelT_Bus_AssignedInfo_Next.F_FeedbackTime = DateTime.Now;
17060
+                                modelT_Bus_AssignedInfo_Next.F_IsNotice = 1;
16992
                                     if (modelT_Bus_AssignedInfo_Next.F_LimitTime < DateTime.Now)
17061
                                     if (modelT_Bus_AssignedInfo_Next.F_LimitTime < DateTime.Now)
16993
                                     {
17062
                                     {
16994
                                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 1;
17063
                                         modelT_Bus_AssignedInfo_Next.F_IsOverdue = 1;
17064
+                                       
16995
                                     }
17065
                                     }
16996
 
17066
 
16997
                                     new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
17067
                                     new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next);
17109
                     {
17179
                     {
17110
                         using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
17180
                         using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
17111
                         {
17181
                         {
17182
+
17112
                             modelT_Bus_Feedback_Next.F_IsAudit = state;
17183
                             modelT_Bus_Feedback_Next.F_IsAudit = state;
17113
                             modelT_Bus_Feedback_Next.F_AuditUser = User.F_UserCode;
17184
                             modelT_Bus_Feedback_Next.F_AuditUser = User.F_UserCode;
17114
                             modelT_Bus_Feedback_Next.F_AuditTime = DateTime.Now;
17185
                             modelT_Bus_Feedback_Next.F_AuditTime = DateTime.Now;
17129
                                 strmsg = "同意";
17200
                                 strmsg = "同意";
17130
 
17201
 
17131
                                 #region 插入反馈记录
17202
                                 #region 插入反馈记录
17203
+                                Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next1 = new BLL.T_Bus_AssignedInfo_Next().GetModel(modelT_Bus_Feedback_Next.F_AssignedId.Value);
17204
+                                modelT_Bus_AssignedInfo_Next1.F_IsNotice  = 2;
17205
+                                new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next1);
17206
+
17132
                                 Model.T_Bus_Feedback modelT_Bus_Feedback = new Model.T_Bus_Feedback();
17207
                                 Model.T_Bus_Feedback modelT_Bus_Feedback = new Model.T_Bus_Feedback();
17133
                                 modelT_Bus_Feedback.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单编号
17208
                                 modelT_Bus_Feedback.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单编号
17134
                                 modelT_Bus_Feedback.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;//交办id
17209
                                 modelT_Bus_Feedback.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;//交办id
17135
                                 modelT_Bus_Feedback.F_DealUser = modelT_Bus_Feedback_Next.F_DealUser;
17210
                                 modelT_Bus_Feedback.F_DealUser = modelT_Bus_Feedback_Next.F_DealUser;
17136
                                 modelT_Bus_Feedback.F_Result = message;//反馈内容
17211
                                 modelT_Bus_Feedback.F_Result = message;//反馈内容
17137
                                 #region 20200114新增字段 zhengbingbing
17212
                                 #region 20200114新增字段 zhengbingbing
17213
+
17214
+
17215
+                                modelT_Bus_Feedback.F_AuditPost = modelT_Bus_Feedback_Next.F_AuditPost;
17216
+                                modelT_Bus_Feedback.F_AuditReason  = modelT_Bus_Feedback_Next.F_AuditReason;
17217
+                                modelT_Bus_Feedback.F_AuditUser  = modelT_Bus_Feedback_Next.F_AuditUser;
17218
+                                modelT_Bus_Feedback.F_AuditContact = modelT_Bus_Feedback_Next.F_AuditContact;
17219
+
17138
                                 modelT_Bus_Feedback.F_IsProResult = modelT_Bus_Feedback_Next.F_IsProResult;//是否有处理结果:0默认,1是,2否
17220
                                 modelT_Bus_Feedback.F_IsProResult = modelT_Bus_Feedback_Next.F_IsProResult;//是否有处理结果:0默认,1是,2否
17139
                                 modelT_Bus_Feedback.F_ProSituation = modelT_Bus_Feedback_Next.F_ProSituation;//处理情况/方案/进程
17221
                                 modelT_Bus_Feedback.F_ProSituation = modelT_Bus_Feedback_Next.F_ProSituation;//处理情况/方案/进程
17140
                                 modelT_Bus_Feedback.F_IsProtect = modelT_Bus_Feedback_Next.F_IsProtect;//是否保密(0:否1:是)
17222
                                 modelT_Bus_Feedback.F_IsProtect = modelT_Bus_Feedback_Next.F_IsProtect;//是否保密(0:否1:是)
17181
                                     // modelT_Bus_WorkOrder.F_ToBereply = 1;
17263
                                     // modelT_Bus_WorkOrder.F_ToBereply = 1;
17182
                                     // modelT_Bus_WorkOrder.F_IsProResult = 1;
17264
                                     // modelT_Bus_WorkOrder.F_IsProResult = 1;
17183
                                 }
17265
                                 }
17184
-                                var modeBus_Feedback_Next = new BLL.T_Bus_Feedback_Next()
17185
-                                 .GetModelList(" F_WorkOrderId='"+ modelT_Bus_WorkOrder .F_WorkOrderId + "' and F_Type=1 and F_IsDelete=0" +
17266
+                                var modeBus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next ()
17267
+                                 .GetModelList(" F_WorkOrderId='"+ modelT_Bus_WorkOrder .F_WorkOrderId + "'  and F_IsDelete=0 " +
17186
                                  "  ");
17268
                                  "  ");
17187
-                                if (modeBus_Feedback_Next != null && modeBus_Feedback_Next.Count > 0)
17269
+                                if (modeBus_AssignedInfo_Next != null && modeBus_AssignedInfo_Next.Count > 0)
17188
                                 {
17270
                                 {
17189
-                                    if (modeBus_Feedback_Next.Count >1)
17271
+                                    if (modeBus_AssignedInfo_Next.Count >1)
17190
                                     {
17272
                                     {
17191
-                                        if (modeBus_Feedback_Next.Where(x => x.F_IsAudit == 0).Count() > 0)
17273
+                                        if (modeBus_AssignedInfo_Next.Where(x => x.F_IsNotice  == 1).Count() > 0)
17274
+                                        {
17192
                                             modelT_Bus_AssignedInfo.F_FeedbackTime = null;
17275
                                             modelT_Bus_AssignedInfo.F_FeedbackTime = null;
17193
-                                        else
17276
+                                        }
17277
+                                        else if (modeBus_AssignedInfo_Next.Where(x => x.F_IsNotice == 0).Count() > 0)
17278
+                                        {
17279
+                                            modelT_Bus_AssignedInfo.F_IsNext = 2;
17280
+                                            modelT_Bus_AssignedInfo.F_FeedbackTime = null;
17281
+                                        }
17282
+                                        else 
17194
                                         {
17283
                                         {
17195
                                             keyValuePairs.Add("F_WorkState", (int)EnumWorkState.dealed);
17284
                                             keyValuePairs.Add("F_WorkState", (int)EnumWorkState.dealed);
17196
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.dealed;//待回访
17285
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.dealed;//待回访
17270
                                 strmsg = "拒绝";
17359
                                 strmsg = "拒绝";
17271
                                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next1 = new BLL.T_Bus_AssignedInfo_Next().GetModel(modelT_Bus_Feedback_Next.F_AssignedId.Value);
17360
                                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next1 = new BLL.T_Bus_AssignedInfo_Next().GetModel(modelT_Bus_Feedback_Next.F_AssignedId.Value);
17272
                                 modelT_Bus_AssignedInfo_Next1.F_FeedbackTime = null;
17361
                                 modelT_Bus_AssignedInfo_Next1.F_FeedbackTime = null;
17362
+                                modelT_Bus_AssignedInfo_Next1.F_IsNotice = 0;
17273
                                 new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next1);
17363
                                 new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next1);
17274
 
17364
 
17275
-                                modelT_Bus_AssignedInfo.F_IsNext = 2;
17276
-                                assignBLL.Update(modelT_Bus_AssignedInfo);
17277
 
17365
 
17366
+                                var modeBus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next()
17367
+                                .GetModelList(" F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "'  and F_IsDelete=0 " +
17368
+                                "  ");
17369
+                                if (modeBus_AssignedInfo_Next != null && modeBus_AssignedInfo_Next.Count > 0)
17370
+                                {
17371
+                                    if (modeBus_AssignedInfo_Next.Count > 1)
17372
+                                    {
17373
+                                        if (modeBus_AssignedInfo_Next.Where(x => x.F_IsNotice == 1).Count() > 0)
17374
+                                        {
17375
+                                            modelT_Bus_AssignedInfo.F_FeedbackTime = null;
17376
+                                            assignBLL.Update(modelT_Bus_AssignedInfo);
17377
+                                        }
17378
+                                        else if (modeBus_AssignedInfo_Next.Where(x => x.F_IsNotice == 0).Count() > 0)
17379
+                                        {
17380
+                                            modelT_Bus_AssignedInfo.F_IsNext = 2;
17381
+                                            modelT_Bus_AssignedInfo.F_FeedbackTime = null;
17382
+                                            assignBLL.Update(modelT_Bus_AssignedInfo);
17383
+                                        }
17384
+                                    }
17385
+                                }
17278
 
17386
 
17279
                             }
17387
                             }
17280
 
17388
 

+ 14 - 9
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

862
             {
862
             {
863
                 if (modelT_Bus_AssignedInfo.F_IsNext == 1 || modelT_Bus_AssignedInfo.F_IsNext == 2)
863
                 if (modelT_Bus_AssignedInfo.F_IsNext == 1 || modelT_Bus_AssignedInfo.F_IsNext == 2)
864
                 {
864
                 {
865
-                    Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
866
-                    var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId = " + (modelT_Bus_AssignedInfo_Next.F_MainDeptId ?? 0) + " and F_DeleteFlag=0");
867
-                    if (user != null)
865
+                    // Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
866
+                    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");
867
+                    if (modelT_Bus_AssignedInfo_Next!=null && modelT_Bus_AssignedInfo_Next.Count >0)
868
                     {
868
                     {
869
-                        foreach (var iv in user)
869
+                        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");
870
+                        if (user != null)
870
                         {
871
                         {
871
-
872
-                          
873
-                            if (!string.IsNullOrEmpty(iv.F_Mobile))
872
+                            foreach (var iv in user)
874
                             {
873
                             {
875
-                                string count = "您的工单" + workorderid + "收到催办,请及时处理!";
876
-                                bool n = SMSController.AddSmS(0, count, workorderid, iv.F_Mobile, "2764366");
877
 
874
 
875
+
876
+                                if (!string.IsNullOrEmpty(iv.F_Mobile))
877
+                                {
878
+                                    string count = "您的工单" + workorderid + "收到催办,请及时处理!";
879
+                                    bool n = SMSController.AddSmS(0, count, workorderid, iv.F_Mobile, "2764366");
880
+
881
+                                }
878
                             }
882
                             }
879
                         }
883
                         }
880
                     }
884
                     }
885
+                   
881
 
886
 
882
                 }
887
                 }
883
                 else
888
                 else