市场部销售额 Init 基础数据(公司/人员/年份/季度/月份) PostMarketingSalesInitData 代码更改

OASystem/EntitySync/Program.cs

@@ -132,8 +132,8 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Grp_InvertedListVisaCountry), //倒推表签证国家 
     //typeof(Grp_VisaFeeInfo),  //签证费用info 
     //typeof(Grp_HotelInquiry),  //酒店询价 
-    typeof(Grp_HotelReservationsContent),  //酒店费用子表
-
+    //typeof(Grp_HotelReservationsContent),  //酒店费用子表
+     typeof(Grp_VisitingClients),  //拜访团组客户
 
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2091,30 +2091,67 @@ namespace OASystem.API.Controllers
 
             var dtData = new List<dynamic>();
             int dt = DateTime.Now.Year;
-            for (int i = dt - 4; i <= dt; i++)
+            for (int y = dt; y >= dt-4; y--)
             {
                 //季度
                 var quarterDatas = new List<dynamic>();
-                quarterDatas.Add(new { name = "第一季度" ,beginDt = $"{i}-01-01",endDt = $"{i}-03-31" });
-                quarterDatas.Add(new { name = "第二季度", beginDt = $"{i}-04-01", endDt = $"{i}-06-30" });
-                quarterDatas.Add(new { name = "第三季度", beginDt = $"{i}-07-01", endDt = $"{i}-09-30" });
-                quarterDatas.Add(new { name = "第四季度", beginDt = $"{i}-10-01", endDt = $"{i}-12-31" });
-
-                //月份
-                var monthDatas = new List<dynamic>();
-
-                for (int m = 1; m < 13; m++)
+                quarterDatas.Add(new { name = "全部", beginDt = $"{y}-01-01", endDt = $"{y}-12-31" });
+                for (int q = 0; q < 4; q++)
                 {
-                    MonthlyTimeSegment timeSegment = new MonthlyTimeSegment(i, m);
-                    monthDatas.Add(new { name = $"{ConvertToChinese(m)}", beginDt = timeSegment.Start.ToString("yyyy-MM-dd"), endDt = timeSegment.End.ToString("yyyy-MM-dd") });
+                    dynamic quarterData = null;
+                    if (q == 0)
+                    {
+                        var monthDatas = new List<dynamic>();
+                        monthDatas.Add(new { name = $"全部", beginDt = $"{y}-01-01", endDt = $" {y}-03-31" });
+                        for (int m = 1; m < 4; m++)
+                        {
+                            MonthlyTimeSegment timeSegment = new MonthlyTimeSegment(y, m);
+                            monthDatas.Add(new { name = $"{ConvertToChinese(m)}", beginDt = timeSegment.Start.ToString("yyyy-MM-dd"), endDt = timeSegment.End.ToString("yyyy-MM-dd") });
+                        }
+                        quarterData = new { name = "第一季度", beginDt = $"{y}-01-01", endDt = $" {y}-03-31", monthData = monthDatas };
+                    }
+                    else if (q == 1)
+                    {
+                        var monthDatas = new List<dynamic>();
+                        monthDatas.Add(new { name = $"全部", beginDt = $"{y}-04-01", endDt = $"{y}-06-30" });
+                        for (int m = 4; m < 7; m++)
+                        {
+                            MonthlyTimeSegment timeSegment = new MonthlyTimeSegment(y, m);
+                            monthDatas.Add(new { name = $"{ConvertToChinese(m)}", beginDt = timeSegment.Start.ToString("yyyy-MM-dd"), endDt = timeSegment.End.ToString("yyyy-MM-dd") });
+                        }
+
+                        quarterData = new { name = "第二季度", beginDt = $"{y}-04-01", endDt = $"{y}-06-30", monthData = monthDatas };
+                    }
+                    else if (q == 2)
+                    {
+                        var monthDatas = new List<dynamic>();
+                        monthDatas.Add(new { name = $"全部", beginDt = $"{y}-07-01", endDt = $"{y}-09-30" });
+                        for (int m = 7; m < 10; m++)
+                        {
+                            MonthlyTimeSegment timeSegment = new MonthlyTimeSegment(y, m);
+                            monthDatas.Add(new { name = $"{ConvertToChinese(m)}", beginDt = timeSegment.Start.ToString("yyyy-MM-dd"), endDt = timeSegment.End.ToString("yyyy-MM-dd") });
+                        }
+                        quarterData = new { name = "第三季度", beginDt = $"{y}-07-01", endDt = $"{y}-09-30", monthData = monthDatas };
+                    }
+                    else if (q == 3)
+                    {
+                        var monthDatas = new List<dynamic>();
+                        monthDatas.Add(new { name = $"全部", beginDt = $"{y}-10-01", endDt = $"{y}-12-31" });
+                        for (int m = 10; m < 13; m++)
+                        {
+                            MonthlyTimeSegment timeSegment = new MonthlyTimeSegment(y, m);
+                            monthDatas.Add(new { name = $"{ConvertToChinese(m)}", beginDt = timeSegment.Start.ToString("yyyy-MM-dd"), endDt = timeSegment.End.ToString("yyyy-MM-dd") });
+                        }
+                        quarterData = new { name = "第四季度", beginDt = $"{y}-10-01", endDt = $"{y}-12-31", monthData = monthDatas };
+                    }
+                    quarterDatas.Add(quarterData); 
                 }
 
                 dtData.Add(new
                 {
-                    year = $"{i}",
-                    yearData = new { beginDt = $"{i}-01-01", endDt = $"{i}-12-31" },
+                    year = y,
+                    yearData = new { beginDt = $"{y}-01-01", endDt = $"{y}-12-31" },
                     quarterData = quarterDatas,
-                    monthData = monthDatas
                 });
             }
 

