派单

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

@@ -10919,7 +10919,29 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             var datatime = DateTime.Now.AddDays(7);
                             if (Convert.ToDateTime(resdatetime) > datatime)
                             {
-                                resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " +
+                            DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                       " with(nolock) where F_OffState = 1 and    " +
+                                       "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                {
+                                    resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                }
+
+
+                                //var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                //if (datetime.DayOfWeek == DayOfWeek.Saturday || datetime.DayOfWeek == DayOfWeek.Sunday)
+                                //{
+                                //    resdatetime = datetime.AddDays(2).ToString("yyyy-MM-dd HH:mm:ss");
+                                //}
+                                //else
+                                //{
+                                //    resdatetime = datetime.ToString("yyyy-MM-dd HH:mm:ss");
+                                //}
+                                //  resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                             }
 
                             //交办信息
@@ -12674,9 +12696,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
                     resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss");
                     var datatime = DateTime.Now.AddDays(limittime);
+
                     if (Convert.ToDateTime(resdatetime) > datatime)
                     {
-                        resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                        var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " +
+                            DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                        DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                               " with(nolock) where F_OffState = 1 and    " +
+                               "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                      
+                      var   resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                        if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd")!=
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                        {
+                            resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                        }
+
+
+                        //    if (datetime.DayOfWeek==DayOfWeek.Saturday|| datetime.DayOfWeek == DayOfWeek.Sunday)
+                        //{
+                        //    if(datetime.Hour >=0&& datetime.Hour<=8)
+                        //    {
+                        //        datetime.AddHours (8);
+                        //    }
+                           
+                        //    resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
+
+                        //    resdatetime = datetime.AddDays (2).ToString("yyyy-MM-dd HH:mm:ss");
+                        //}
+                        //else
+                        //{
+                        //    resdatetime = datetime.ToString("yyyy-MM-dd HH:mm:ss");
+                        //}
+                      //  resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                       
                     }
                 }
                
@@ -13416,7 +13469,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 var datatime = DateTime.Now.AddDays(6);
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
                                                 {
-                                                    resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+
+
+
+                                                    var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                                  
+                                                    DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                           " with(nolock) where F_OffState = 1 and    " +
+                                                           "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                                    var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                                    if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                                    {
+                                                        resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                                    }
+
+                                                    //  resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                                                 }
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
 
@@ -14538,7 +14606,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             var datatime = DateTime.Now.AddDays(6);
                             if (Convert.ToDateTime(resdatetime) > datatime)
                             {
-                                resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                          " with(nolock) where F_OffState = 1 and    " +
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                {
+                                    resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                }
+                                // resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                             }
                             newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
                         }
@@ -14991,7 +15069,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                             var datatime = DateTime.Now.AddDays(limittime);
                                             if (Convert.ToDateTime(resdatetime) > datatime)
                                             {
-                                                resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                                var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                                DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                          " with(nolock) where F_OffState = 1 and    " +
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                                var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                                if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                                {
+                                                    resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                                }
+                                                // resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                                             }
                                         }
                                       //  resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss"); ;
@@ -15372,7 +15460,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             var datatime = DateTime.Now.AddDays(newlimittime);
                             if (Convert.ToDateTime(resdatetime) > datatime)
                             {
-                                resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                          " with(nolock) where F_OffState = 1 and    " +
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                {
+                                    resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                }
+                                //  resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                             }
                         }
                       //  resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss"); ;
@@ -18185,7 +18283,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     var datatime = DateTime.Now.AddDays(day );
                                     if (Convert.ToDateTime(resdatetime) > datatime)
                                     {
-                                        resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                        var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                        DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                          " with(nolock) where F_OffState = 1 and    " +
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                        var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                        if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                        {
+                                            resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                        }
+                                        //  resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                                     }
                                     var deptlist = new BLL.T_Sys_Department().GetModelList("F_DeptId in (" + modelT_Bus_ToExamine.F_MainDeptId + ")");
                                     int t = 0;
@@ -18946,7 +19054,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 var datatime = DateTime.Now.AddDays(6);
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
                                                 {
-                                                    resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                                    var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                                    DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                         " with(nolock) where F_OffState = 1 and    " +
+                                                         "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                                    var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                                    if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                                    {
+                                                        resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                                    }
+                                                    // resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                                                 }
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
                                             }
@@ -19720,7 +19838,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         var datatime = DateTime.Now.AddDays(6);
                                         if (Convert.ToDateTime(resdatetime) > datatime)
                                         {
-                                            resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                            var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                            DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                          " with(nolock) where F_OffState = 1 and    " +
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                            var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                            if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                            {
+                                                resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                            }
+                                            //  resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                                         }
                                         newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
                                     }
@@ -20238,7 +20366,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 var datatime = DateTime.Now.AddDays(6);
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
                                                 {
-                                                    resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                                                    var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                                                    DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                          " with(nolock) where F_OffState = 1 and    " +
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                                                    var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                                                    if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                                                    {
+                                                        resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                                                    }
+                                                    // resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                                                 }
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
                                             }
@@ -20573,7 +20711,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     var datatime = DateTime.Now.AddDays(limittime);
                     if (Convert.ToDateTime(resdatetime) > datatime)
                     {
-                        resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
+                        var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
+                        DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
+                                                          " with(nolock) where F_OffState = 1 and    " +
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
+                        var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
+                        if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
+                        {
+                            resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
+                        }
+                        // resdatetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
                     }
                 }
                 else

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -900,21 +900,21 @@ namespace CallCenter.Utility
                                 cel1.SetCellValue(dr["F_DeptName"].ToString());
                                 cel1.CellStyle = cellStylebt1;
                                 break;
-                            case 2:
-                                ICell cel2 = irow4.CreateCell(i);
-                                cel2.SetCellValue(dr["F_Reporting"].ToString());
-                                cel2.CellStyle = cellStylebt1;
-                                break;
+                            //case 2:
+                            //    ICell cel2 = irow4.CreateCell(i);
+                            //    cel2.SetCellValue(dr["F_Reporting"].ToString());
+                            //    cel2.CellStyle = cellStylebt1;
+                            //    break;
                             //case 3:
                             //    ICell cel12 = irow4.CreateCell(i);
                             //    cel12.SetCellValue(dr["F_Matter"].ToString());
                             //    cel12.CellStyle = cellStylebt1;
                             //    break;
-                            //case 4:
-                            //    ICell cel3 = irow4.CreateCell(i);
-                            //    cel3.SetCellValue(dr["F_Undertake"].ToString());
-                            //    cel3.CellStyle = cellStylebt1;
-                            //    break;
+                            case 2:
+                                ICell cel3 = irow4.CreateCell(i);
+                                cel3.SetCellValue(dr["F_Undertake"].ToString());
+                                cel3.CellStyle = cellStylebt1;
+                                break;
                             case 3:
                                 ICell cel13 = irow4.CreateCell(i);
                                 cel13.SetCellValue(dr["F_Handling"].ToString());