p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,077 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

274 Commits

Author SHA1 Message Date
YunaiV 2d9f5cc4d0 crm: 1）调整合同的 CRM 前缀；2）增加基于客户查询合同分页 2023-11-30 19:12:37 +08:00
YunaiV fe4b51b9ad crm: 完善数据权限的逻辑 2023-11-30 13:42:36 +08:00
YunaiV 53b8e37f36 crm: 增加联系人，基于客户的读取接口 2023-11-29 22:33:47 +08:00
YunaiV 1a93e3a110 crm：code review 联系人 2023-11-28 21:07:23 +08:00
芋道源码 591bc36737
!763 crm联系人review修改 
Merge pull request !763 from zyna/feature/crm
 2023-11-28 13:03:04 +00:00
YunaiV 36a51b68d9 crm：code review 数据权限 2023-11-28 20:36:57 +08:00
puhui999 79600774ec crm-客户：分页查询 mapper 还是得拆成两个，怎么查逻辑交给 service 去做处理 2023-11-28 14:27:36 +08:00
zyna 1580789334 crm联系人review修改 2023-11-27 23:42:04 +08:00
puhui999 6c536caad4 crm：完善 code review 数据权限提到的问题 2023-11-27 21:47:56 +08:00
YunaiV 492adfe8e5 crm：code review 数据权限 2023-11-27 20:51:51 +08:00
YunaiV 455f8e49fb crm：code review 联系人 2023-11-27 20:42:35 +08:00
zyna 16084d468d crm联系人删除多余文件 2023-11-27 20:42:35 +08:00
zyna 3f3899f5d3 crm联系人review修改，新增地区字段 2023-11-27 20:42:34 +08:00
puhui999 4a51b20155 crm-客户：修复合并差异 2023-11-27 12:14:32 +08:00
puhui999 f87d73724b Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
 2023-11-27 12:12:52 +08:00
puhui999 8f06d02293 crm-客户：完善 code review 提到的问题 2023-11-27 12:00:53 +08:00
puhui999 7f569f3299 crm-数据权限：完善数据权限 2023-11-27 10:55:32 +08:00
YunaiV f766474ff4 crm：code review 客户配置 2023-11-26 19:57:40 +08:00
Wanwan fbf864b6b4 fix: 修复客户公海配置设置为不启用时保存字段没有清空的 bug 2023-11-26 02:00:23 +08:00
Wanwan 033f13c6ad feat: 客户配置 review 修改 2023-11-26 00:27:09 +08:00
Wanwan ab3748d102 feat: 客户配置 review 修改 2023-11-25 23:54:08 +08:00
YunaiV 63f9bcb0a3 crm：code review 商机类型、状态 2023-11-25 12:02:03 +08:00
YunaiV 3e9eb59de3 crm：code review 数据权限的实现 2023-11-25 10:55:47 +08:00
YunaiV 899e40deb9 crm：code review 数据权限的实现 2023-11-25 10:02:55 +08:00
YunaiV d1579499f4 Merge remote-tracking branch 'ljlleo/feature/crm' into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2023-11-24 23:58:49 +08:00
YunaiV 8e480162c4 Merge remote-tracking branch 'origin/feature/crm' into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2023-11-24 23:55:10 +08:00
YunaiV 13e5d70be7 crm：解决冲突 2023-11-24 23:54:23 +08:00
YunaiV ec67e63c67 crm：code review 客户的公海领取和分配 2023-11-24 23:53:28 +08:00
YunaiV 1842549634 crm：code review 客户的公海领取和分配 2023-11-24 23:11:58 +08:00
ljlleo 4e1d9d6292 商机、商机状态类型和商机状态 2023-11-24 14:24:04 +08:00
puhui999 0d821d705d crm-客户管理：完善客户、公海客户分页查询 2023-11-23 10:12:50 +08:00
puhui999 b41d469d46 crm-客户管理：新增客户放入公海和领取公海客户 2023-11-22 18:44:49 +08:00
puhui999 77d7bcc73f crm-数据权限：完善数据权限 code review 提到的问题 2023-11-22 17:56:13 +08:00
puhui999 780526f484 crm-数据权限：完善数据权限相关操作接口 2023-11-22 17:27:00 +08:00
xiaqing 87778f7fd9 客户的公海领取和分配，按照要修调整代码格式 2023-11-19 23:23:52 +08:00
YunaiV f589881de5 code review：客户的分配和领取 2023-11-19 00:05:06 +08:00
YunaiV e519b41244 Merge branch 'feature/crm' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2023-11-18 23:56:08 +08:00
YunaiV 86050d411b code review：权限模块 2023-11-18 23:45:24 +08:00
YunaiV 716b081464 crm：合并最新的数据权限 2023-11-18 22:31:05 +08:00
YunaiV 8c9873c425 Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
 2023-11-18 22:25:13 +08:00
