完成页面操作api

OASystem/EntitySync/Program.cs

@@ -80,6 +80,10 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
 
     //typeof(Sys_Message),
     //typeof(Sys_MessageReadAuth)
-    typeof(Crm_DeleClient)
+    //typeof(Crm_DeleClient)
+    //typeof(Crm_NewClientData)
+
+    typeof(Crm_ClientDataAndUser),
+    typeof(Crm_ClientDataAndBusiness),
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1433,7 +1433,7 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> OperationFunInit(OperationFunInitDta dto)
+        public async Task<IActionResult> OperationFun(OperationFunInitDta dto)
         {
             try
             {
@@ -1458,11 +1458,11 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> DelFunInit(DelFunInitDta dto)
+        public async Task<IActionResult> DelFun(DelFunInitDta dto)
         {
             try
             {
-                var res = await _PageFunctionPermissionRepository.SoftDeleteByIdAsync<Res_HotelData>(dto.Id.ToString(), dto.DeleteUserId);
+                var res = await _PageFunctionPermissionRepository.SoftDeleteByIdAsync<Sys_PageFunctionPermission>(dto.Id.ToString(), dto.DeleteUserId);
                 if (!res)
                 {
                     return Ok(JsonView(false, "删除失败"));
@@ -1472,7 +1472,6 @@ namespace OASystem.API.Controllers
             catch (Exception ex)
             {
                 return Ok(JsonView(false, "程序错误！"));
-                throw;
             }
         }
         #endregion

OASystem/OASystem.Domain/Entities/Customer/Crm_ClientDataAndBusiness.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Customer
+{
+    [SugarTable("Crm_ClientDataAndBusiness")]
+    public class Crm_ClientDataAndBusiness:EntityBase
+    {
+        /// <summary>
+        /// setdataid
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int SetDataId { get; set; }
+
+        /// <summary>
+        /// 新客户资源表id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int NewClientDataId { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Customer/Crm_ClientDataAndUser.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Customer
+{
+    [SugarTable("Crm_ClientDataAndUser")]
+    public class Crm_ClientDataAndUser: EntityBase
+    {
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int usersId { get; set; }
+
+        /// <summary>
+        /// 新客户资源表id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int NewClientDataId { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Customer/Crm_NewClientData.cs

@@ -0,0 +1,165 @@
+using Org.BouncyCastle.Asn1.Ocsp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static Google.Protobuf.Reflection.SourceCodeInfo.Types;
+
+namespace OASystem.Domain.Entities.Customer
+{
+    /// <summary>
+    /// 新客户资料表
+    /// </summary>
+    [SugarTable("Crm_NewClientData")]
+    public class Crm_NewClientData : EntityBase
+    {
+        private int number;
+        private int lvlid;
+        private string client;
+        private string weight;
+        private string clientshort;
+        private string contact;
+        private int gender;
+        private string passport;
+        private DateTime? passportDate;
+        private string job;
+        private string telephone;
+        private string phone;
+        private string email;
+        private string location;
+        private string address;
+        private DateTime? birthday;
+        private string otherinfo;
+        private string wechat;
+        private int category;
+        private int predele;
+        private int finlishedDele;
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Number { get => number; set => number = value; }
+
+        /// <summary>
+        /// 地市州Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Lvlid { get => lvlid; set => lvlid = value; }
+
+        /// <summary>
+        /// 客户单位
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Client { get => client; set => client = value; }
+
+        /// <summary>
+        /// 权重
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string Weight { get => weight; set => weight = value; }
+
+        /// <summary>
+        /// 客户单位简写
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Clientshort { get => clientshort; set => clientshort = value; }
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Contact { get => contact; set => contact = value; }
+
+        /// <summary>
+        /// 联系人性别
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Gender { get => gender; set => gender = value; }
+
+        /// <summary>
+        /// 护照
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Passport { get => passport; set => passport = value; }
+
+        /// <summary>
+        /// 护照日期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime? PassportDate { get => passportDate; set => passportDate = value; }
+
+        /// <summary>
+        /// 职位
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Job { get => job; set => job = value; }
+
+        /// <summary>
+        /// 联系手机号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Telephone { get => telephone; set => telephone = value; }
+
+        /// <summary>
+        /// 联系座机号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Phone { get => phone; set => phone = value; }
+
+        /// <summary>
+        /// 邮件
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Email { get => email; set => email = value; }
+
+        /// <summary>
+        /// 所属区域(所在城市)
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Location { get => location; set => location = value; }
+
+        /// <summary>
+        /// 地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(80)")]
+        public string Address { get => address; set => address = value; }
+
+        /// <summary>
+        /// 生日
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "Date")]
+        public DateTime? Birthday { get => birthday; set => birthday = value; }
+
+        /// <summary>
+        /// 其他信息
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Otherinfo { get => otherinfo; set => otherinfo = value; }
+
+        /// <summary>
+        /// 微信
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Wechat { get => wechat; set => wechat = value; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Category { get => category; set => category = value; }
+
+        /// <summary>
+        /// 预计出团
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Predele { get => predele; set => predele = value; }
+
+        /// <summary>
+        /// 已出团
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int FinlishedDele { get => finlishedDele; set => finlishedDele = value; }
+    }
+}

OASystem/_Doc/OA2023数据字典.docx

@@ -1432,6 +1432,144 @@ Null
 0否1是
 
 
+8) 新客户资料信息表：Crm_NewClientData（可挪用）
+                                   字段名
+                                 类型长度
+                                 字段属性
+                                 字段约束
+                                 字段描述
+                                    备注
+number
+Int
+Null
+
+序号
+
+lvlId
+Int
+Null
+
+地市州id
+
+client
+varchar(50)
+Null
+
+客户单位
+
+weight
+varchar(20)
+
+
+权重
+
+clientshort
+varchar(50)
+
+
+客户单位简写
+
+contact
+varchar(50)
+
+
+联系人
+
+gender 
+int
+
+
+联系人性别
+0男1女
+passport
+varchar(50)
+
+
+护照
+
+passportDate
+DateTime
+
+
+护照日期
+
+job
+varchar(50)
+
+
+职位
+
+telephone
+varchar(50)
+
+
+联系手机号
+
+phone
+varchar(50)
+
+
+联系座机号
+
+email
+varchar(50)
+
+
+ 邮件
+
+location
+varchar(50)
+
+
+所属区域(所在城市)
+
+address
+varchar(80)
+
+
+地址
+
+birthday
+Date
+
+
+生日
+
+otherinfo
+varchar(50)
+
+
+其他信息
+
+wechat
+varchar(50)
+
+
+微信
+
+category
+int
+
+
+分类
+setdataid
+predele
+int
+
+
+预计出团
+
+finlishedDele
+int
+
+
+已出团
+
+
+
+
+
+
 1. 团组模块