OASystem/OASystem.Domain/Entities/Groups/Grp_VisitingClients.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 拜访团组客户
+    /// </summary>
+    [SugarTable("Grp_VisitingClients")]
+    public class Grp_VisitingClients:EntityBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DiId { get; set; }
+
+        /// <summary>
+        /// 拜访时间 - 开始
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "datetime")]
+        public DateTime BeginDt { get; set; }
+
+        /// <summary>
+        /// 拜访时间 - 结束
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "datetime")]
+        public DateTime EndDt { get; set; }
+
+        /// <summary>
+        /// 客户单位
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string CustomerUnit { get; set; }
+
+        /// <summary>
+        /// 客户职务
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CustomerJob { get; set; }
+
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
+        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// 客户联系方式
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
+        public string CustomerContact { get; set; }
+    }
+}

OASystem/OASystem.Domain/ViewModels/Groups/VisitingClientsView.cs

@@ -0,0 +1,13 @@
+using OASystem.Domain.Entities.Groups;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.Groups
+{
+    public class VisitingClientsView:Grp_VisitingClients
+    {
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Groups/VisitingClientsRepository.cs

@@ -0,0 +1,33 @@
+using AutoMapper;
+using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.ViewModels.Groups;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Infrastructure.Repositories.Groups
+{
+    /// <summary>
+    /// 客户拜访仓储
+    /// </summary>
+    public class VisitingClientsRepository : BaseRepository<Grp_VisitingClients, VisitingClientsView>
+    {
+
+        private readonly IMapper _mapper;
+        private readonly JsonView _view; 
+        public VisitingClientsRepository(SqlSugarClient sqlSugar, IMapper mapper, JsonView view)
+            : base(sqlSugar)
+        {
+            _mapper = mapper;
+            _view = new JsonView() { Code = StatusCodes.Status400BadRequest, Msg = "Bad Request" };
+        }
+
+        public async Task<JsonView> _List()
+        {
+            return _view;
+        }
+
+    }
+}