1550076451 2 年 前
コミット
63b8b49adf

+ 159 - 11
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

10919
                             var datatime = DateTime.Now.AddDays(7);
10919
                             var datatime = DateTime.Now.AddDays(7);
10920
                             if (Convert.ToDateTime(resdatetime) > datatime)
10920
                             if (Convert.ToDateTime(resdatetime) > datatime)
10921
                             {
10921
                             {
10922
-                                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"); ;
10922
+                                var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " +
10923
+                            DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
10924
+                                DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
10925
+                                       " with(nolock) where F_OffState = 1 and    " +
10926
+                                       "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
10927
+                                var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
10928
+                                if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
10929
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
10930
+                                {
10931
+                                    resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
10932
+                                }
10933
+
10934
+
10935
+                                //var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
10936
+                                //if (datetime.DayOfWeek == DayOfWeek.Saturday || datetime.DayOfWeek == DayOfWeek.Sunday)
10937
+                                //{
10938
+                                //    resdatetime = datetime.AddDays(2).ToString("yyyy-MM-dd HH:mm:ss");
10939
+                                //}
10940
+                                //else
10941
+                                //{
10942
+                                //    resdatetime = datetime.ToString("yyyy-MM-dd HH:mm:ss");
10943
+                                //}
10944
+                                //  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"); ;
10923
                             }
10945
                             }
10924
 
10946
 
10925
                             //交办信息
10947
                             //交办信息
12674
                     resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
12696
                     resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
12675
                     resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss");
12697
                     resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss");
12676
                     var datatime = DateTime.Now.AddDays(limittime);
12698
                     var datatime = DateTime.Now.AddDays(limittime);
12699
+
12677
                     if (Convert.ToDateTime(resdatetime) > datatime)
12700
                     if (Convert.ToDateTime(resdatetime) > datatime)
12678
                     {
12701
                     {
12679
-                        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"); ;
12702
+                        var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " +
12703
+                            DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
12704
+                        DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
12705
+                               " with(nolock) where F_OffState = 1 and    " +
12706
+                               "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
12707
+                      
12708
+                      var   resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
12709
+                        if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd")!=
12710
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
12711
+                        {
12712
+                            resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
12713
+                        }
12714
+
12715
+
12716
+                        //    if (datetime.DayOfWeek==DayOfWeek.Saturday|| datetime.DayOfWeek == DayOfWeek.Sunday)
12717
+                        //{
12718
+                        //    if(datetime.Hour >=0&& datetime.Hour<=8)
12719
+                        //    {
12720
+                        //        datetime.AddHours (8);
12721
+                        //    }
12722
+                           
12723
+                        //    resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
12724
+
12725
+                        //    resdatetime = datetime.AddDays (2).ToString("yyyy-MM-dd HH:mm:ss");
12726
+                        //}
12727
+                        //else
12728
+                        //{
12729
+                        //    resdatetime = datetime.ToString("yyyy-MM-dd HH:mm:ss");
12730
+                        //}
12731
+                      //  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"); ;
12732
+                       
12680
                     }
12733
                     }
12681
                 }
12734
                 }
12682
                
12735
                
13416
                                                 var datatime = DateTime.Now.AddDays(6);
13469
                                                 var datatime = DateTime.Now.AddDays(6);
13417
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
13470
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
13418
                                                 {
13471
                                                 {
13419
-                                                    resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
13472
+
13473
+
13474
+
13475
+                                                    var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
13476
+                                                  
13477
+                                                    DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
13478
+                                                           " with(nolock) where F_OffState = 1 and    " +
13479
+                                                           "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
13480
+                                                    var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
13481
+                                                    if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
13482
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
13483
+                                                    {
13484
+                                                        resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
13485
+                                                    }
13486
+
13487
+                                                    //  resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
13420
                                                 }
13488
                                                 }
13421
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
13489
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
13422
 
13490
 
14538
                             var datatime = DateTime.Now.AddDays(6);
14606
                             var datatime = DateTime.Now.AddDays(6);
14539
                             if (Convert.ToDateTime(resdatetime) > datatime)
14607
                             if (Convert.ToDateTime(resdatetime) > datatime)
14540
                             {
14608
                             {
14541
-                                resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
14609
+                                var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
14610
+                                DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
14611
+                                                          " with(nolock) where F_OffState = 1 and    " +
14612
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
14613
+                                var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
14614
+                                if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
14615
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
14616
+                                {
14617
+                                    resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
14618
+                                }
14619
+                                // resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
14542
                             }
14620
                             }
