From 7f83b33308d91ec31673e215c5dbf77d61e2941e Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Mon, 29 Sep 2025 14:52:57 +0800 Subject: [PATCH] 重构：删除部门管理模块并修复预约记录服务 --- README.md | 2 -- antis-ncc-admin/.env.development | 4 ++-- antis-ncc-admin/src/views/lqBmzb/Form.vue | 122 -------------------------------------------------------------------------------------------------------------------------- antis-ncc-admin/src/views/lqBmzb/index.vue | 232 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- antis-ncc-admin/src/views/lqKhxx/index.vue | 51 ++++----------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbCrInput.cs | 27 --------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbInfoOutput.cs | 27 --------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListOutput.cs | 26 -------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListQueryInput.cs | 38 -------------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbUpInput.cs | 17 ----------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs | 2 +- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs | 25 ++++++++++++++++++++++++- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs | 5 ----- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs | 5 +++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs | 6 ++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlCrInput.cs | 16 ++++++++-------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlInfoOutput.cs | 33 ++++++++++++++++++++++++--------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListOutput.cs | 36 ++++++++++++++++++++++++++++-------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlInfoOutput.cs | 41 ++++++++++++++++++++++++++++------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListOutput.cs | 41 ++++++++++++++++++++++++++++------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md | 1 - netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_bmzb/LqBmzbEntity.cs | 33 --------------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs | 2 +- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yaoyjl/LqYaoyjlEntity.cs | 47 ++++++++++++++++++++++++++++++----------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yyjl/LqYyjlEntity.cs | 56 +++++++++++++++++++++++++++++++------------------------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/MemberTypeEnum.cs | 18 +++++++++--------- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqBmzbMapper.cs | 14 -------------- netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqBmzbService.cs | 6 ------ netcore/src/Modularity/Extend/NCC.Extend/LqBmzbService.cs | 225 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs | 11 ++--------- netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs | 2 ++ netcore/src/Modularity/Extend/NCC.Extend/LqYaoyjlService.cs | 29 ++++++++++++++++++++++++++++- netcore/src/Modularity/Extend/NCC.Extend/LqYyjlService.cs | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 33 files changed, 309 insertions(+), 941 deletions(-) delete mode 100644 antis-ncc-admin/src/views/lqBmzb/Form.vue delete mode 100644 antis-ncc-admin/src/views/lqBmzb/index.vue delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbCrInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbInfoOutput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListOutput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListQueryInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbUpInput.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_bmzb/LqBmzbEntity.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqBmzbMapper.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqBmzbService.cs delete mode 100644 netcore/src/Modularity/Extend/NCC.Extend/LqBmzbService.cs diff --git a/README.md b/README.md index bdf119f..9c72122 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,6 @@ lvqianmeiye_ERP/ 包含所有业务服务的具体实现，按功能分类： #### 📋 基础管理类 -- `LqBmzbService` - 部门管理服务 - `LqCpxxService` - 产品信息管理服务 - `LqKhxxService` - 客户信息管理服务 - `LqRyzlService` - 人员资料管理服务 @@ -173,7 +172,6 @@ npm run dev > 💡 **说明**：所有业务功能的核心代码都位于 `netcore/src/Modularity/Extend/` 模块中 ### 📋 基础管理模块 -- **部门管理** (`LqBmzbService`) - 组织架构管理，部门分类维护 - **产品信息** (`LqCpxxService`) - 产品档案管理，产品分类维护 - **客户信息** (`LqKhxxService`) - 客户档案管理，客户关系维护 - **人员资料** (`LqRyzlService`) - 员工信息管理，人员档案维护 diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development index 50e2ca9..2f8e237 100644 --- a/antis-ncc-admin/.env.development +++ b/antis-ncc-admin/.env.development @@ -1,6 +1,6 @@ # 开发 VUE_CLI_BABEL_TRANSPILE_MODULES = true -VUE_APP_BASE_API = 'http://lvqian.antissoft.com' -# VUE_APP_BASE_API = 'http://localhost:2011' +# VUE_APP_BASE_API = 'http://lvqian.antissoft.com' +VUE_APP_BASE_API = 'http://localhost:2011' VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket' diff --git a/antis-ncc-admin/src/views/lqBmzb/Form.vue b/antis-ncc-admin/src/views/lqBmzb/Form.vue deleted file mode 100644 index 91188b5..0000000 --- a/antis-ncc-admin/src/views/lqBmzb/Form.vue +++ /dev/null @@ -1,122 +0,0 @@ - - diff --git a/antis-ncc-admin/src/views/lqBmzb/index.vue b/antis-ncc-admin/src/views/lqBmzb/index.vue deleted file mode 100644 index dfefd4b..0000000 --- a/antis-ncc-admin/src/views/lqBmzb/index.vue +++ /dev/null @@ -1,232 +0,0 @@ - - \ No newline at end of file diff --git a/antis-ncc-admin/src/views/lqKhxx/index.vue b/antis-ncc-admin/src/views/lqKhxx/index.vue index bded0a9..fda37e7 100644 --- a/antis-ncc-admin/src/views/lqKhxx/index.vue +++ b/antis-ncc-admin/src/views/lqKhxx/index.vue @@ -32,7 +32,7 @@ - + @@ -241,49 +241,6 @@ - - - - - - - - - - - - - - - - - - - @@ -301,7 +258,7 @@ @@ -321,7 +278,7 @@ diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbCrInput.cs deleted file mode 100644 index c392dc6..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbCrInput.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Dto.LqBmzb -{ - /// - /// 部门管理修改输入参数 - /// - public class LqBmzbCrInput - { - /// - /// 部门编号 - /// - public string id { get; set; } - - /// - /// 部门名称 - /// - public string bmmc { get; set; } - - /// - /// 部门分类 - /// - public string bmfl { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbInfoOutput.cs deleted file mode 100644 index a51e3ad..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbInfoOutput.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Dto.LqBmzb -{ - /// - /// 部门管理输出参数 - /// - public class LqBmzbInfoOutput - { - /// - /// 部门编号 - /// - public string id { get; set; } - - /// - /// 部门名称 - /// - public string bmmc { get; set; } - - /// - /// 部门分类 - /// - public string bmfl { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListOutput.cs deleted file mode 100644 index 749d1c5..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListOutput.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; - -namespace NCC.Extend.Entitys.Dto.LqBmzb -{ - /// - /// 部门管理输入参数 - /// - public class LqBmzbListOutput - { - /// - /// 部门编号 - /// - public string id { get; set; } - - /// - /// 部门名称 - /// - public string bmmc { get; set; } - - /// - /// 部门分类 - /// - public string bmfl { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListQueryInput.cs deleted file mode 100644 index a4caf80..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListQueryInput.cs +++ /dev/null @@ -1,38 +0,0 @@ -using NCC.Common.Filter; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Dto.LqBmzb -{ - /// - /// 部门管理列表查询输入 - /// - public class LqBmzbListQueryInput : PageInputBase - { - /// - /// 选择导出数据key - /// - public string selectKey { get; set; } - - /// - /// - /// - public int dataType { get; set; } - - - /// - /// 部门编号 - /// - public string id { get; set; } - - /// - /// 部门名称 - /// - public string bmmc { get; set; } - - /// - /// 部门分类 - /// - public string bmfl { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbUpInput.cs deleted file mode 100644 index ee730f3..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Dto.LqBmzb -{ - /// - /// 部门管理更新输入参数 - /// - public class LqBmzbUpInput : LqBmzbCrInput - { - /// - /// 部门编号 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs index b03f8b7..4776a96 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs @@ -51,7 +51,7 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx /// /// 最近登录时间 /// - public string zjdlsj { get; set; } + public DateTime? zjdlsj { get; set; } /// diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs index 2199d47..18f2073 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs @@ -1,4 +1,6 @@ using System; +using NCC.Code; +using NCC.Extend.Entitys.Enum; namespace NCC.Extend.Entitys.Dto.LqKhxx { @@ -50,7 +52,7 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx /// /// 最近登录时间 /// - public string zjdlsj { get; set; } + public DateTime? zjdlsj { get; set; } /// /// 归属门店 @@ -58,6 +60,11 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx public string gsmd { get; set; } /// + /// 归属门店名称 + /// + public string gsmdName { get; set; } + + /// /// 注册时间 /// public DateTime? zcsj { get; set; } @@ -68,6 +75,22 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx public string khlx { get; set; } /// + /// + /// 客户类型名称 + /// + public string khlxName + { + get + { + if (string.IsNullOrEmpty(khlx)) return "无"; + if (int.TryParse(khlx, out var type)) + { + return EnumHelper.GetEnumDesc(type); + } + return "无"; + } + } + /// /// 客户阶段 /// public string khjd { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs index 012cb17..82b2a57 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs @@ -59,11 +59,6 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx public string wxxcxzt { get; set; } /// - /// 最近登录时间 - /// - public string zjdlsj { get; set; } - - /// /// 归属门店 /// public string gsmd { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs index 0ec4db3..cf9527e 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs @@ -64,6 +64,11 @@ namespace NCC.Extend.Entitys.Dto.LqTkjlb public string storeId { get; set; } /// + /// 所属门店名称 + /// + public string storeName { get; set; } + + /// /// 所属战队 /// public string teamName { get; set; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs index a70ae5a..52ce8f9 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs @@ -63,6 +63,11 @@ namespace NCC.Extend.Entitys.Dto.LqTkjlb public string storeId { get; set; } /// + /// 所属门店名称 + /// + public string storeName { get; set; } + + /// /// 所属战队 /// public string teamName { get; set; } @@ -72,6 +77,7 @@ namespace NCC.Extend.Entitys.Dto.LqTkjlb /// public string eventId { get; set; } + /// /// 拓客活动名称 /// diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlCrInput.cs index 87f1486..7455f34 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlCrInput.cs @@ -12,41 +12,41 @@ namespace NCC.Extend.Entitys.Dto.LqYaoyjl /// 邀约编号 /// public string id { get; set; } - + /// /// 邀约人 /// public string yyr { get; set; } - + /// /// 邀约时间 /// public DateTime? yysj { get; set; } - + /// /// 邀约客户 /// public string yykh { get; set; } - + /// /// 邀约客户姓名 /// public string yykhxm { get; set; } - + /// /// 电话是否有效 /// public string dhsfyx { get; set; } - + /// /// 联系时间 /// public DateTime? lxsj { get; set; } - + /// /// 联系记录 /// public string lxjl { get; set; } - + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlInfoOutput.cs index 2c9cce8..c448202 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlInfoOutput.cs @@ -12,46 +12,61 @@ namespace NCC.Extend.Entitys.Dto.LqYaoyjl /// 邀约编号 /// public string id { get; set; } - + /// /// 邀约人 /// public string yyr { get; set; } - + /// /// 邀约时间 /// public DateTime? yysj { get; set; } - + /// /// 邀约客户 /// public string yykh { get; set; } - + /// /// 邀约客户姓名 /// public string yykhxm { get; set; } - + /// /// 电话是否有效 /// public string dhsfyx { get; set; } - + /// /// 联系时间 /// public DateTime? lxsj { get; set; } - + /// /// 联系记录 /// public string lxjl { get; set; } - + /// /// 拓客编号 /// public string tkbh { get; set; } - + + /// + /// 所属门店ID + /// + public string storeId { get; set; } + + /// + /// 所属门店名称 + /// + public string storeName { get; set; } + + /// + /// 添加时间 + /// + public DateTime createTime { get; set; } + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListOutput.cs index e7cb08c..4f9d354 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListOutput.cs @@ -11,41 +11,61 @@ namespace NCC.Extend.Entitys.Dto.LqYaoyjl /// 邀约编号 /// public string id { get; set; } - + /// /// 邀约人 /// public string yyr { get; set; } - + + /// + /// 邀约人名称 + /// + public string yyrName { get; set; } + /// /// 邀约时间 /// public DateTime? yysj { get; set; } - + /// /// 邀约客户 /// public string yykh { get; set; } - + /// /// 邀约客户姓名 /// public string yykhxm { get; set; } - + /// /// 电话是否有效 /// public string dhsfyx { get; set; } - + /// /// 联系时间 /// public DateTime? lxsj { get; set; } - + /// /// 联系记录 /// public string lxjl { get; set; } - + + /// + /// 所属门店ID + /// + public string storeId { get; set; } + + /// + /// 所属门店名称 + /// + public string storeName { get; set; } + + /// + /// 添加时间 + /// + public DateTime createTime { get; set; } + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlInfoOutput.cs index 88b515e..843a62d 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlInfoOutput.cs @@ -12,66 +12,81 @@ namespace NCC.Extend.Entitys.Dto.LqYyjl /// 预约编号 /// public string id { get; set; } - + /// /// 单据门店 /// public string djmd { get; set; } - + + /// + /// 单据门店名称 + /// + public string djmdName { get; set; } + /// /// 邀约人 /// public string yyr { get; set; } - + + /// + /// 邀约人名称 + /// + public string yyrName { get; set; } + /// /// 顾客类型 /// public string gklx { get; set; } - + /// /// 预约体验项目 /// public string yytyxm { get; set; } - + /// /// 操作人 /// public string czr { get; set; } - + /// /// 操作时间 /// public DateTime? czsj { get; set; } - + /// /// 顾客 /// public string gk { get; set; } - + /// /// 顾客姓名 /// public string gkxm { get; set; } - + /// /// 预约健康师 /// public string yyjks { get; set; } - + + /// + /// 预约健康师名称 + /// + public string yyjksName { get; set; } + /// /// 预约开始时间 /// public DateTime? yysj { get; set; } - + /// /// 预约结束时间 /// public DateTime? yyjs { get; set; } - + /// /// 预约状态 /// public string F_Status { get; set; } - + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListOutput.cs index 80c6922..7b2369d 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListOutput.cs @@ -11,66 +11,81 @@ namespace NCC.Extend.Entitys.Dto.LqYyjl /// 预约编号 /// public string id { get; set; } - + /// /// 单据门店 /// public string djmd { get; set; } - + + /// + /// 单据门店名称 + /// + public string djmdName { get; set; } + /// /// 邀约人 /// public string yyr { get; set; } - + + /// + /// 邀约人名称 + /// + public string yyrName { get; set; } + /// /// 顾客类型 /// public string gklx { get; set; } - + /// /// 预约体验项目 /// public string yytyxm { get; set; } - + /// /// 操作人 /// public string czr { get; set; } - + /// /// 操作时间 /// public DateTime? czsj { get; set; } - + /// /// 顾客 /// public string gk { get; set; } - + /// /// 顾客姓名 /// public string gkxm { get; set; } - + /// /// 预约健康师 /// public string yyjks { get; set; } - + + /// + /// 预约健康师名称 + /// + public string yyjksName { get; set; } + /// /// 预约开始时间 /// public DateTime? yysj { get; set; } - + /// /// 预约结束时间 /// public DateTime? yyjs { get; set; } - + /// /// 预约状态 /// public string F_Status { get; set; } - + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md index 775e40b..bf3b176 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/README.md @@ -67,7 +67,6 @@ - `lq_yaoyjl/` - 邀约记录 - `lq_yxhdfa/` - 营销活动方案 - `lq_yyjl/` - 预约记录 -- `lq_bmzb/` - 部门总表 - `lq_cpxx/` - 产品资料 - `lq_gz/` - 工资全字段 - `lq_yy/` - 医院 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_bmzb/LqBmzbEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_bmzb/LqBmzbEntity.cs deleted file mode 100644 index fc7b16a..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_bmzb/LqBmzbEntity.cs +++ /dev/null @@ -1,33 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Extend.Entitys.lq_bmzb -{ - /// - /// 部门管理 - /// - [SugarTable("lq_bmzb")] - [Tenant(ClaimConst.TENANT_ID)] - public class LqBmzbEntity - { - /// - /// 部门编号 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 部门名称 - /// - [SugarColumn(ColumnName = "bmmc")] - public string Bmmc { get; set; } - - /// - /// 部门分类 - /// - [SugarColumn(ColumnName = "bmfl")] - public string Bmfl { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs index e80fee5..cd4b4c9 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs @@ -63,7 +63,7 @@ namespace NCC.Extend.Entitys.lq_khxx /// 最近登录时间 /// [SugarColumn(ColumnName = "zjdlsj")] - public string Zjdlsj { get; set; } + public DateTime? Zjdlsj { get; set; } /// /// 归属门店 diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yaoyjl/LqYaoyjlEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yaoyjl/LqYaoyjlEntity.cs index 0157ade..7d55036 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yaoyjl/LqYaoyjlEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yaoyjl/LqYaoyjlEntity.cs @@ -16,54 +16,67 @@ namespace NCC.Extend.Entitys.lq_yaoyjl /// [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] public string Id { get; set; } - + /// /// 邀约人 /// - [SugarColumn(ColumnName = "yyr")] + [SugarColumn(ColumnName = "yyr")] public string Yyr { get; set; } - + /// /// 邀约时间 /// - [SugarColumn(ColumnName = "yysj")] + [SugarColumn(ColumnName = "yysj")] public DateTime? Yysj { get; set; } - + /// /// 邀约客户 /// - [SugarColumn(ColumnName = "yykh")] + [SugarColumn(ColumnName = "yykh")] public string Yykh { get; set; } - + /// /// 邀约客户姓名 /// - [SugarColumn(ColumnName = "yykhxm")] + [SugarColumn(ColumnName = "yykhxm")] public string Yykhxm { get; set; } - + /// /// 电话是否有效 /// - [SugarColumn(ColumnName = "dhsfyx")] + [SugarColumn(ColumnName = "dhsfyx")] public string Dhsfyx { get; set; } - + /// /// 联系时间 /// - [SugarColumn(ColumnName = "lxsj")] + [SugarColumn(ColumnName = "lxsj")] public DateTime? Lxsj { get; set; } - + /// /// 联系记录 /// - [SugarColumn(ColumnName = "lxjl")] + [SugarColumn(ColumnName = "lxjl")] public string Lxjl { get; set; } - + /// /// 拓客编号 /// - [SugarColumn(ColumnName = "tkbh")] + [SugarColumn(ColumnName = "tkbh")] public string Tkbh { get; set; } - + + + /// + /// 所属门店ID + /// + [SugarColumn(ColumnName = "F_StoreId")] + public string StoreId { get; set; } + + /// + /// 添加时间 + /// + [SugarColumn(ColumnName = "F_CreateTime")] + public DateTime CreateTime { get; set; } = DateTime.Now; + } } \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yyjl/LqYyjlEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yyjl/LqYyjlEntity.cs index e67d841..576621c 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yyjl/LqYyjlEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yyjl/LqYyjlEntity.cs @@ -16,78 +16,84 @@ namespace NCC.Extend.Entitys.lq_yyjl /// [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] public string Id { get; set; } - + /// /// 单据门店 /// - [SugarColumn(ColumnName = "djmd")] + [SugarColumn(ColumnName = "djmd")] public string Djmd { get; set; } - + /// /// 邀约人 /// - [SugarColumn(ColumnName = "yyr")] + [SugarColumn(ColumnName = "yyr")] public string Yyr { get; set; } - + /// /// 顾客类型 /// - [SugarColumn(ColumnName = "gklx")] + [SugarColumn(ColumnName = "gklx")] public string Gklx { get; set; } - + /// /// 预约体验项目 /// - [SugarColumn(ColumnName = "yytyxm")] + [SugarColumn(ColumnName = "yytyxm")] public string Yytyxm { get; set; } - + /// /// 操作人 /// - [SugarColumn(ColumnName = "czr")] + [SugarColumn(ColumnName = "czr")] public string Czr { get; set; } - + /// /// 操作时间 /// - [SugarColumn(ColumnName = "czsj")] + [SugarColumn(ColumnName = "czsj")] public DateTime? Czsj { get; set; } - + /// /// 顾客 /// - [SugarColumn(ColumnName = "gk")] + [SugarColumn(ColumnName = "gk")] public string Gk { get; set; } - + /// /// 顾客姓名 /// - [SugarColumn(ColumnName = "gkxm")] + [SugarColumn(ColumnName = "gkxm")] public string Gkxm { get; set; } - + /// /// 预约健康师 /// - [SugarColumn(ColumnName = "yyjks")] + [SugarColumn(ColumnName = "yyjks")] public string Yyjks { get; set; } - + /// /// 预约开始时间 /// - [SugarColumn(ColumnName = "yysj")] + [SugarColumn(ColumnName = "yysj")] public DateTime? Yysj { get; set; } - + /// /// 预约结束时间 /// - [SugarColumn(ColumnName = "yyjs")] + [SugarColumn(ColumnName = "yyjs")] public DateTime? Yyjs { get; set; } - + /// /// 预约状态 /// - [SugarColumn(ColumnName = "F_Status")] + [SugarColumn(ColumnName = "F_Status")] public string F_Status { get; set; } - + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "F_CreateTime")] + public DateTime CreateTime { get; set; } + } } \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/MemberTypeEnum.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/MemberTypeEnum.cs index f7e8b33..fcd3a66 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/MemberTypeEnum.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/MemberTypeEnum.cs @@ -14,22 +14,22 @@ namespace NCC.Extend.Entitys.Enum 线索 = 0, /// - /// 潜客 + /// 新客 /// - [Description("潜客")] - 潜客 = 1, + [Description("新客")] + 新客 = 1, /// - /// 新客 + /// 散客 /// - [Description("新客")] - 新客 = 2, + [Description("散客")] + 散客 = 2, /// - /// 老客 + /// 会员 /// - [Description("老客")] - 老客 = 3, + [Description("会员")] + 会员 = 3, } } \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqBmzbMapper.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqBmzbMapper.cs deleted file mode 100644 index de7175b..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqBmzbMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NCC.Common.Helper; -using NCC.Extend.Entitys.Dto.LqBmzb; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Extend.Entitys.Mapper.LqBmzb -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqBmzbService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqBmzbService.cs deleted file mode 100644 index f6d7067..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqBmzbService.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace NCC.Extend.Interfaces.LqBmzb -{ - public interface ILqBmzbService - { - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqBmzbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqBmzbService.cs deleted file mode 100644 index effbd21..0000000 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqBmzbService.cs +++ /dev/null @@ -1,225 +0,0 @@ -// using NCC.Common.Core.Manager; -// using NCC.Common.Enum; -// using NCC.Common.Extension; -// using NCC.Common.Filter; -// using NCC.Dependency; -// using NCC.DynamicApiController; -// using NCC.FriendlyException; -// using NCC.Extend.Interfaces.LqBmzb; -// using Mapster; -// using Microsoft.AspNetCore.Mvc; -// using SqlSugar; -// using System; -// using System.Collections.Generic; -// using System.Linq; -// using System.Threading.Tasks; -// using NCC.Extend.Entitys.lq_bmzb; -// using NCC.Extend.Entitys.Dto.LqBmzb; -// using Yitter.IdGenerator; -// using NCC.Common.Helper; -// using NCC.JsonSerialization; -// using NCC.Common.Model.NPOI; -// using NCC.Common.Configuration; -// using NCC.DataEncryption; -// using NCC.ClayObject; - -// namespace NCC.Extend.LqBmzb -// { -// /// -// /// 部门管理服务 -// /// -// [ApiDescriptionSettings(Tag = "Extend",Name = "LqBmzb", Order = 200)] -// [Route("api/Extend/[controller]")] -// public class LqBmzbService : ILqBmzbService, IDynamicApiController, ITransient -// { -// private readonly ISqlSugarRepository _lqBmzbRepository; -// private readonly SqlSugarScope _db; -// private readonly IUserManager _userManager; - -// /// -// /// 初始化一个类型的新实例 -// /// -// public LqBmzbService( -// ISqlSugarRepository lqBmzbRepository, -// IUserManager userManager) -// { -// _lqBmzbRepository = lqBmzbRepository; -// _db = _lqBmzbRepository.Context; -// _userManager = userManager; -// } - -// /// -// /// 获取部门管理 -// /// -// /// 参数 -// /// -// [HttpGet("{id}")] -// public async Task GetInfo(string id) -// { -// var entity = await _db.Queryable().FirstAsync(p => p.Id == id); -// var output = entity.Adapt(); -// return output; -// } - -// /// -// /// 获取部门管理列表 -// /// -// /// 请求参数 -// /// -// [HttpGet("")] -// public async Task GetList([FromQuery] LqBmzbListQueryInput input) -// { -// var sidx = input.sidx == null ? "id" : input.sidx; -// var data = await _db.Queryable() -// .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id)) -// .WhereIF(!string.IsNullOrEmpty(input.bmmc), p => p.Bmmc.Contains(input.bmmc)) -// .WhereIF(!string.IsNullOrEmpty(input.bmfl), p => p.Bmfl.Equals(input.bmfl)) -// .Select(it=> new LqBmzbListOutput -// { -// id = it.Id, -// bmmc=it.Bmmc, -// bmfl=it.Bmfl, -// }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize); -// return PageResult.SqlSugarPageResult(data); -// } - -// /// -// /// 新建部门管理 -// /// -// /// 参数 -// /// -// [HttpPost("")] -// public async Task Create([FromBody] LqBmzbCrInput input) -// { -// var userInfo = await _userManager.GetUserInfo(); -// var entity = input.Adapt(); -// entity.Id = YitIdHelper.NextId().ToString(); -// var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); -// if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); -// } - -// /// -// /// 获取部门管理无分页列表 -// /// -// /// 请求参数 -// /// -// [NonAction] -// public async Task GetNoPagingList([FromQuery] LqBmzbListQueryInput input) -// { -// var sidx = input.sidx == null ? "id" : input.sidx; -// var data = await _db.Queryable() -// .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id)) -// .WhereIF(!string.IsNullOrEmpty(input.bmmc), p => p.Bmmc.Contains(input.bmmc)) -// .WhereIF(!string.IsNullOrEmpty(input.bmfl), p => p.Bmfl.Equals(input.bmfl)) -// .Select(it=> new LqBmzbListOutput -// { -// id = it.Id, -// bmmc=it.Bmmc, -// bmfl=it.Bmfl, -// }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync(); -// return data; -// } - -// /// -// /// 导出部门管理 -// /// -// /// 请求参数 -// /// -// [HttpGet("Actions/Export")] -// public async Task Export([FromQuery] LqBmzbListQueryInput input) -// { -// var userInfo = await _userManager.GetUserInfo(); -// var exportData = new List(); -// if (input.dataType == 0) -// { -// var data = Clay.Object(await this.GetList(input)); -// exportData = data.Solidify>().list; -// } -// else -// { -// exportData = await this.GetNoPagingList(input); -// } -// List paramList = "[{\"value\":\"部门编号\",\"field\":\"id\"},{\"value\":\"部门名称\",\"field\":\"bmmc\"},{\"value\":\"部门分类\",\"field\":\"bmfl\"},]".ToList(); -// ExcelConfig excelconfig = new ExcelConfig(); -// excelconfig.FileName = "部门管理.xls"; -// excelconfig.HeadFont = "微软雅黑"; -// excelconfig.HeadPoint = 10; -// excelconfig.IsAllSizeColumn = true; -// excelconfig.ColumnModel = new List(); -// List selectKeyList = input.selectKey.Split(',').ToList(); -// foreach (var item in selectKeyList) -// { -// var isExist = paramList.Find(p => p.field == item); -// if (isExist != null) -// { -// excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value }); -// } -// } -// var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName; -// ExcelExportHelper.Export(exportData, excelconfig, addPath); -// var fileName = _userManager.UserId + "|" + addPath + "|xls"; -// var output = new -// { -// name = excelconfig.FileName, -// url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") -// }; -// return output; -// } - -// /// -// /// 批量删除部门管理 -// /// -// /// 主键数组 -// /// -// [HttpPost("batchRemove")] -// public async Task BatchRemove([FromBody] List ids) -// { -// var entitys = await _db.Queryable().In(it => it.Id, ids).ToListAsync(); -// if (entitys.Count > 0) -// { -// try -// { -// //开启事务 -// _db.BeginTran(); -// //批量删除部门管理 -// await _db.Deleteable().In(d => d.Id,ids).ExecuteCommandAsync(); -// //关闭事务 -// _db.CommitTran(); -// } -// catch (Exception) -// { -// //回滚事务 -// _db.RollbackTran(); -// throw NCCException.Oh(ErrorCode.COM1002); -// } -// } -// } - -// /// -// /// 更新部门管理 -// /// -// /// 主键 -// /// 参数 -// /// -// [HttpPut("{id}")] -// public async Task Update(string id, [FromBody] LqBmzbUpInput input) -// { -// var entity = input.Adapt(); -// var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); -// if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); -// } - -// /// -// /// 删除部门管理 -// /// -// /// -// [HttpDelete("{id}")] -// public async Task Delete(string id) -// { -// var entity = await _db.Queryable().FirstAsync(p => p.Id == id); -// _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); -// var isOk = await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); -// if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); -// } -// } -// } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs index a7e0613..8c244ed 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs @@ -25,6 +25,7 @@ using NCC.Extend.Entitys.lq_hytk_mx; using NCC.Extend.Entitys.lq_kd_kdjlb; using NCC.Extend.Entitys.lq_kd_pxmx; using NCC.Extend.Entitys.lq_khxx; +using NCC.Extend.Entitys.lq_mdxx; using NCC.Extend.Entitys.lq_xh_hyhk; using NCC.Extend.Entitys.lq_xh_pxmx; using NCC.Extend.Interfaces.LqKhxx; @@ -114,8 +115,8 @@ namespace NCC.Extend.LqKhxx gzhzt = it.Gzhzt, wxnc = it.Wxnc, wxxcxzt = it.Wxxcxzt, - zjdlsj = it.Zjdlsj, gsmd = it.Gsmd, + gsmdName = SqlFunc.Subqueryable().Where(u => u.Id == it.Gsmd).Select(u => u.Dm), zcsj = it.Zcsj, khlx = it.Khlx, khjd = it.Khjd, @@ -179,9 +180,6 @@ namespace NCC.Extend.LqKhxx public async Task GetNoPagingList([FromQuery] LqKhxxListQueryInput input) { var sidx = input.sidx == null ? "id" : input.sidx; - List queryZjdlsj = input.zjdlsj != null ? input.zjdlsj.Split(',').ToObeject>() : null; - DateTime? startZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.First()) : null; - DateTime? endZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.Last()) : null; List queryZcsj = input.zcsj != null ? input.zcsj.Split(',').ToObeject>() : null; DateTime? startZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.First()) : null; DateTime? endZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.Last()) : null; @@ -200,8 +198,6 @@ namespace NCC.Extend.LqKhxx .WhereIF(!string.IsNullOrEmpty(input.gzhzt), p => p.Gzhzt.Equals(input.gzhzt)) .WhereIF(!string.IsNullOrEmpty(input.wxnc), p => p.Wxnc.Contains(input.wxnc)) .WhereIF(!string.IsNullOrEmpty(input.wxxcxzt), p => p.Wxxcxzt.Equals(input.wxxcxzt)) - // .WhereIF(queryZjdlsj != null, p => p.Zjdlsj >= new DateTime(startZjdlsj.ToDate().Year, startZjdlsj.ToDate().Month, startZjdlsj.ToDate().Day, 0, 0, 0)) - // .WhereIF(queryZjdlsj != null, p => p.Zjdlsj <= new DateTime(endZjdlsj.ToDate().Year, endZjdlsj.ToDate().Month, endZjdlsj.ToDate().Day, 23, 59, 59)) .WhereIF(!string.IsNullOrEmpty(input.gsmd), p => p.Gsmd.Contains(input.gsmd)) .WhereIF(queryZcsj != null, p => p.Zcsj >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0)) .WhereIF(queryZcsj != null, p => p.Zcsj <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59)) @@ -265,9 +261,6 @@ namespace NCC.Extend.LqKhxx public async Task> GetLeadsPoolList([FromQuery] LqKhxxListQueryInput input) { var sidx = input.sidx == null ? "id" : input.sidx; - List queryZjdlsj = input.zjdlsj != null ? input.zjdlsj.Split(',').ToObeject>() : null; - DateTime? startZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.First()) : null; - DateTime? endZjdlsj = queryZjdlsj != null ? Ext.GetDateTime(queryZjdlsj.Last()) : null; List queryZcsj = input.zcsj != null ? input.zcsj.Split(',').ToObeject>() : null; DateTime? startZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.First()) : null; DateTime? endZcsj = queryZcsj != null ? Ext.GetDateTime(queryZcsj.Last()) : null; diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs index 7c898a8..d726063 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs @@ -80,6 +80,7 @@ namespace NCC.Extend.LqTkjlb teamName = p.TeamName, eventId = p.EventId, eventName = SqlFunc.Subqueryable().Where(e => e.Id == p.EventId).Select(e => e.EventName), + storeName = SqlFunc.Subqueryable().Where(u => u.Id == p.StoreId).Select(u => u.Dm), }) .FirstAsync(); @@ -128,6 +129,7 @@ namespace NCC.Extend.LqTkjlb isAddWeChat = it.IsAddWeChat, remarks = it.Remarks, storeId = it.StoreId, + storeName = SqlFunc.Subqueryable().Where(u => u.Id == it.StoreId).Select(u => u.Dm), teamName = it.TeamName, eventId = it.EventId, eventName = SqlFunc.Subqueryable().Where(u => u.Id == it.EventId).Select(u => u.EventName), diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqYaoyjlService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqYaoyjlService.cs index 3a493e6..3b45e75 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqYaoyjlService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqYaoyjlService.cs @@ -22,13 +22,15 @@ using NCC.Common.Model.NPOI; using NCC.Common.Configuration; using NCC.DataEncryption; using NCC.ClayObject; +using NCC.System.Entitys.Permission; +using NCC.Extend.Entitys.lq_mdxx; namespace NCC.Extend.LqYaoyjl { /// /// 邀约记录服务 /// - [ApiDescriptionSettings(Tag = "Extend", Name = "LqYaoyjl", Order = 200)] + [ApiDescriptionSettings(Tag = "绿纤邀约记录服务", Name = "LqYaoyjl", Order = 200)] [Route("api/Extend/[controller]")] public class LqYaoyjlService : ILqYaoyjlService, IDynamicApiController, ITransient { @@ -48,6 +50,7 @@ namespace NCC.Extend.LqYaoyjl _userManager = userManager; } + #region 邀约记录 /// /// 获取邀约记录 /// @@ -58,9 +61,12 @@ namespace NCC.Extend.LqYaoyjl { var entity = await _db.Queryable().FirstAsync(p => p.Id == id); var output = entity.Adapt(); + output.storeName = SqlFunc.Subqueryable().Where(u => u.Id == entity.StoreId).Select(u => u.Dm); return output; } + #endregion + #region 邀约记录列表 /// /// 获取邀约记录列表 /// @@ -97,10 +103,16 @@ namespace NCC.Extend.LqYaoyjl dhsfyx = it.Dhsfyx, lxsj = it.Lxsj, lxjl = it.Lxjl, + storeId = it.StoreId, + storeName = SqlFunc.Subqueryable().Where(u => u.Id == it.StoreId).Select(u => u.Dm), + createTime = it.CreateTime, + yyrName = SqlFunc.Subqueryable().Where(u => u.Id == it.Yyr).Select(u => u.RealName), }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize); return PageResult.SqlSugarPageResult(data); } + #endregion + #region 新建邀约记录 /// /// 新建邀约记录 /// @@ -112,10 +124,14 @@ namespace NCC.Extend.LqYaoyjl var userInfo = await _userManager.GetUserInfo(); var entity = input.Adapt(); entity.Id = YitIdHelper.NextId().ToString(); + entity.CreateTime = DateTime.Now; + entity.StoreId = _db.Queryable().Where(u => u.Id == input.yyr).Select(u => u.Mdid).First(); var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); } + #endregion + #region 邀约记录无分页列表 /// /// 获取邀约记录无分页列表 /// @@ -152,10 +168,13 @@ namespace NCC.Extend.LqYaoyjl dhsfyx = it.Dhsfyx, lxsj = it.Lxsj, lxjl = it.Lxjl, + yyrName = SqlFunc.Subqueryable().Where(u => u.MobilePhone == it.Yyr).Select(u => u.RealName), }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync(); return data; } + #endregion + #region 导出邀约记录 /// /// 导出邀约记录 /// @@ -201,7 +220,9 @@ namespace NCC.Extend.LqYaoyjl }; return output; } + #endregion + #region 批量删除邀约记录 /// /// 批量删除邀约记录 /// @@ -230,7 +251,9 @@ namespace NCC.Extend.LqYaoyjl } } } + #endregion + #region 更新邀约记录 /// /// 更新邀约记录 /// @@ -241,10 +264,13 @@ namespace NCC.Extend.LqYaoyjl public async Task Update(string id, [FromBody] LqYaoyjlUpInput input) { var entity = input.Adapt(); + entity.StoreId = _db.Queryable().Where(u => u.Id == input.yyr).Select(u => u.Mdid).First(); var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); } + #endregion + #region 删除邀约记录 /// /// 删除邀约记录 /// @@ -257,5 +283,6 @@ namespace NCC.Extend.LqYaoyjl var isOk = await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); } + #endregion } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqYyjlService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqYyjlService.cs index fc85b07..52087a6 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqYyjlService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqYyjlService.cs @@ -16,10 +16,12 @@ using NCC.DataEncryption; using NCC.Dependency; using NCC.DynamicApiController; using NCC.Extend.Entitys.Dto.LqYyjl; +using NCC.Extend.Entitys.lq_mdxx; using NCC.Extend.Entitys.lq_yyjl; using NCC.Extend.Interfaces.LqYyjl; using NCC.FriendlyException; using NCC.JsonSerialization; +using NCC.System.Entitys.Permission; using SqlSugar; using Yitter.IdGenerator; @@ -28,7 +30,7 @@ namespace NCC.Extend.LqYyjl /// /// 预约记录服务 /// - [ApiDescriptionSettings(Tag = "Extend", Name = "LqYyjl", Order = 200)] + [ApiDescriptionSettings(Tag = "绿纤预约记录服务", Name = "LqYyjl", Order = 200)] [Route("api/Extend/[controller]")] public class LqYyjlService : ILqYyjlService, IDynamicApiController, ITransient { @@ -45,7 +47,7 @@ namespace NCC.Extend.LqYyjl _db = _lqYyjlRepository.Context; _userManager = userManager; } - + #region 预约记录 /// /// 获取预约记录 /// @@ -56,9 +58,33 @@ namespace NCC.Extend.LqYyjl { var entity = await _db.Queryable().FirstAsync(p => p.Id == id); var output = entity.Adapt(); + + // 获取门店名称 + if (!string.IsNullOrEmpty(entity.Djmd)) + { + var store = await _db.Queryable().Where(u => u.Id == entity.Djmd).FirstAsync(); + output.djmdName = store?.Dm; + } + + // 获取预约人姓名 + if (!string.IsNullOrEmpty(entity.Yyr)) + { + var user = await _db.Queryable().Where(u => u.Id == entity.Yyr).FirstAsync(); + output.yyrName = user?.RealName; + } + + // 获取预约健康师姓名 + if (!string.IsNullOrEmpty(entity.Yyjks)) + { + var healthCoach = await _db.Queryable().Where(u => u.Id == entity.Yyjks).FirstAsync(); + output.yyjksName = healthCoach?.RealName; + } + return output; } + #endregion + #region 预约记录列表 /// /// 获取预约记录列表 /// @@ -109,13 +135,18 @@ namespace NCC.Extend.LqYyjl yysj = it.Yysj, yyjs = it.Yyjs, F_Status = it.F_Status, + yyrName = SqlFunc.Subqueryable().Where(u => u.Id == it.Yyr).Select(u => u.RealName), + yyjksName = SqlFunc.Subqueryable().Where(u => u.Id == it.Yyjks).Select(u => u.RealName), + djmdName = SqlFunc.Subqueryable().Where(u => u.Id == it.Djmd).Select(u => u.Dm), }) .MergeTable() .OrderBy(sidx + " " + input.sort) .ToPagedListAsync(input.currentPage, input.pageSize); return PageResult.SqlSugarPageResult(data); } + #endregion + #region 新建预约记录 /// /// 新建预约记录 /// @@ -129,11 +160,14 @@ namespace NCC.Extend.LqYyjl entity.Id = YitIdHelper.NextId().ToString(); entity.Czr = _userManager.UserId; entity.Czsj = DateTime.Now; + entity.CreateTime = DateTime.Now; var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); } + #endregion + #region 预约记录无分页列表 /// /// 获取预约记录无分页列表 /// @@ -184,13 +218,18 @@ namespace NCC.Extend.LqYyjl yysj = it.Yysj, yyjs = it.Yyjs, F_Status = it.F_Status, + yyrName = SqlFunc.Subqueryable().Where(u => u.Id == it.Yyr).Select(u => u.RealName), + yyjksName = SqlFunc.Subqueryable().Where(u => u.Id == it.Yyjks).Select(u => u.RealName), + djmdName = SqlFunc.Subqueryable().Where(u => u.Id == it.Djmd).Select(u => u.Dm), }) .MergeTable() .OrderBy(sidx + " " + input.sort) .ToListAsync(); return data; } + #endregion + #region 导出预约记录 /// /// 导出预约记录 /// @@ -233,7 +272,9 @@ namespace NCC.Extend.LqYyjl var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") }; return output; } + #endregion + #region 批量删除预约记录 /// /// 批量删除预约记录 /// @@ -262,7 +303,9 @@ namespace NCC.Extend.LqYyjl } } } + #endregion + #region 更新预约记录 /// /// 更新预约记录 /// @@ -277,7 +320,9 @@ namespace NCC.Extend.LqYyjl if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); } + #endregion + #region 删除预约记录 /// /// 删除预约记录 /// @@ -291,5 +336,6 @@ namespace NCC.Extend.LqYyjl if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); } + #endregion } } -- libgit2 0.21.4