leiy 1 рік тому
батько
коміт
02b7e82ba6

+ 36 - 0
OASystem/.claudiaideconfig

@@ -0,0 +1,36 @@
+{
+  "BackgroundImageAbsolutePath": "C:\\Users\\Lyyyi\\Pictures\\Camera Roll\\wallhaven2.png",
+  "BackgroundImagesDirectoryAbsolutePath": "C:\\Users\\Lyyyi\\Pictures\\Camera Roll",
+  "BlurMethod": 0,
+  "BlurRadius": 0,
+  "ExpandToIDE": true,
+  "Extensions": ".png, .jpg, .gif, .bmp",
+  "ImageBackgroundType": 1,
+  "ImageFadeAnimationInterval": "PT2S",
+  "ImageStretch": 1,
+  "IsLimitToMainlyEditorWindow": true,
+  "IsTransparentToContentMargin": true,
+  "IsTransparentToStickyScroll": false,
+  "LoopSlideshow": false,
+  "MaxHeight": 0,
+  "MaxWidth": 0,
+  "Opacity": 0.5,
+  "PositionHorizon": 1,
+  "PositionVertical": 1,
+  "ShuffleSlideshow": false,
+  "SoftEdgeX": 0,
+  "SoftEdgeY": 0,
+  "StickyScrollColor": "#00000000",
+  "TileMode": 0,
+  "UpdateImageInterval": "PT1M",
+  "ViewBoxPointX": 0,
+  "ViewBoxPointY": 0,
+  "ViewPortHeight": 1,
+  "ViewPortPointX": 0,
+  "ViewPortPointY": 0,
+  "ViewPortWidth": 1,
+  "WebApiDownloadInterval": "PT5M",
+  "WebApiEndpoint": "",
+  "WebApiJsonKey": "",
+  "WebSingleUrl": ""
+}

+ 3 - 1
OASystem/EntitySync/Program.cs

@@ -126,7 +126,9 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Fin_GroupExtraCost), //超支费用 
     //typeof(Pm_TaskAllocation), //任务分配 
     //typeof(Pm_TaskRelevanceUser), //任务分配关联人员(完成者) 
-    typeof(Pm_TaskJobRelevancy), //任务分配关联人员(完成者) 
+    //typeof(Pm_TaskJobRelevancy), //任务分配关联人员(完成者) 
+    typeof(Crm_TableOperationRecord), //表操作记录 
+
 
 });
 Console.WriteLine("数据库结构同步完成!");

+ 51 - 1
OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -6,10 +6,12 @@ using OASystem.API.OAMethodLib.ExcelOutput;
 using OASystem.Domain.Common;
 using OASystem.Domain.Dtos.Baidu;
 using OASystem.Domain.Dtos.Business;
+using OASystem.Domain.Dtos.CRM;
 using OASystem.Domain.Dtos.FileDto;
 using OASystem.Domain.Dtos.Financial;
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Business;
+using OASystem.Domain.Entities.Customer;
 using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.Entities.Resource;
@@ -17,6 +19,7 @@ using OASystem.Domain.ViewModels.Business;
 using OASystem.Domain.ViewModels.Financial;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Repositories.Business;
+using OASystem.Infrastructure.Repositories.CRM;
 using OASystem.Infrastructure.Repositories.Groups;
 using OASystem.Infrastructure.Repositories.System;
 using Org.BouncyCastle.Asn1.Mozilla;
@@ -35,14 +38,17 @@ namespace OASystem.API.Controllers
         private readonly SetDataRepository _setDataRep;
         private readonly DelegationInfoRepository _groupRep;
         private readonly TeamRateRepository _teamRateRep;
+        private readonly TableOperationRecordRepository _TableOperationRecordRep;
 
-        public BusinessController( IMapper mapper, CommonBusRepository busRep, SetDataRepository setDataRep, DelegationInfoRepository groupRep, TeamRateRepository teamRateRep)
+        public BusinessController( IMapper mapper, CommonBusRepository busRep, SetDataRepository setDataRep, DelegationInfoRepository groupRep, TeamRateRepository teamRateRep,
+            TableOperationRecordRepository tableOperationRecordRep)
         {
             _mapper = mapper;
             _busRep = busRep;
             _setDataRep = setDataRep;
             _groupRep = groupRep;
             _teamRateRep = teamRateRep;
+            _TableOperationRecordRep = tableOperationRecordRep;
         }
 
         #region 团组信息 