14543
                             newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
14621
                             newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
14544
                         }
14622
                         }
14991
                                             var datatime = DateTime.Now.AddDays(limittime);
15069
                                             var datatime = DateTime.Now.AddDays(limittime);
14992
                                             if (Convert.ToDateTime(resdatetime) > datatime)
15070
                                             if (Convert.ToDateTime(resdatetime) > datatime)
14993
                                             {
15071
                                             {
14994
-                                                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"); ;
15072
+                                                var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
15073
+                                                DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
15074
+                                                          " with(nolock) where F_OffState = 1 and    " +
15075
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
15076
+                                                var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
15077
+                                                if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
15078
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
15079
+                                                {
15080
+                                                    resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
15081
+                                                }
15082
+                                                // 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"); ;
14995
                                             }
15083
                                             }
14996
                                         }
15084
                                         }
14997
                                       //  resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss"); ;
15085
                                       //  resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss"); ;
15372
                             var datatime = DateTime.Now.AddDays(newlimittime);
15460
                             var datatime = DateTime.Now.AddDays(newlimittime);
15373
                             if (Convert.ToDateTime(resdatetime) > datatime)
15461
                             if (Convert.ToDateTime(resdatetime) > datatime)
15374
                             {
15462
                             {
15375
-                                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"); ;
15463
+                                var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
15464
+                                DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
15465
+                                                          " with(nolock) where F_OffState = 1 and    " +
15466
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
15467
+                                var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
15468
+                                if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
15469
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
15470
+                                {
15471
+                                    resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
15472
+                                }
15473
+                                //  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"); ;
15376
                             }
15474
                             }
15377
                         }
15475
                         }
15378
                       //  resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss"); ;
15476
                       //  resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss"); ;
18185
                                     var datatime = DateTime.Now.AddDays(day );
18283
                                     var datatime = DateTime.Now.AddDays(day );
18186
                                     if (Convert.ToDateTime(resdatetime) > datatime)
18284
                                     if (Convert.ToDateTime(resdatetime) > datatime)
18187
                                     {
18285
                                     {
18188
-                                        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"); ;
18286
+                                        var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
18287
+                                        DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
18288
+                                                          " with(nolock) where F_OffState = 1 and    " +
18289
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
18290
+                                        var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
18291
+                                        if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
18292
+                           Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
18293
+                                        {
18294
+                                            resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
18295
+                                        }
18296
+                                        //  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"); ;
18189
                                     }
18297
                                     }
18190
                                     var deptlist = new BLL.T_Sys_Department().GetModelList("F_DeptId in (" + modelT_Bus_ToExamine.F_MainDeptId + ")");
18298
                                     var deptlist = new BLL.T_Sys_Department().GetModelList("F_DeptId in (" + modelT_Bus_ToExamine.F_MainDeptId + ")");
18191
                                     int t = 0;
18299
                                     int t = 0;
18946
                                                 var datatime = DateTime.Now.AddDays(6);
19054
                                                 var datatime = DateTime.Now.AddDays(6);
18947
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
19055
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
18948
                                                 {
19056
                                                 {
18949
-                                                    resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
19057
+                                                    var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
19058
+                                                    DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
19059
+                                                         " with(nolock) where F_OffState = 1 and    " +
19060
+                                                         "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
19061
+                                                    var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
19062
+                                                    if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
19063
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
19064
+                                                    {
19065
+                                                        resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
19066
+                                                    }
19067
+                                                    // resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
18950
                                                 }
19068
                                                 }
18951
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
19069
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
18952
                                             }
19070
                                             }
19720
                                         var datatime = DateTime.Now.AddDays(6);
19838
                                         var datatime = DateTime.Now.AddDays(6);
19721
                                         if (Convert.ToDateTime(resdatetime) > datatime)
19839
                                         if (Convert.ToDateTime(resdatetime) > datatime)
19722
                                         {
19840
                                         {
19723
-                                            resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
19841
+                                            var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
19842
+                                            DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
19843
+                                                          " with(nolock) where F_OffState = 1 and    " +
19844
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
19845
+                                            var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
19846
+                                            if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
19847
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
19848
+                                            {
19849
+                                                resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
19850
+                                            }
19851
+                                            //  resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
19724
                                         }
19852
                                         }
19725
                                         newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
19853
                                         newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
19726
                                     }
19854
                                     }
20238
                                                 var datatime = DateTime.Now.AddDays(6);
