From fb8c34f6049350498efd4c52d136a53b20c7822f Mon Sep 17 00:00:00 2001 From: Zel Date: Wed, 5 Mar 2025 23:26:50 +0800 Subject: [PATCH] 1 --- README.md | 38 +----- .../CustomerOrder/CustomerOrderEntity.cs | 120 +++++++++++++++++- .../CustomerOrder/CustomerOrderService.cs | 22 +++- .../Views/Flowscheme/LineInfo.cshtml | 4 +- WaterCloud.Web/Properties/launchSettings.json | 9 -- WaterCloud.Web/appsettings.Development.json | 4 +- .../local/20250305/202503052219521833.png | Bin 0 -> 63926 bytes .../local/20250305/202503052219543239.png | Bin 0 -> 63926 bytes .../local/20250305/202503052219545293.png | Bin 0 -> 63926 bytes .../local/20250305/202503052219546111.png | Bin 0 -> 63926 bytes .../local/20250305/202503052220471085.png | Bin 0 -> 63926 bytes 11 files changed, 142 insertions(+), 55 deletions(-) create mode 100644 WaterCloud.Web/wwwroot/file/local/20250305/202503052219521833.png create mode 100644 WaterCloud.Web/wwwroot/file/local/20250305/202503052219543239.png create mode 100644 WaterCloud.Web/wwwroot/file/local/20250305/202503052219545293.png create mode 100644 WaterCloud.Web/wwwroot/file/local/20250305/202503052219546111.png create mode 100644 WaterCloud.Web/wwwroot/file/local/20250305/202503052220471085.png diff --git a/README.md b/README.md index 1445ff2..e2937cf 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,3 @@ -

-

- -

- -