YunaiV 8c9c91f0ca crm：code review 配置管理 2023-11-18 22:12:12 +08:00
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-11-18 21:17:11 +08:00
YunaiV 966690125b crm：code review 联系人 2023-11-18 20:43:32 +08:00
puhui999 794649ea8a CRM-数据权限：完善团队成员相关操作 2023-11-14 11:23:52 +08:00
Wanwan 322411304c feat: CRM 客户限制 2023-11-12 14:34:49 +08:00
zyna 7598ed05cf crm联系人第二版新增字段 2023-11-11 23:31:09 +08:00
Wanwan 5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
Wanwan 2915b46fa5 feat: CRM 客户公海配置 2023-11-09 00:01:43 +08:00
puhui999 f4c92089e5 CRM-客户：添加分页数据场景过滤 2023-11-08 16:42:22 +08:00
puhui999 388e07c834 CRM：完善模块数据放入公海、公海数据领取 2023-11-08 16:05:23 +08:00
puhui999 533b7295ab Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2023-11-08 14:46:33 +08:00
puhui999 c8ed99a5a4 CRM-客户：完善客户详情、分页、公海数据获取 2023-11-08 14:41:51 +08:00
xiaqing 18de22dc39 增加客户的公海领取和 2023-11-08 10:51:10 +08:00
xiaqing 645fe827a3 Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-08 10:47:42 +08:00
xiaqing b06432b8f8 增加客户的公海领取和分配 2023-11-08 10:46:59 +08:00
Wanwan 71574da2cf feat: CRM 客户公海配置 2023-11-08 00:42:46 +08:00
Wanwan 4235beec3b Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-07 22:54:54 +08:00
puhui999 668fae9398 CRM-数据权限：完善 code review 提到的问题 2023-11-07 17:52:18 +08:00
Wanwan a24919e555 style: 客户 review 修改 2023-11-06 21:59:23 +08:00
YunaiV 8efdf3141a code review：crm 商品逻辑 2023-11-05 20:47:56 +08:00
ZanGe丶 bf42f8e9ff 【增加CRM：产品以及产品分类】 2023-11-04 19:48:20 +08:00
YunaiV ecf728966f code review：客户逻辑 2023-11-04 10:13:43 +08:00
芋道源码 9ee6a27b86
!715 feat: 客户详情 + review 修改 
Merge pull request !715 from wanwan/feature/crm
 2023-11-04 01:39:34 +00:00
Wanwan 64db1a9c90 feat: 客户详情 + review 修改 2023-11-04 03:21:20 +08:00
YunaiV acdfc28ee6 code review：客户锁定的逻辑 2023-11-03 23:43:04 +08:00
芋道源码 9a007de947
!713 新增接口 
Merge pull request !713 from Joey/feature/crm
 2023-11-03 15:37:55 +00:00
YunaiV b7900c2035 code review：回款逻辑 2023-11-03 23:02:01 +08:00
Joey 0a58790c6b 新增客户锁定和解锁 接口 2023-11-03 22:07:47 +08:00
芋道源码 71ce831d59
!706 完善回款管理和回款计划功能 
Merge pull request !706 from souvc/feature/crm
 2023-11-03 11:16:48 +00:00
zhijiantianya@gmail.com 4092f298ed code review：crm 权限模块的实现 2023-11-03 18:53:40 +08:00
puhui999 68c9d563bc CRM-商机：新增获得商机公海分页接口 2023-11-01 16:39:23 +08:00
puhui999 23cfbfe491 CRM-数据权限：完善数据团队操作-添加、编辑、移除团队成员，退出团队 2023-11-01 16:24:36 +08:00
puhui999 7a8ffd9ccb CRM-商机：完善获取权限过滤后的分页数据 2023-11-01 11:28:05 +08:00
puhui999 91dd61edc0 完善 review 提到的问题 2023-11-01 10:21:56 +08:00
puhui999 a385a37c4a 完善 CRM-客户 数据权限校验2 2023-10-31 17:42:44 +08:00
puhui999 c6422dc657 完善 CRM-客户 数据权限校验2 2023-10-31 17:24:19 +08:00
liuhongfeng 95e9dc81c9 【修改】回款计划和回款管理统一带上Crm前缀，防止和其他模块冲突。 2023-10-31 01:09:40 +08:00
liuhongfeng f1f180ff77 【新增】字典归类 
【修改】规范实体命名和字段类型修改
 2023-10-31 00:35:41 +08:00
liuhongfeng 798dd3269f Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-30 21:35:14 +08:00
liuhongfeng 921c2ab757 【新增】负责人 
【修改】规范命名：期数：indexNo-》period
 2023-10-30 21:33:28 +08:00