20366
                                                 var datatime = DateTime.Now.AddDays(6);
20239
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
20367
                                                 if (Convert.ToDateTime(resdatetime) > datatime)
20240
                                                 {
20368
                                                 {
20241
-                                                    resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
20369
+                                                    var datetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
20370
+                                                    DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
20371
+                                                          " with(nolock) where F_OffState = 1 and    " +
20372
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
20373
+                                                    var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
20374
+                                                    if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
20375
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
20376
+                                                    {
20377
+                                                        resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
20378
+                                                    }
20379
+                                                    // resdatetime = Convert.ToDateTime(resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss"); ;
20242
                                                 }
20380
                                                 }
20243
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
20381
                                                 newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime);//办理时限
20244
                                             }
20382
                                             }
20573
                     var datatime = DateTime.Now.AddDays(limittime);
20711
                     var datatime = DateTime.Now.AddDays(limittime);
20574
                     if (Convert.ToDateTime(resdatetime) > datatime)
20712
                     if (Convert.ToDateTime(resdatetime) > datatime)
20575
                     {
20713
                     {
20576
-                        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"); ;
20714
+                        var datetime = Convert.ToDateTime(Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss")).AddHours(8);
20715
+                        DataTable dt1 = DbHelperSQL.Query("select top 1 F_OffDate from  T_Sys_WorkOFFDays " +
20716
+                                                          " with(nolock) where F_OffState = 1 and    " +
20717
+                                                          "F_OffDate >= '" + datetime.ToString("yyyy-MM-dd") + "'  order by F_OffDate asc").Tables[0];
20718
+                        var resdatetimes = dt1.Rows[dt1.Rows.Count - 1]["F_OffDate"].ToString();
20719
+                        if (Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") !=
20720
+                            Convert.ToDateTime(datetime).ToString("yyyy-MM-dd"))
20721
+                        {
20722
+                            resdatetime = Convert.ToDateTime(resdatetimes).ToString("yyyy-MM-dd") + " " + datetime.AddHours(8).ToString("HH:mm:ss");
20723
+                        }
20724
+                        // 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"); ;
20577
                     }
20725
                     }
20578
                 }
20726
                 }
20579
                 else
20727
                 else

+ 10 - 10
CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

900
                                 cel1.SetCellValue(dr["F_DeptName"].ToString());
900
                                 cel1.SetCellValue(dr["F_DeptName"].ToString());
901
                                 cel1.CellStyle = cellStylebt1;
901
                                 cel1.CellStyle = cellStylebt1;
902
                                 break;
902
                                 break;
903
-                            case 2:
904
-                                ICell cel2 = irow4.CreateCell(i);
905
-                                cel2.SetCellValue(dr["F_Reporting"].ToString());
906
-                                cel2.CellStyle = cellStylebt1;
907
-                                break;
903
+                            //case 2:
904
+                            //    ICell cel2 = irow4.CreateCell(i);
905
+                            //    cel2.SetCellValue(dr["F_Reporting"].ToString());
906
+                            //    cel2.CellStyle = cellStylebt1;
907
+                            //    break;
908
                             //case 3:
908
                             //case 3:
909
                             //    ICell cel12 = irow4.CreateCell(i);
909
                             //    ICell cel12 = irow4.CreateCell(i);
910
                             //    cel12.SetCellValue(dr["F_Matter"].ToString());
910
                             //    cel12.SetCellValue(dr["F_Matter"].ToString());
911
                             //    cel12.CellStyle = cellStylebt1;
911
                             //    cel12.CellStyle = cellStylebt1;
912
                             //    break;
912
                             //    break;
913
-                            //case 4:
914
-                            //    ICell cel3 = irow4.CreateCell(i);
915
-                            //    cel3.SetCellValue(dr["F_Undertake"].ToString());
916
-                            //    cel3.CellStyle = cellStylebt1;
917
-                            //    break;
913
+                            case 2:
914
+                                ICell cel3 = irow4.CreateCell(i);
915
+                                cel3.SetCellValue(dr["F_Undertake"].ToString());
916
+                                cel3.CellStyle = cellStylebt1;
917
+                                break;
918
                             case 3:
918
                             case 3:
919
                                 ICell cel13 = irow4.CreateCell(i);
919
                                 ICell cel13 = irow4.CreateCell(i);
920
                                 cel13.SetCellValue(dr["F_Handling"].ToString());
920
                                 cel13.SetCellValue(dr["F_Handling"].ToString());