1

README.md

@@ -1,21 +1,3 @@
-<p></p>
-<p></p>
-
-<p align="center">
-<img src="https://images.gitee.com/uploads/images/2021/0528/215200_accc4311_7353672.jpeg" height="80"/>
-</p>
-<div align="center">
-
-[![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)
-</div>
-
-----
 # 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
 
 #### 前端以及后端使用技术介绍
 
@@ -84,18 +63,3 @@
 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")

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<CustomerOrderEntity>, ICreationAudited, IModificationAudited, IDeleteAudited
 {
+    #region 通用部分
 
+    /// <summary>
+    /// Key
+    /// </summary>
+    [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true, ColumnDescription = "主键Id")]
+    public string F_Id { get; set; }
+
+    /// <summary>
+    /// 逻辑删除标志
+    /// </summary>
+    /// <returns></returns>
+    [SugarColumn(IsNullable = true, ColumnDescription = "逻辑删除标志")]
+    public bool? F_DeleteMark { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    /// <returns></returns>
+    [SugarColumn(IsNullable = true, ColumnDescription = "创建时间")]
+    public DateTime? F_CreatorTime { get; set; }
+
+    /// <summary>
+    /// 创建人
+    /// </summary>
+    /// <returns></returns>
+    [SugarColumn(IsNullable = true, ColumnName = "F_CreatorUserId", ColumnDataType = "nvarchar(50)",
+        ColumnDescription = "创建人")]
+    public string F_CreatorUserId { get; set; }
+
+    /// <summary>
+    /// 最后修改时间
+    /// </summary>
+    /// <returns></returns>
+    [SugarColumn(IsNullable = true, ColumnDescription = "最后修改时间")]
+    public DateTime? F_LastModifyTime { get; set; }
+
+    /// <summary>
+    /// 最后修改人
+    /// </summary>
+    /// <returns></returns>
+    [SugarColumn(IsNullable = true, ColumnName = "F_LastModifyUserId", ColumnDataType = "nvarchar(50)",
+        ColumnDescription = "最后修改人")]
+    public string F_LastModifyUserId { get; set; }
+
+    /// <summary>
+    /// 删除时间
+    /// </summary>
+    /// <returns></returns>
+    [SugarColumn(IsNullable = true, ColumnDescription = "删除时间")]
+    public DateTime? F_DeleteTime { get; set; }
+
+    /// <summary>
+    /// 删除人
+    /// </summary>
+    /// <returns></returns>
+    [SugarColumn(IsNullable = true, ColumnName = "F_DeleteUserId", ColumnDataType = "nvarchar(50)",
+        ColumnDescription = "删除人")]
+    public string F_DeleteUserId { get; set; }
+
+    #endregion
+
+    /// <summary>
+    /// 客户名称
+    /// </summary>
+    [Required(ErrorMessage = "客户名称不能为空")]
+    [SugarColumn(IsNullable = true, ColumnName = "F_Name", ColumnDataType = "nvarchar(200)",
+        ColumnDescription = "客户名称")]
+    public string F_Name { get; set; }
+
+    /// <summary>
+    /// 对接人
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnName = "F_ContactPerson", ColumnDataType = "nvarchar(200)",
+        ColumnDescription = "对接人")]
+    public string F_ContactPerson { get; set; }
+
+    /// <summary>
+    /// 开始合作时间
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnName = "F_CooperationTime", ColumnDescription = "开始合作时间")]
+    public DateTime? F_CooperationTime { get; set; }
+
+    /// <summary>
+    /// 贴文时间
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnName = "F_PostTime", ColumnDescription = "发帖时间")]
+    public DateTime? F_PostTime { get; set; }
+
+    /// <summary>
+    /// 合作进展 1:持续合作 0：断续
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnName = "F_OrderState", ColumnDescription = "合作进展")]
+    public int? F_OrderState { get; set; }
+    
+    /// <summary>
+    /// 附件
+    /// </summary>
+    [SugarColumn(ColumnName="F_Attachment", ColumnDescription = "模板文件",ColumnDataType = "nvarchar(200)")]
+    public string F_Attachment{ get; set; }
+
+    /// <summary>
+    /// 联系方式
+    /// </summary>
+    [SugarColumn(ColumnName="F_Contact", ColumnDescription = "联系方式",ColumnDataType = "nvarchar(500)")]
+    public string F_Contact { get; set; }
+
+    /// <summary>
+    /// 对接情况
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnName = "F_Docking", ColumnDescription = "对接情况",ColumnDataType = "nvarchar(100)")]
+    public string F_Docking { get; set; }
 }

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<CustomerOrderEntity>,IDenpendency
+{
+    public CustomerOrderService(ISqlSugarClient context) : base(context)
     {
-    
+    }
+
+
+    public async Task<List<CustomerOrderEntity>> 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();
+    }
 }

WaterCloud.Web/Areas/SystemManage/Views/Flowscheme/LineInfo.cshtml

@@ -20,9 +20,9 @@
             <select id="ComparesOperation" name="ComparesOperation" lay-verify="required" lay-search>
                 <option value="" selected>请选择</option>
                 <option value=">">></option>
-                <option value=">=">>=</option>
+                <option value=">=">≥</option>
                 <option value="<"><</option>
-                <option value="<="><=</option>
+                <option value="<=">≤</option>
                 <option value="=">=</option>
                 <option value="!=">!=</option>
                 <option value="in">in</option>

WaterCloud.Web/Properties/launchSettings.json

@@ -8,15 +8,6 @@
     }
   },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "sqlDebugging": false,
-      "nativeDebugging": true
-    },
     "WaterCloud.Web": {
       "commandName": "Project",
       "launchBrowser": true,

WaterCloud.Web/appsettings.Development.json

@@ -14,8 +14,8 @@
     "DBProvider": "MySql", //SqlServer //Oracle
     "DBConnectionString": "server=192.168.31.37;user id=root;password=zhuyunyu;database=water",
     "DBCommandTimeout": 180, // 数据库超时时间，单位秒
-    "IsInitDb": true, //是否初始化数据库
+    "IsInitDb": false, //是否初始化数据库
-    "IsSeedData": true, //是否初始化数据库数据
+    "IsSeedData": false, //是否初始化数据库数据
     "CacheProvider": "Redis", // 缓存使用方式 Redis/Memory
     "RedisConnectionString": "192.168.31.37:6379,password=zhuyunyu", //docker部署 172.17.0.1
     "TokenName": "WC-Token", //api Token名称