@@ -662,6 +668,50 @@ Where c.ConfListId = {0}", ConfId);
 
         #endregion
 
+        #region 表操作记录
+
+        /// <summary>
+        /// 表操作记录
+        /// 添加
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostTableOperationRecordAdd(TableOperationRecordAddDto _dto )
+        {
+            try
+            {
+
+                Crm_TableOperationRecord _TableOperationRecord = new Crm_TableOperationRecord() 
+                {
+                    TableName = _dto.TableName,
+                    OperationItem = _dto.OperationItem,
+                    DataId = _dto.DataId,
+                    CreateUserId = _dto.UserId,
+                    CreateTime = DateTime.Now,
+                    Remark = "",
+                    IsDel = 0
+                };
+
+                bool _view = await _TableOperationRecordRep._Add(_TableOperationRecord); //币种类型
+                if (_view)
+                {
+                    return Ok(JsonView(true,"操作成功!"));
+                }
+                else
+                {
+                    return Ok(JsonView(false,"操作失败!"));
+                }
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误!"));
+            }
+        }
+
+        #endregion
+
+
         /// <summary>
         /// 汉字转拼音
         /// </summary>

+ 34 - 1
OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -5,6 +5,7 @@ using Microsoft.International.Converters.PinYinConverter;
 using OASystem.API.OAMethodLib.JuHeAPI;
 using OASystem.Domain;
 using OASystem.Domain.Dtos.Financial;
+using OASystem.Domain.Entities.Customer;
 using OASystem.Domain.Entities.District;
 using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.Entities.Groups;
@@ -13,6 +14,7 @@ using OASystem.Domain.Entities.System;
 using OASystem.Domain.ViewModels.Financial;
 using OASystem.Domain.ViewModels.JuHeExchangeRate;
 using OASystem.Domain.ViewModels.PersonnelModule;
+using OASystem.Infrastructure.Repositories.CRM;
 using OASystem.Infrastructure.Repositories.Groups;
 using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
@@ -29,6 +31,7 @@ namespace OASystem.API.OAMethodLib
         private readonly static TeamRateRepository _teamRateRep = AutofacIocManager.Instance.GetService<TeamRateRepository>();
         private readonly static IJuHeApiService _juHeApiService = AutofacIocManager.Instance.GetService<IJuHeApiService>();
         private readonly static SetDataRepository _setDataRep = AutofacIocManager.Instance.GetService<SetDataRepository>();
+        private readonly static TableOperationRecordRepository _tableOperationRecordRep = AutofacIocManager.Instance.GetService<TableOperationRecordRepository>();
         private readonly static HttpContext _httpContext ;
 
         #region 消息
@@ -481,7 +484,6 @@ namespace OASystem.API.OAMethodLib
 
         #endregion
 
-
         #region 汉字转换拼音
         private static Dictionary<int, List<string>> GetTotalPingYinDictionary(string text)
         {
@@ -578,5 +580,36 @@ namespace OASystem.API.OAMethodLib
             return result;
         }
         #endregion
+
+        #region 新客户资料表 操作记录
+
+        /// <summary>
+        /// 新客户资料表
+        /// 操作记录添加
+        /// </summary>
+        /// <param name="operationEnum"></param>
+        /// <param name="userId"></param>
+        /// <param name="dataId"></param>
+        /// <param name="remark"></param>
+        /// <returns></returns>
+        public static async Task<bool> NewClientOperationRecordAdd(OperationEnum operationEnum,int userId,int dataId,string remark )
+        {
+            Crm_TableOperationRecord _TableOperationRecord = new Crm_TableOperationRecord()
+            {
+                TableName = "Crm_NewClientData",
+                OperationItem = operationEnum,
+                DataId = dataId,
+                CreateUserId = userId,
+                CreateTime = DateTime.Now,
+                Remark = remark
+            };
+
+            bool add = await _tableOperationRecordRep._Add(_TableOperationRecord);
+            if (add) return false;
+
+            return false;
+        }
+
+        #endregion
     }
 }

+ 42 - 0
OASystem/OASystem.Domain/Dtos/CRM/TableOperationRecordDto.cs