zhijiantianya@gmail.com 4dab376ca9 code review：数据权限的实现 2023-10-30 19:28:33 +08:00
puhui999 c2fd817989 完善 CRM-客户 数据权限校验 2023-10-30 16:52:01 +08:00
puhui999 e6eaa3a24a 完善 CRM-数据权限校验方式 2023-10-30 16:29:24 +08:00
puhui999 19c9b6ae93 新增 CRM-数据权限 service 2023-10-30 11:17:43 +08:00
puhui999 bec8a27a21 新增 CRM-数据权限 注解实现 2023-10-30 00:49:36 +08:00
liuhongfeng fc087fa252 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 19:27:16 +08:00
YunaiV d1978d318b code review：crm 合同 2023-10-29 19:05:36 +08:00
YunaiV 67ac11b56c code review：crm 客户转移 2023-10-29 18:39:54 +08:00
liuhongfeng 9608cf0539 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 18:03:01 +08:00
liuhongfeng 677e8ab2fc 【修改】回款计划-修改字段类型 
【修改】修改回款计划-创建逻辑，添加客户的数据校验
 2023-10-29 18:00:34 +08:00
芋道源码 f73b857551
!702 CRM【商机】【联系人】【合同】新增 transfer 接口 
Merge pull request !702 from puhui999/feature/crm
 2023-10-29 09:55:09 +00:00
YunaiV fe50356ae8 code review：crm 客户模块的实现 2023-10-29 17:38:59 +08:00
puhui999 722e9c8a04 CRM-商机：新增商机转移接口 2023-10-29 02:04:26 +08:00
puhui999 36a76c5ce6 CRM-联系人：新增联系人转移接口 2023-10-29 01:42:22 +08:00
puhui999 d9f6fb241a 合同：新增合同转移接口 2023-10-29 01:23:06 +08:00
Wanwan 3af9688383 feat: 调整客户表的字段 2023-10-29 00:33:42 +08:00
Wanwan c18f5baa4b feat: 调整客户表的字段 2023-10-28 22:47:56 +08:00
liuhongfeng b0ddd522fb Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-28 00:37:59 +08:00
liuhongfeng 301f497527 【新增】回款计划-审批枚举类 
【新增】回款计划-回款方式枚举类
【新增】回款计划-枚举类校验
【修改】回款计划-错误码调整
【修改】修改回款计划-创建逻辑，添加合同数据的校验
 2023-10-28 00:37:47 +08:00
YunaiV 81b6aebf47 code review：商机表的实现 2023-10-27 23:27:08 +08:00
YunaiV bf247a6626 Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-10-27 23:11:16 +08:00
YunaiV 74f786f8ed code review：客户表的实现 2023-10-27 22:56:46 +08:00
ljlleo 75115bcc48 1、商机前端页面； 
2、商机状态类型和商机状态字段的处理；
 2023-10-26 16:22:44 +08:00
Wanwan 866eaedfeb feat: 客户表的 crud 2023-10-25 00:32:49 +08:00
Wanwan 04613af0cd feat: 客户表的 crud 2023-10-25 00:25:00 +08:00
YunaiV 55f9e0131c code review：CRM 客户联系人的管理 2023-10-21 22:20:00 +08:00
YunaiV 723707c7ed Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
 2023-10-21 22:13:34 +08:00
YunaiV b5560fa0be code review：CRM 线索表的逻辑 2023-10-21 22:05:37 +08:00
YunaiV 9cf4cfca86 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-10-21 22:00:15 +08:00
YunaiV f942e2c7f2 code review：CRM 回款计划的逻辑 2023-10-21 21:55:21 +08:00
YunaiV 56b59cf383 Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
#	sql/mysql/crm_menu.sql
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
 2023-10-21 21:41:16 +08:00
YunaiV 6f8fd383f7 code review：CRM 商机的逻辑 2023-10-21 21:35:35 +08:00
913752709@qq.com e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:18 +08:00
liuhongfeng 34a5785768 【新增】回款计划 功能 2023-10-20 23:48:19 +08:00
zyna e4943f0dfa crm联系人 2023-10-20 23:42:22 +08:00
liuhongfeng 73f4fc8ceb 【新增】回款管理 功能 2023-10-20 22:16:34 +08:00
ljlleo bee6f41211 商机 2023-10-20 16:01:54 +08:00
YunaiV 439edcd1be code review：crm 线索的 crud 2023-10-19 23:15:18 +08:00
wanwan 48661f980c !679 feat: CRM 线索表 crud 
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
 2023-10-19 14:52:16 +00:00
YunaiV b133acd8cd code review：crm 合同流程 2023-10-17 22:52:14 +08:00
dhb52 164be5732b feat: CRM/合同管理 - SQL 2023-10-16 23:53:27 +08:00
dhb52 eedb528412 feat: CRM/合同管理 - crud 2023-10-16 23:53:17 +08:00
dhb52 e26bd20a5b feat:添加测试配置及excel依赖 2023-10-16 23:45:18 +08:00
YunaiV 7e312aae02 初始化 crm 模块 2023-10-15 20:16:46 +08:00