-
- -[![star](https://gitee.com/qian_wei_hong/WaterCloud/badge/star.svg)](https://gitee.com/qian_wei_hong/WaterCloud/stargazers) -[![fork](https://gitee.com/qian_wei_hong/WaterCloud/badge/fork.svg)](https://gitee.com/qian_wei_hong/WaterCloud/members) -![](https://img.shields.io/badge/release-3.0.0.preview-red) - -![](https://img.shields.io/badge/.net-8.0.0-blue) -![](https://img.shields.io/badge/SqlSugar-5.1.4.59-blue) -![](https://img.shields.io/badge/layui-2.9.0-blue) -
- ----- # WaterCloud #### 介绍 @@ -37,9 +19,6 @@ - 适用范围：可以开发OA、ERP、BPM、CRM、WMS、TMS、MIS、BI、电商平台后台、物流管理系统、快递管理系统、教务管理系统等各类管理软件。 - 租户管理，基于Database的多租户功能(SqlSugar支持)。 - 定时任务，基于quartz的定时任务功能(可以集群)。 -- 项目演示地址：http://47.116.127.212:5000/ （账号：admin 密码：0000，数据库2个小时还原一次） -- 文档地址：https://gitee.com/qian_wei_hong/WaterCloud/wikis/pages -- 在线项目地址：https://replit.com/@MonsterUncle/WaterCloud #### 前端以及后端使用技术介绍 @@ -83,19 +62,4 @@ 2. Asp.net 8.0； 3. Mysql或者SQLSERVER2005及以上版本，database文件夹下有sql文件可执行； 4. 请使用VS2022及以上版本打开解决方案。 -5. Redis和RabbitMq在项目文件夹里有 - -#### 友情链接 - -1. 前端框架Layui 文档地址：https://layui.gitee.io/v2/ -2. Layui前端框架Layuimini 码云地址：https://gitee.com/zhongshaofa/layuimini -3. SqlSugar.ORM 文档地址：https://www.donet5.com/home/doc -4. WaterCloud讨论交流QQ群（1065447456）[![](https://pub.idqqimg.com/wpa/images/group.png)](https://jq.qq.com/?_wv=1027&k=51RHQVG) -5. .NET易用底层框架 Furion，码云地址：https://gitee.com/dotnetchina/Furion - -#### 捐赠支持 - -开源项目不易，若此项目能得到你的青睐，可以捐赠支持作者持续开发与维护，感谢所有支持开源的朋友。 - - -![输入图片说明](https://images.gitee.com/uploads/images/2020/0331/144842_7cf04ad6_7353672.jpeg "1585637076201.jpg") ![输入图片说明](https://images.gitee.com/uploads/images/2020/0331/144852_8b26c8cb_7353672.png "mm_facetoface_collect_qrcode_1585637044089.png") \ No newline at end of file +5. Redis和RabbitMq在项目文件夹里有 \ No newline at end of file diff --git a/WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs b/WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs index f051fec..ace5c16 100644 --- a/WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs +++ b/WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs @@ -1,6 +1,122 @@ -namespace WaterCloud.Domain.Entity.CustomerOrder; +using SqlSugar; +using System; +using System.ComponentModel.DataAnnotations; -public class CustomerOrderEntity +namespace WaterCloud.Domain.Entity.CustomerOrder; + +[SugarTable("cms_customerorder")] +public class CustomerOrderEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited { + #region 通用部分 + + /// + /// Key + /// + [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true, ColumnDescription = "主键Id")] + public string F_Id { get; set; } + + /// + /// 逻辑删除标志 + /// + /// + [SugarColumn(IsNullable = true, ColumnDescription = "逻辑删除标志")] + public bool? F_DeleteMark { get; set; } + + /// + /// 创建时间 + /// + /// + [SugarColumn(IsNullable = true, ColumnDescription = "创建时间")] + public DateTime? F_CreatorTime { get; set; } + + /// + /// 创建人 + /// + /// + [SugarColumn(IsNullable = true, ColumnName = "F_CreatorUserId", ColumnDataType = "nvarchar(50)", + ColumnDescription = "创建人")] + public string F_CreatorUserId { get; set; } + + /// + /// 最后修改时间 + /// + /// + [SugarColumn(IsNullable = true, ColumnDescription = "最后修改时间")] + public DateTime? F_LastModifyTime { get; set; } + + /// + /// 最后修改人 + /// + /// + [SugarColumn(IsNullable = true, ColumnName = "F_LastModifyUserId", ColumnDataType = "nvarchar(50)", + ColumnDescription = "最后修改人")] + public string F_LastModifyUserId { get; set; } + + /// + /// 删除时间 + /// + /// + [SugarColumn(IsNullable = true, ColumnDescription = "删除时间")] + public DateTime? F_DeleteTime { get; set; } + + /// + /// 删除人 + /// + /// + [SugarColumn(IsNullable = true, ColumnName = "F_DeleteUserId", ColumnDataType = "nvarchar(50)", + ColumnDescription = "删除人")] + public string F_DeleteUserId { get; set; } + + #endregion + + /// + /// 客户名称 + /// + [Required(ErrorMessage = "客户名称不能为空")] + [SugarColumn(IsNullable = true, ColumnName = "F_Name", ColumnDataType = "nvarchar(200)", + ColumnDescription = "客户名称")] + public string F_Name { get; set; } + + /// + /// 对接人 + /// + [SugarColumn(IsNullable = true, ColumnName = "F_ContactPerson", ColumnDataType = "nvarchar(200)", + ColumnDescription = "对接人")] + public string F_ContactPerson { get; set; } + + /// + /// 开始合作时间 + /// + [SugarColumn(IsNullable = true, ColumnName = "F_CooperationTime", ColumnDescription = "开始合作时间")] + public DateTime? F_CooperationTime { get; set; } + + /// + /// 贴文时间 + /// + [SugarColumn(IsNullable = true, ColumnName = "F_PostTime", ColumnDescription = "发帖时间")] + public DateTime? F_PostTime { get; set; } + + /// + /// 合作进展 1:持续合作 0：断续 + /// + [SugarColumn(IsNullable = true, ColumnName = "F_OrderState", ColumnDescription = "合作进展")] + public int? F_OrderState { get; set; } + /// + /// 附件 + /// + [SugarColumn(ColumnName="F_Attachment", ColumnDescription = "模板文件",ColumnDataType = "nvarchar(200)")] + public string F_Attachment{ get; set; } + + /// + /// 联系方式 + /// + [SugarColumn(ColumnName="F_Contact", ColumnDescription = "联系方式",ColumnDataType = "nvarchar(500)")] + public string F_Contact { get; set; } + + /// + /// 对接情况 + /// + [SugarColumn(IsNullable = true, ColumnName = "F_Docking", ColumnDescription = "对接情况",ColumnDataType = "nvarchar(100)")] + public string F_Docking { get; set; } } \ No newline at end of file diff --git a/WaterCloud.Service/CustomerOrder/CustomerOrderService.cs b/WaterCloud.Service/CustomerOrder/CustomerOrderService.cs index 87a7925..c72d28e 100644 --- a/WaterCloud.Service/CustomerOrder/CustomerOrderService.cs +++ b/WaterCloud.Service/CustomerOrder/CustomerOrderService.cs @@ -1,6 +1,22 @@ -namespace WaterCloud.Service.CustomerOrder; +using System.Collections.Generic; +using System.Threading.Tasks; +using SqlSugar; +using WaterCloud.Domain.Entity.CustomerOrder; -public class CustomerOrderService +namespace WaterCloud.Service.CustomerOrder; + +public class CustomerOrderService:BaseService,IDenpendency { - + public CustomerOrderService(ISqlSugarClient context) : base(context) + { + } + + + public async Task> GetList(string keyword = "") + { + var query = repository.IQueryable(); + if (!string.IsNullOrWhiteSpace(keyword)) + query = query.Where(oo=>oo.F_Name.Contains(keyword)); + return await query.OrderBy(oo=>oo.F_CreatorTime).ToListAsync(); + } } \ No newline at end of file diff --git a/WaterCloud.Web/Areas/SystemManage/Views/Flowscheme/LineInfo.cshtml b/WaterCloud.Web/Areas/SystemManage/Views/Flowscheme/LineInfo.cshtml index ac17c70..7251cd8 100644 --- a/WaterCloud.Web/Areas/SystemManage/Views/Flowscheme/LineInfo.cshtml +++ b/WaterCloud.Web/Areas/SystemManage/Views/Flowscheme/LineInfo.cshtml @@ -20,9 +20,9 @@