puhui999
|
47a698868c
|
CRM: 根据 review 完善数据权限
|
2 years ago |
YunaiV
|
8dcc12f215
|
CRM：code review 客户总量统计
|
2 years ago |
|
芋道源码
|
85817a2426
|
!902 fix: [CRM-客户统计]根据Code-Review 修改
Merge pull request !902 from dhb52/develop
|
2 years ago |
|
puhui999
|
0043d02d0a
|
fix：商机 api 文档生成不对的问题
|
2 years ago |
|
YunaiV
|
89fc83c419
|
CRM：code review 客户权限的实现
|
2 years ago |
|
芋道源码
|
e2ec426a9f
|
!900 CRM：完善数据权限，实现数据权限同时添加、同时转移
Merge pull request !900 from puhui999/develop
|
2 years ago |
dhb52
|
0386820a1c
|
feat: 增加[客户行业、客户来源]等字段显示，重构代码
|
2 years ago |
|
dhb52
|
06c0d86544
|
fix: 使用convertSetByFlatMap避免 ID 重复
Signed-off-by: dhb52 <dhb52@126.com>
|
2 years ago |
|
dhb52
|
a23ea45632
|
fix: [CRM-客户统计]根据Code-Review 修改
|
2 years ago |
|
puhui999
|
ba1b028001
|
CRM：完善数据权限，实现数据权限同时添加、同时转移
|
2 years ago |
|
puhui999
|
f56fab932a
|
CRM：完善 excel 导出 review 提到的问题
|
2 years ago |
|
YunaiV
|
1f35ef59d1
|
CRM：code review excel 导出的重构
|
2 years ago |
|
YunaiV
|
fc7734319b
|
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# 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/service/receivable/CrmReceivableServiceImpl.java
|
2 years ago |
|
YunaiV
|
379bd95840
|
CRM：code review 客户分析（客户总量分析）
|
2 years ago |
|
芋道源码
|
2bf5c7a701
|
!889 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !889 from dhb52/develop
|
2 years ago |
|
YunaiV
|
e091b077a8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
dda0909843
|
🎉 2.0.1 版本发布！
|
2 years ago |
|
YunaiV
|
bbdedd08f1
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java
|
2 years ago |
zhanhong
|
814acb83ae
|
fix:跟进记录分页不显示商机
|
2 years ago |
|
YunaiV
|
10cc9fa77f
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
8ff710e49d
|
✨ 同步 master 的一些 pr 代码变更
|
2 years ago |
|
dhb52
|
34f68ce4c6
|
feat: CRM/数据统计/员工客户分析 初稿
|
2 years ago |
|
dhb52
|
fbb624d826
|
feat: CRM/数据统计/员工客户分析/客户跟进次数分析
|
2 years ago |
|
YunaiV
|
8b6bc7c54e
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2 years ago |
|
芋道源码
|
b135314482
|
!890 修复：CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示
Merge pull request !890 from 李占宏/develop
|
2 years ago |
|
YunaiV
|
c3717b68c8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
1f4889c68e
|
✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter
|
2 years ago |
|
dhb52
|
a0b413b3a3
|
refactor: CRM/数据统计/排行榜 重命名
|
2 years ago |
|
dhb52
|
7d120a2f36
|
feat: CRM/数据统计/客户总量分析
|
2 years ago |
|
puhui999
|
720b54c353
|
CRM: 完善回款操作日志
|
2 years ago |
|
zhanhong
|
b94cd08772
|
修复：CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭");
|
2 years ago |
|
zhanhong
|
89aca4572d
|
修复：CRM 合同配置不提醒，待办事项中即将到期的合同查询报错
|
2 years ago |
|
zhanhong
|
8222c3a831
|
修复：CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId
|
2 years ago |
|
puhui999
|
c4ff0a1038
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
YunaiV
|
ece338846a
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
|
2 years ago |
|
YunaiV
|
d134bfc4a6
|
✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类
|
2 years ago |
|
YunaiV
|
2aade25e78
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
e7c_corp
|
a6e13da602
|
fix: 兼容有些21jdk getFirst 会找不到符合的错误
兼容有些21jdk getFirst 会找不到符合的错误
|
2 years ago |
|
YunaiV
|
02466aca2e
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
YunaiV
|
656c3a77ec
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/event/BpmProcessInstanceResultEvent.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/listener/BpmServiceResultListener.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/backlog/CrmBacklogController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/type/CrmBusinessStatusTypeSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueTranslateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.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/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableUpdateReqVO.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/business/CrmBusinessStatusService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/bo/CrmBusinessUpdateProductReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractResultListener.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/followup/bo/CrmUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/bo/CrmPermissionTransferReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customerlimitconfig/CrmCustomerLimitConfigServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
|
2 years ago |
|
YunaiV
|
a390fb4519
|
✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能
|
2 years ago |
|
YunaiV
|
088fbb2096
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
|
YunaiV
|
cb8d4e0976
|
✨ CRM：增加回款的待办事项逻辑
|
2 years ago |
|
YunaiV
|
a531ba2902
|
✨ CRM：增加回款超过合同的退款金额校验
|
2 years ago |
|
puhui999
|
dc695e3cda
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
puhui999
|
462a4ee823
|
重构 excel 导入模版下拉生成逻辑使用字段注解的方式配置下拉选择
|
2 years ago |
|
YunaiV
|
5fbb423621
|
✨ CRM：完善合同的待回款金额
|
2 years ago |
|
YunaiV
|
33b056e6c4
|
✨ CRM：完善回款的审批
|
2 years ago |
|
YunaiV
|
2890de8103
|
✨ CRM：完善回款的新增/修改
|
2 years ago |
|
YunaiV
|
332eb30b6c
|
✨ CRM：完善回款列表
|
2 years ago |
|
YunaiV
|
91c179029f
|
✨ CRM：完善回款 plan 新增/修改
|
2 years ago |
|
YunaiV
|
ba47402a7f
|
✨ CRM：完善回款 plan 列表
|
2 years ago |
|
puhui999
|
e5c3e69f5c
|
CRM: 完善回款
|
2 years ago |
|
puhui999
|
b9ffb7833c
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
puhui999
|
88cb683752
|
CRM: 完善回款
|
2 years ago |
|
YunaiV
|
c726cd3aff
|
✨ CRM：将 bi 调整成 statistics
|
2 years ago |
|
YunaiV
|
cd87f2e4aa
|
✨ CRM：code review 客户导出的实现
|
2 years ago |
|
YunaiV
|
e7bd2a568d
|
✨ CRM：增加商机关联联系人
|
2 years ago |
|
YunaiV
|
53ebd39c73
|
✨ CRM：待办事项（接入合同）
|
2 years ago |
|
YunaiV
|
0b0830f445
|
✨ CRM：增加合同配置表
|
2 years ago |
|
YunaiV
|
616ae8eaeb
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2 years ago |
|
YunaiV
|
b6098cff83
|
✨ CRM：商机接入合同列表
|
2 years ago |
|
YunaiV
|
29f1eb2c18
|
✨ CRM：优化 CRM 跟进记录的实现
|
2 years ago |
|
puhui999
|
dd6981d901
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
|
2 years ago |
|
puhui999
|
5dc1dbb3b2
|
完善 Excel 导入模版下拉选择生成实现
|
2 years ago |
|
YunaiV
|
3f8fa6b1bc
|
✨ CRM：简化 CRM 数据权限的实现
|
2 years ago |
|
YunaiV
|
a8f6a3d324
|
✨ CRM：完善 CRM 相关实现
|
2 years ago |
|
YunaiV
|
e53a0ca884
|
✨ CRM：code review 客户导入
|
2 years ago |
|
puhui999
|
be2431b73b
|
CRM: 完善回款审批逻辑
|
2 years ago |
|
puhui999
|
eddd0a8801
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
|
2 years ago |
|
YunaiV
|
4066ad3e1a
|
✨ CRM：完善合同的审批逻辑
|
2 years ago |
|
puhui999
|
5892c8897f
|
CRM: 流程状态转换封装
|
2 years ago |
|
puhui999
|
0a97ff03c6
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
|
2 years ago |
|
puhui999
|
c6b133d919
|
CRM: 完善回款
|
2 years ago |
|
puhui999
|
b3cfad9396
|
CRM: 完善回款计划
|
2 years ago |
|
YunaiV
|
d604e76d16
|
✨ CRM：完善合同的跟进记录实现
|
2 years ago |
|
YunaiV
|
b0def8b586
|
✨ CRM：完善合同的新增、修改实现
|
2 years ago |
|
YunaiV
|
ef26b5e8dc
|
✨ CRM：完善合同的列表实现
|
2 years ago |
|
puhui999
|
872fe53585
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
YunaiV
|
c97c9f882e
|
✨ CRM：完成商机状态的变更
|
2 years ago |
|
puhui999
|
0f2d974e9c
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
puhui999
|
41b8575b8d
|
CRM：完善客户导入
|
2 years ago |
|
YunaiV
|
740e9297fa
|
✨ CRM：完善商机和联系人之间的关联
|
2 years ago |
|
puhui999
|
b26eb6266f
|
CRM：新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
|
2 years ago |
|
YunaiV
|
d9b0c9b4cf
|
✨ CRM：完善商机的跟进记录
|
2 years ago |
|
puhui999
|
1ad5602a19
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
|
2 years ago |
|
YunaiV
|
77f98c4d12
|
✨ CRM：完善商机的新增、修改逻辑
|
2 years ago |
|
YunaiV
|
f76a7cd941
|
✨ CRM：重构商机状态的代码实现，不调整表结构
|
2 years ago |
|
YunaiV
|
e01dda9baf
|
✨ CRM：完善商机的列表
|
2 years ago |
|
puhui999
|
02b63de808
|
CRM：完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
7dd35f3295
|
✨ CRM：完善联系人的编辑、详情
|
2 years ago |
|
YunaiV
|
66a34a6d90
|
✨ CRM：完善联系人的列表
|
2 years ago |
|
YunaiV
|
4b41c3c692
|
✨ CRM：优化客户的 backlog 逻辑
|
2 years ago |
|
YunaiV
|
b444312ea8
|
✨ CRM：优化客户的过期到公海的逻辑
|
2 years ago |
|
YunaiV
|
3e6524932b
|
✨ CRM：优化客户的详情、更新成交状态
|
2 years ago |
|
YunaiV
|
69a974ef02
|
📖 CRM：线索的跟进逻辑
|
2 years ago |
|
芋道源码
|
bac476c131
|
!871 fix: 根据code-review修改Crm Backlog
Merge pull request !871 from dhb52/develop
|
2 years ago |
|
YunaiV
|
38e410cae0
|
📖 CRM：线索的转化逻辑
|
2 years ago |
|
YunaiV
|
fe330482b3
|
📖 CRM：线索 clue 新增/修改的完善
|
2 years ago |
|
YunaiV
|
49bc70ed82
|
📖 CRM：线索 clue 列表的完善
|
2 years ago |