@@ -0,0 +1,42 @@
+using OASystem.Domain.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Dtos.CRM
+{
+    public class TableOperationRecordDto
+    {
+    }
+
+    /// <summary>
+    /// 表操作记录
+    /// Add Dto
+    /// </summary>
+    public class TableOperationRecordAddDto
+    {
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 表名
+        /// "Crm_NewClientData" 客户资料表
+        /// </summary>
+        public string? TableName { get; set; }
+
+        /// <summary>
+        /// 操作项目
+        /// 0 未操作 1浏览列表 2 浏览详情 3 添加 4 修改 5 删除 6 审核 7 上传 8 下载
+        /// </summary>
+        public OperationEnum OperationItem { get; set; } = OperationEnum.NoOperation;
+
+        /// <summary>
+        /// 数据Id
+        /// </summary>
+        public int DataId { get; set; } = 0;
+    }
+}

+ 36 - 0
OASystem/OASystem.Domain/Entities/Customer/Crm_TableOperationRecord.cs

@@ -0,0 +1,36 @@
+using OASystem.Domain.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Customer
+{
+    /// <summary>
+    /// 表操作记录
+    /// </summary>
+    [SugarTable("Crm_TableOperationRecord")]
+    public class Crm_TableOperationRecord : EntityBase
+    {
+        /// <summary>
+        /// 表名
+        /// "Crm_NewClientData" 客户资料表
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string? TableName { get; set; }
+
+        /// <summary>
+        /// 操作项目
+        /// 0 未操作 1浏览列表 2 浏览详情 3 添加 4 修改 5 删除 6 审核 7 上传 8 下载
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public OperationEnum OperationItem { get; set; } = OperationEnum.NoOperation;
+
+        /// <summary>
+        /// 数据Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DataId { get; set; } = 0;
+    }
+}

+ 61 - 0
OASystem/OASystem.Domain/Enums/OperationEnum.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Enums
+{
+    /// <summary>
+    /// 操作项目
+    /// </summary>
+    public enum OperationEnum : int
+    {
+        /// <summary>
+        /// 未操作
+        /// </summary>
+        [Description("未操作")]
+        NoOperation = 0,
+        /// <summary>
+        /// 列表
+        /// </summary>
+        [Description("列表")]
+        List = 1,
+        /// <summary>
+        /// 详情
+        /// </summary>
+        [Description("详情")]
+        Details = 2,
+        /// <summary>
+        /// 添加
+        /// </summary>
+        [Description("添加")]
+        Add = 3,
+        /// <summary>
+        /// 编辑
+        /// </summary>
+        [Description("编辑")]
+        Edit = 4,
+        /// <summary>
+        /// 删除
+        /// </summary>
+        [Description("删除")]
+        Del = 5,
+        /// <summary>
+        /// 审核
+        /// </summary>
+        [Description("审核")]
+        Audit = 6,
+        /// <summary>
+        /// 上传
+        /// </summary>
+        [Description("上传")]
+        Upload = 7,
+        /// <summary>
+        /// 下载
+        /// </summary>
+        [Description("下载")]
+        Download = 8,
+    }
+}

+ 16 - 0
OASystem/OASystem.Domain/ViewModels/CRM/TableOperationRecordView.cs

@@ -0,0 +1,16 @@
+using OASystem.Domain.Entities.Customer;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.CRM
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class TableOperationRecordView : Crm_TableOperationRecord
+    {
+    }
+}

+ 39 - 0
OASystem/OASystem.Infrastructure/Repositories/CRM/TableOperationRecordRepository.cs

@@ -0,0 +1,39 @@
+using AutoMapper;
+using OASystem.Domain.Entities.Customer;
+using OASystem.Domain.ViewModels.CRM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Infrastructure.Repositories.CRM
+{
+    /// <summary>
+    /// 表操作记录
+    /// </summary>
+    public class TableOperationRecordRepository : BaseRepository<Crm_TableOperationRecord, TableOperationRecordView>
+    {
+        private readonly IMapper _mapper;
+        public TableOperationRecordRepository(SqlSugarClient sqlSugar, IMapper mapper) :
+            base(sqlSugar)
+        {
+            this._mapper = mapper;
+        }
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="_TableOperationRecord"></param>
+        /// <returns></returns>
+        public async Task<bool> _Add(Crm_TableOperationRecord _TableOperationRecord)
+        {
+            var add = await _sqlSugar.Insertable(_TableOperationRecord).ExecuteCommandAsync();
+            if (add > 0)
+            {
+                return true;
+            }
+            return false;
+        }
+    }
+}