回传件数量修改

CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

                 {
                     model.F_NewRemarks = row["F_NewRemarks"].ToString();
                 }
+                if (row["F_Hcdatetime"] != null && row["F_Hcdatetime"].ToString() != "")
+                {
+                    model.F_Hcdatetime = DateTime.Parse(row["F_Hcdatetime"].ToString());
+                }
                 
                 if (row["F_MainWorkOrderId"] != null)
                 {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

         /// <param name="date"></param>
         /// <param name="isdc"></param>
         /// <returns></returns>
-        public ActionResult GetDayweekmonth(DateTime? date, int type = 0, int dateType = 0, int deptid = 0
+        public ActionResult GetDayweekmonth(DateTime? date, string stime,string etime , int type = 0, int dateType = 0, int deptid = 0
             , bool isExport = false,string  source="")
         {
             var date1 = date;
                 date = DateTime.Now.Date;
                 start1 = DateTime.Now.ToString("yyyy-MM-dd");
             }
+
+            if (string.IsNullOrEmpty(stime) && string.IsNullOrEmpty(etime))
+            {
+                stime = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
+                etime = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
+            }
             if (type == 1)
             {
-                DateTime start = date.Value;
-                DateTime end = date.Value;
                 string where = "";
                 string where1 = "";
-                if (dateType==1)
-                {
-                    where = "and F_CreateTime>='" + date.Value.ToString("yyyy-MM-dd")+"' ";
-                    where1 = " and wo.F_AssignTime <= CONVERT(datetime, '" + start1 + "' + ' 23:59:59', 20) and  wo.F_AssignTime>=CONVERT(datetime,'" + start1 + "'+' 00:00:00',20)";
-                }
-                else if (dateType == 2)
-                {
-                    int weeknow = Convert.ToInt32(date.Value .DayOfWeek);
-                    weeknow = (weeknow == 0 ? (7 - 1) : (weeknow - 1));
-                     int daydiff = (-1) * weeknow;
-                    start = date.Value.AddDays(daydiff);
-                    int lastWeekDay = Convert.ToInt32(date.Value.DayOfWeek);
-                       lastWeekDay = lastWeekDay == 0 ? (7 - lastWeekDay) : lastWeekDay;
-                    int lastWeekDiff = (7 - lastWeekDay);
-                    end = date.Value .AddDays(lastWeekDiff);
-                    where = "and F_CreateTime>='" + start.ToString("yyyy-MM-dd")+"' ";
-                    where = "and F_CreateTime<='" + end.ToString("yyyy-MM-dd")+"' ";
-                    where1 = " and wo.F_AssignTime <= CONVERT(datetime, '" + end.ToString("yyyy-MM-dd") + "' + ' 23:59:59', 20) and  wo.F_AssignTime>=CONVERT(datetime,'" + start.ToString("yyyy-MM-dd") + "'+' 00:00:00',20)";
-                }
-                else
-                {
-                    start = new DateTime(date.Value.Year, date.Value.Month, 1);
-                    end = start.AddMonths(1).AddDays(-1);
-                    where = "and F_CreateTime>='" + start.ToString("yyyy-MM-dd")+"'";
-                    where = "and F_CreateTime<='" + end.ToString("yyyy-MM-dd")+"'";
-
-                     where1 = " and wo.F_AssignTime <= CONVERT(datetime, '" + end.ToString("yyyy-MM-dd") + "' + ' 23:59:59', 20) and  wo.F_AssignTime>=CONVERT(datetime,'" + start.ToString("yyyy-MM-dd") + "'+' 00:00:00',20)";
-                }
-
-                if (!string .IsNullOrEmpty (  source ))
+                where += " and F_CreateTime>='" + stime + "' ";
+                where += " and F_CreateTime<='" + etime + "' ";
+                where1 = " and wo.F_Hcdatetime <= CONVERT(datetime, '" + etime + "', 20) and  wo.F_Hcdatetime>=CONVERT(datetime,'" + stime + "',20)";
+                if (!string.IsNullOrEmpty(source))
                 {
                     where1 += "and F_InfoSource='" + source + "'";
                 }
-                //string sql = $"  select  count(1)as 受理  from T_Bus_WorkOrder a where F_IsDelete=0"+ where;
-                //var dtsql = DbHelperSQL.Query(sql).Tables[0];
-                //string sql1 = $"  select COUNT(1) from T_Bus_WorkOrder a where a.F_DealTime >(SELECT cast(convert(varchar(10),a .F_CreateTime ,120)+' 00:00:00' as datetime)) and  a.F_DealTime <(SELECT cast(convert(varchar(10),a .F_CreateTime ,120)+' 23:59:59' as datetime))  and F_WorkState in (6,7,9,14) and F_IsDelete=0 " + where;
-                //var dtsql1 = DbHelperSQL.Query(sql1).Tables[0];
-                //string sql2 = $"  select COUNT(1) from T_Bus_WorkOrder a where F_IsDelete=0 and F_WorkState not  in (6,7,9,14)" + where;
-                //var dtsql2 = DbHelperSQL.Query(sql2).Tables[0];
-                //var ob = new
-                //{
-                //    Acceptance = dtsql,
-                //    Handled = dtsql1,
-                //    Nothandled = dtsql2
-                //};
-
-                ///////////////条件重新写
                 //郑州转派件
                 string Zzzpj = $"select count(*) as 转派件 from (select DISTINCT wo.F_OldWorkOrderId from T_Bus_WorkOrder wo where  F_OldWorkOrderId is not null and F_OldWorkOrderId !='' and F_IsDelete =0  " + where + ") b";
                 var Zzzpjcount = DbHelperSQL.GetSingle(Zzzpj);
                 //郑州已回传件
-                string Zzyhc = $"select count(*) as 回传件 from (select DISTINCT wo.F_OldWorkOrderId from T_Bus_WorkOrder wo where F_OldWorkOrderId!='' and wo.F_WorkState = 9 " + where1 + ") b";
+                string Zzyhc = $"select count(*) as 回传件 from (select DISTINCT wo.F_OldWorkOrderId from T_Bus_WorkOrder wo where F_OldWorkOrderId!='' and wo.F_WorkState in (9,14) " + where1 + ") b";
                 var Zzyhccount = DbHelperSQL.GetSingle(Zzyhc);
                 var ob = new
                 {
                     Handled = Zzyhccount,
                 };
                 if (isExport)
-                { 
-                  DataTable dt = new DataTable();
+                {
+                    DataTable dt = new DataTable();
                     dt.Columns.Add("Acceptance", typeof(string));
-                  dt.Columns.Add("Handled", typeof(string));
+                    dt.Columns.Add("Handled", typeof(string));
                     dt.Rows[0]["Acceptance"] = Zzzpjcount;
                     dt.Rows[0]["Handled"] = Zzyhccount;
-                    var cols = new string[] { "郑州转派件", "郑州回传件"};
-                    new NPOIHelper().ExportToExcel($"工单报表{Convert.ToDateTime(start).ToString("yyyyMMdd")}-{Convert.ToDateTime(end).ToString("yyyyMMdd")}", dt, cols);
+                    var cols = new string[] { "郑州转派件", "郑州回传件" };
+                    new NPOIHelper().ExportToExcel($"工单报表{Convert.ToDateTime(stime).ToString("yyyyMMdd")}-{Convert.ToDateTime(etime).ToString("yyyyMMdd")}", dt, cols);
                     return Success("导出excel");
                 }
                 var a = ob.ToJson();
                 return Content(ob.ToJson());
             }
 
+
             else if (type == 2)
             {
                 type = 1;

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

         private string _f_transferor;
         private string _f_resultremarks;
         private string _f_files;
+        private DateTime? _f_hcdatetime;
 
         /// <summary>
         /// 
             get { return _f_files; }
         }
         /// <summary>
+        /// 会传字段
+        /// </summary>
+        public DateTime? F_Hcdatetime
+        {
+            set { _f_hcdatetime = value; }
+            get { return _f_hcdatetime; }
+        }
+        /// <summary>
         /// 扫描件时效
         /// </summary>
         public DateTime ? F_Scanning { set; get; }
 
         #region 扩展字段 20220315 催单次数
         public int ReminderNum { get; set; }
-        /// <summary>
-        /// 会传字段
-        /// </summary>
-        public DateTime? F_Hcdatetime { set; get; }
-
+       
 
         public string F_NewRemarks { set; get; }
         #endregion