huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-25 16:51:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,185 Commits 1 Branch 0 Tags 176 MiB
20f8cb1606
Commit Graph

313 Commits

Author SHA1 Message Date
puhui999
6b426fcd01 CRM: 修复一下差异 2024-01-10 22:06:02 +08:00
puhui999
ad4044f932 Merge remote-tracking branch 'yudao/develop' into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
 2024-01-10 21:13:33 +08:00
puhui999
19fa65b0c3 CRM: 新增跟进记录 2024-01-10 21:09:08 +08:00
puhui999
ba103d6e86 CRM: 完善一些 TODO 提到的问题 2024-01-10 16:25:55 +08:00
puhui999
1a5fe6fa9a CRM: 完善客户、联系人、合同、回款计划、回款的操作日志 2024-01-10 15:28:53 +08:00
puhui999
9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2024-01-10 11:29:29 +08:00
min
0ee7fedea8 CRM：【线索】使用BeanUtils替换mapstruct 2024-01-10 00:38:23 +08:00
min
99b8465e29 CRM：【线索】SaveReqVO去除客户编号字段 2024-01-10 00:16:37 +08:00
min
1280f49a04 CRM：【线索】转化为客户接口修改 2024-01-10 00:10:47 +08:00
YunaiV
722b33513c 📖 CRM：code review 线索模块 2024-01-09 21:58:50 +08:00
YunaiV
6a93484260 📖 CRM：code review 线索模块 2024-01-09 13:52:04 +08:00
min
81f838c5d2 CRM：【线索】创建、更新线索时添加校验，改用相同vo 2024-01-09 01:30:42 +08:00
min
4d68e5e747 CRM：【线索】创建线索时客户改为非必填 2024-01-09 01:27:53 +08:00
min
4237cfb4a9 CRM：【线索】线索转化为客户 2024-01-09 01:27:53 +08:00
YunaiV
772b794374 📖 CRM：code review CRM 产品分类 2024-01-08 19:08:03 +08:00
anhaohao
4afff6185e 新增：CRM 产品分类和产品，接入操作日志，数据权限控制 2024-01-08 15:15:42 +08:00
YunaiV
2d1e57554d 📖 CRM：code review CRM 客户逻辑 2024-01-07 22:07:17 +08:00
芋道源码
3c7f63c356
!810 fix：修复 issues 提到的一些公众号上的问题 
Merge pull request !810 from puhui999/develop
 2024-01-07 13:23:53 +00:00
YunaiV
19d5a0c2aa 📖 CRM：code review crm 联系人新增操作日志 2024-01-07 18:19:08 +08:00
zyna
44d828023c crm联系人新增操作日志 2024-01-06 21:06:38 +08:00
puhui999
68f5edaa88 CRM-客户: 完善一些 TODO 2024-01-06 15:28:10 +08:00
puhui999
3170e7fd97 CRM-客户: 简化客户公海配置 VO，完善相关操作日志 2024-01-06 13:48:22 +08:00
puhui999
9ce50ec369 CRM-客户限制配置：VO 简化 2024-01-06 13:04:30 +08:00
puhui999
269816446a CRM-客户：日志表达式调整 2024-01-06 12:27:30 +08:00
puhui999
a1c17b9b00 CRM-客户：日志表达式调整 2024-01-05 17:40:21 +08:00
puhui999
d8bb55fc0b CRM-客户：完善操作日志 2024-01-05 14:43:48 +08:00
puhui999
ea4b4b8956 CRM-客户：精简 VO 2024-01-05 00:15:26 +08:00
YunaiV
a974d055b6 📖 CRM：【还款】code review 还款的代码，补全对应的 todo list 2024-01-04 09:41:58 +08:00
YunaiV
c6a9751511 📖 CRM：【合同】code review 合同的代码，补全对应的 todo list 2024-01-04 09:18:44 +08:00
YunaiV
2668e0cfeb 📖 CRM：【产品】code review 产品的代码，补全对应的 todo list 2024-01-04 08:01:04 +08:00
YunaiV
b9f1e8ffaf 📖 CRM：【联系人】code review 商机的代码，补全对应的 todo list 2024-01-04 07:53:00 +08:00
YunaiV
02324f9e60 ✨ CRM：【联系人】统一字段 2024-01-03 23:30:25 +08:00
YunaiV
cff6e520ee 📖 CRM：【联系人】code review 联系人的代码，补全对应的 todo list 2024-01-03 22:07:20 +08:00
YunaiV
f8f5e525be ✨ CRM：新增跟进记录表 2024-01-03 20:56:28 +08:00
YunaiV
2e7c3e09a9 📖 CRM：code review 所有代码，补充对应 todo 2024-01-03 19:38:13 +08:00
YunaiV
d0df0e8e16 📖 CRM：【客户】优化锁定客户的逻辑实现 2024-01-03 13:06:49 +08:00
YunaiV
0253846fdf Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2024-01-02 22:21:14 +08:00
YunaiV
1da8006af3 📖 CRM：【客户】完善列表、新增、修改接口的 todo 2024-01-02 21:45:02 +08:00
YunaiV
9e3055ee1e 📖 CRM：code review 商机模块 2024-01-02 18:49:14 +08:00
YunaiV
2d0537387b Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
 2023-12-30 21:43:04 +08:00
