Merge branch 'master' of http://192.168.1.222:3000/duhongyu/HeBi12345_API

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

                         var resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
                         resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + delay.F_OldTime.Value.ToString("HH:mm:ss");
 
-                        delay.F_NewTime = Convert.ToDateTime(resdatetime);
+                        delay.F_NewTime = delay.F_OldTime.Value.AddDays(newlimittime);
 
                         delay.F_Reason = reason;
                         //delay.F_State = 1;

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

                             }
                             else
                             {
+                                if(modelT_Bus_DelayTime.F_IsAudit ==1)
+                                {
+                                    var obj = new
+                                    {
+                                        code = "0",
+                                        message = "已推送过延时结果"
+                                    };
+                                    return Content(obj.ToJson());
+                                }
+
                                 affairs.FirstOrDefault().TFDBACKTIME_BF = modelT_Bus_DelayTime.F_NewTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
 
                                 TimeSpan ts = modelT_Bus_DelayTime.F_NewTime.Value.Subtract(modelT_Bus_DelayTime.F_OldTime.Value);
                                     modelT_Bus_WorkOrder.F_LimitTime.Value
                                      .AddHours(tss);
                                 des = "，原定办结时间" + modelT_Bus_DelayTime.F_OldTime + "，申请延长到" + modelT_Bus_DelayTime.F_NewTime;
-                                int n = DbHelperSQL.ExecuteSql(" update T_Bus_WorkOrder set F_LimitTime='" + modelT_Bus_WorkOrder.F_LimitTime + "'   where F_Id ='" + modelT_Bus_WorkOrder.F_Id + "'");
+                                int n = DbHelperSQL.ExecuteSql(" update T_Bus_WorkOrder set F_LimitTime='" + modelT_Bus_WorkOrder.F_LimitTime 
+                                    + "'   where F_Id ='" + modelT_Bus_WorkOrder.F_Id + "'");
 
                                 if (modelT_Bus_AssignedInfo != null)
                                 {
                                 }
                                 if (!string.IsNullOrEmpty(modelT_Bus_WorkOrder.F_SubWorkorder1))
                                 {
-                                    var modellist = workorderBLL.GetModelList("F_WorkOrderId in(select col from dbo.SplitToNvarchar('" + modelT_Bus_WorkOrder.F_SubWorkorder1 + "',',' ))  and F_IsDelete =0  ");
+                                    var modellist = workorderBLL.GetModelList("F_WorkOrderId in(select col from dbo.SplitToNvarchar('" 
+                                        + modelT_Bus_WorkOrder.F_SubWorkorder1 + "',',' ))  and F_IsDelete =0  ");
 
                                     if (modellist != null && modellist.Count > 0)
                                     {
                                                 + "'   where F_Id ='" + it.F_Id + "'");
 
                                             Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo1 = assignBLL.GetNewModelByWorkOrderID(it.F_WorkOrderId);
-                                            var modelT_Bus_AssignedInfo_Next1 = new BLL.T_Bus_AssignedInfo_Next().GetModelList("F_State=1 and F_IsDelete=0 and F_WorkOrderId='"
+                                            var modelT_Bus_AssignedInfo_Next1 = new BLL.T_Bus_AssignedInfo_Next().GetModelList
+                                                ("F_State=1 and F_IsDelete=0 and F_WorkOrderId='"
                                                 + it.F_WorkOrderId + "'  order by F_CreateTime desc");