Commit Graph

127 Commits

Author SHA1 Message Date
puhui999
b2621c8891 CRM-客户: 新增关注和取消关注客户接口 2023-12-05 11:04:40 +08:00
puhui999
9c1687dc25 CRM: 新增关注数据模块 2023-12-05 11:00:34 +08:00
YunaiV
72969e921e crm: 增加基于客户查询回款计划分页 2023-12-01 22:46:13 +08:00
YunaiV
f02b9464bd crm: 增加基于客户查询回款分页 2023-12-01 19:37:44 +08:00
YunaiV
db03b10d24 crm: 增加基于客户查询商机分页 2023-11-30 20:21:39 +08:00
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
3f3899f5d3 crm联系人review修改,新增地区字段 2023-11-27 20:42:34 +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