YunaiV
8c9b483ac5 📖 code review 操作日志的实现 2023-12-30 21:36:46 +08:00
puhui999
e5377074d5 数据权限：完善 code review 提到的问题 2023-12-26 00:21:04 +08:00
puhui999
6950368991 操作日志：完善 code review 提到的问题 2023-12-26 00:04:20 +08:00
YunaiV
5de6a8bd23 📖 code review：操作日志的实现 2023-12-25 21:40:16 +08:00
puhui999
e8ade5f1fe crm：完善一些遗留的 TODO 2023-12-23 20:10:40 +08:00
puhui999
f56d8a2751 重构操作日志记录实现 2023-12-19 18:34:51 +08:00
puhui999
1fae341cae 重构操作日志记录实现 2023-12-19 16:29:13 +08:00
puhui999
55a215da44 CRM-数据权限：完善数据权限补全管理员和公海相关情况处理逻辑 2023-12-19 10:43:45 +08:00
puhui999
3e91ac73c4 CRM：完善数据分页查询条件构造 CrmQueryWrapperUtils 2023-12-19 10:29:41 +08:00
puhui999
3bab9748db 系统操作日志：使用自定义 starter 的方式重新集成 mzt-biz-log 2023-12-19 09:20:47 +08:00
zyna
bd76ea59a7 Merge remote-tracking branch 'origin/feature/crm' into develop 
# 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/controller/admin/contact/CrmContactController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
 2023-12-17 17:47:46 +08:00
zyna
8434a8cd68 crm联系人商机功能修改 2023-12-17 17:33:52 +08:00
YunaiV
ddb6fe7ec8 📖 CRM：code review 客户管理的数据权限、操作权限 2023-12-17 10:57:49 +08:00
puhui999
daf4651a4f 系统操作日志：集成 mzt-biz-log 5，增加日志保存和查询接口 2023-12-14 18:45:13 +08:00
puhui999
3c74b22933 系统操作日志：集成 mzt-biz-log 4 2023-12-13 17:45:43 +08:00
puhui999
c74881c8f0 系统操作日志：集成 mzt-biz-log 3 2023-12-13 15:18:19 +08:00
puhui999
13d6c42a48 系统操作日志：集成 mzt-biz-log 2 2023-12-12 22:42:50 +08:00
puhui999
c5cc818a49 系统操作日志：集成 mzt-biz-log 2023-12-12 22:29:40 +08:00
puhui999
8fa8f2890b CRM: 线索、联系人、回款、回款计划新增数据权限转移 2023-12-11 17:36:09 +08:00
puhui999
c234f5b5f8 CRM: 完善数据权限 2023-12-11 16:48:21 +08:00
puhui999
1ac68aca97 CRM-回款计划：添加数据权限 2023-12-11 15:56:12 +08:00
puhui999
e4d3175f06 CRM-数据权限：完善 review 提到的问题 2023-12-11 12:02:41 +08:00
Joey
9bac10c6f7 完善客户锁定/解锁接口，校验锁定上限 2023-12-09 17:25:47 +08:00
YunaiV
23df8633f4 📖 CRM：code review 数据权限的实现 2023-12-09 10:50:47 +08:00
puhui999
7c54affb16 CRM-合同：完善数据权限，新增权限关联、场景分页查询，新增权限关联批量查询 2023-12-08 22:43:45 +08:00
puhui999
f69a18fd23 CRM-联系人：完善数据权限，新增权限关联、场景分页查询，新增权限关联批量查询 2023-12-08 18:08:41 +08:00
puhui999
490418a1fc CRM-线索：完善数据权限，新增权限关联、场景分页查询，新增权限关联批量查询 2023-12-08 17:52:02 +08:00
puhui999
9ea0607339 CRM-商机：完善数据权限，新增权限关联、场景分页查询，新增权限关联批量查询 2023-12-08 17:16:34 +08:00
puhui999
5c395fc1c4 CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV
3707662187 📈 CRM：code review 数据权限 2023-12-06 20:04:15 +08:00
YunaiV
d430063eec Merge remote-tracking branch 'puhui/feature/crm' into feature/crm 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
 2023-12-06 19:33:04 +08:00
YunaiV
a36fe8c40e 📈 CRM：code review 联系人商机功能 2023-12-06 19:26:45 +08:00
芋道源码
21a3870c00
!775 crm联系人商机功能 
Merge pull request !775 from zyna/feature/crm
 2023-12-06 05:57:51 +00:00
YunaiV
3678752a61 🔨 CRM：优化产品分类代码的实现 2023-12-06 12:56:44 +08:00
YunaiV
73e76ab453 Merge remote-tracking branch 'origin/master' into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
 2023-12-05 22:42:53 +08:00
YunaiV
a11d5dc5f1 🔨 CRM：优化产品代码的实现 2023-12-05 22:41:58 +08:00
puhui999
d59d1428d7 Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2023-12-05 22:25:49 +08:00
芋道源码
c463f831f4
!776 【CRM：优化产品以及产品分类】 
Merge pull request !776 from ZanGe丶/feature/crm
 2023-12-05 12:15:54 +00:00
puhui999
455a4ebc7b CRM-客户：实现数据权限、场景检索和公海数据分页查询 2023-12-05 15:04:53 +08:00
puhui999
78165f2161 CRM: 新增 CRM 分页查询工具类，实现通用构造 crm 数据类型数据分页查询条件 2023-12-05 15:03:22 +08:00
puhui999
b2621c8891 CRM-客户: 新增关注和取消关注客户接口 2023-12-05 11:04:40 +08:00
puhui999
9c1687dc25 CRM: 新增关注数据模块 2023-12-05 11:00:34 +08:00
ZanGe丶
d2e965fb02 【CRM：优化产品以及产品分类】 2023-12-03 21:33:01 +08:00
zyna
910bc09e19 crm联系人商机功能 2023-12-03 20:01:00 +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
eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +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
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