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

489 Commits

Author SHA1 Message Date
dhb52 34f68ce4c6 feat: CRM/数据统计/员工客户分析 初稿 2024-03-01 00:10:23 +08:00
dhb52 fbb624d826 feat: CRM/数据统计/员工客户分析/客户跟进次数分析 2024-02-28 23:07:38 +08:00
YunaiV 8b6bc7c54e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-02-28 23:04:18 +08:00
芋道源码 b135314482
!890 修复：CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示 
Merge pull request !890 from 李占宏/develop
 2024-02-28 14:56:07 +00:00
YunaiV 1f4889c68e ✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter 2024-02-28 21:42:32 +08:00
dhb52 a0b413b3a3 refactor: CRM/数据统计/排行榜 重命名 2024-02-28 21:41:53 +08:00
dhb52 7d120a2f36 feat: CRM/数据统计/客户总量分析 2024-02-28 21:41:10 +08:00
puhui999 720b54c353 CRM: 完善回款操作日志 2024-02-28 11:25:06 +08:00
zhanhong b94cd08772 修复：CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭"); 2024-02-28 00:07:51 +08:00
zhanhong 89aca4572d 修复：CRM 合同配置不提醒，待办事项中即将到期的合同查询报错 2024-02-28 00:00:23 +08:00
zhanhong 8222c3a831 修复：CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId 2024-02-27 23:51:26 +08:00
puhui999 c4ff0a1038 Merge remote-tracking branch 'yudao/develop' into develop 2024-02-27 21:28:23 +08:00
YunaiV d134bfc4a6 ✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类 2024-02-27 17:15:55 +08:00
YunaiV 2aade25e78 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-02-26 23:18:03 +08:00
e7c_corp a6e13da602
fix: 兼容有些21jdk getFirst 会找不到符合的错误 
兼容有些21jdk getFirst 会找不到符合的错误
 2024-02-26 15:00:50 +00:00
YunaiV a390fb4519 ✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能 2024-02-26 12:55:58 +08:00
YunaiV 088fbb2096 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-02-26 12:25:55 +08:00
YunaiV cb8d4e0976 ✨ CRM：增加回款的待办事项逻辑 2024-02-26 12:24:40 +08:00
YunaiV a531ba2902 ✨ CRM：增加回款超过合同的退款金额校验 2024-02-26 09:27:13 +08:00
puhui999 dc695e3cda Merge remote-tracking branch 'yudao/develop' into develop 2024-02-25 22:32:37 +08:00
puhui999 462a4ee823 重构 excel 导入模版下拉生成逻辑使用字段注解的方式配置下拉选择 2024-02-25 22:32:12 +08:00
YunaiV 5fbb423621 ✨ CRM：完善合同的待回款金额 2024-02-25 20:50:37 +08:00
YunaiV 33b056e6c4 ✨ CRM：完善回款的审批 2024-02-25 20:01:08 +08:00
YunaiV 2890de8103 ✨ CRM：完善回款的新增/修改 2024-02-25 18:44:26 +08:00
YunaiV 332eb30b6c ✨ CRM：完善回款列表 2024-02-25 16:52:13 +08:00
YunaiV 91c179029f ✨ CRM：完善回款 plan 新增/修改 2024-02-25 16:09:16 +08:00
YunaiV ba47402a7f ✨ CRM：完善回款 plan 列表 2024-02-25 09:23:42 +08:00
puhui999 e5c3e69f5c CRM: 完善回款 2024-02-25 02:11:19 +08:00
puhui999 b9ffb7833c Merge remote-tracking branch 'yudao/develop' into develop 2024-02-25 00:39:47 +08:00
puhui999 88cb683752 CRM: 完善回款 2024-02-25 00:36:08 +08:00
YunaiV c726cd3aff ✨ CRM：将 bi 调整成 statistics 2024-02-24 22:26:24 +08:00
YunaiV cd87f2e4aa ✨ CRM：code review 客户导出的实现 2024-02-24 19:57:26 +08:00
YunaiV e7bd2a568d ✨ CRM：增加商机关联联系人 2024-02-24 19:35:32 +08:00
YunaiV 53ebd39c73 ✨ CRM：待办事项（接入合同） 2024-02-24 17:55:40 +08:00
YunaiV 0b0830f445 ✨ CRM：增加合同配置表 2024-02-24 16:51:16 +08:00
YunaiV 616ae8eaeb Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-02-24 16:08:37 +08:00
YunaiV b6098cff83 ✨ CRM：商机接入合同列表 2024-02-24 16:08:07 +08:00
YunaiV 29f1eb2c18 ✨ CRM：优化 CRM 跟进记录的实现 2024-02-24 15:46:57 +08:00
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
 2024-02-24 11:44:52 +08:00
puhui999 5dc1dbb3b2 完善 Excel 导入模版下拉选择生成实现 2024-02-24 11:40:58 +08:00
YunaiV 3f8fa6b1bc ✨ CRM：简化 CRM 数据权限的实现 2024-02-24 11:14:30 +08:00
YunaiV a8f6a3d324 ✨ CRM：完善 CRM 相关实现 2024-02-24 08:18:10 +08:00
YunaiV e53a0ca884 ✨ CRM：code review 客户导入 2024-02-23 18:50:22 +08:00
puhui999 be2431b73b CRM: 完善回款审批逻辑 2024-02-23 14:37:03 +08:00
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
 2024-02-23 14:16:24 +08:00
YunaiV 4066ad3e1a ✨ CRM：完善合同的审批逻辑 2024-02-23 12:59:16 +08:00
puhui999 5892c8897f CRM: 流程状态转换封装 2024-02-23 12:20:08 +08:00
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
 2024-02-23 12:16:37 +08:00
puhui999 c6b133d919 CRM: 完善回款 2024-02-23 12:14:56 +08:00
puhui999 b3cfad9396 CRM: 完善回款计划 2024-02-23 10:42:36 +08:00
YunaiV d604e76d16 ✨ CRM：完善合同的跟进记录实现 2024-02-23 09:31:41 +08:00
YunaiV b0def8b586 ✨ CRM：完善合同的新增、修改实现 2024-02-23 00:04:57 +08:00
YunaiV ef26b5e8dc ✨ CRM：完善合同的列表实现 2024-02-22 21:54:06 +08:00
puhui999 872fe53585 Merge remote-tracking branch 'yudao/develop' into develop 2024-02-22 21:26:28 +08:00
YunaiV c97c9f882e ✨ CRM：完成商机状态的变更 2024-02-22 20:41:28 +08:00
puhui999 0f2d974e9c Merge remote-tracking branch 'yudao/develop' into develop 2024-02-22 11:08:11 +08:00
puhui999 41b8575b8d CRM：完善客户导入 2024-02-22 11:07:34 +08:00
YunaiV 740e9297fa ✨ CRM：完善商机和联系人之间的关联 2024-02-22 09:35:57 +08:00
puhui999 b26eb6266f CRM：新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择 2024-02-22 00:58:50 +08:00
YunaiV d9b0c9b4cf ✨ CRM：完善商机的跟进记录 2024-02-21 23:37:10 +08:00
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
 2024-02-21 22:42:41 +08:00
YunaiV 77f98c4d12 ✨ CRM：完善商机的新增、修改逻辑 2024-02-21 21:49:49 +08:00
YunaiV f76a7cd941 ✨ CRM：重构商机状态的代码实现，不调整表结构 2024-02-21 20:10:13 +08:00
YunaiV e01dda9baf ✨ CRM：完善商机的列表 2024-02-21 18:45:10 +08:00
puhui999 02b63de808 CRM：完善 review 提到的问题 2024-02-21 14:27:25 +08:00
YunaiV 7dd35f3295 ✨ CRM：完善联系人的编辑、详情 2024-02-20 23:32:26 +08:00
YunaiV 66a34a6d90 ✨ CRM：完善联系人的列表 2024-02-20 21:18:45 +08:00
YunaiV 4b41c3c692 ✨ CRM：优化客户的 backlog 逻辑 2024-02-20 20:19:59 +08:00
YunaiV b444312ea8 ✨ CRM：优化客户的过期到公海的逻辑 2024-02-20 19:07:48 +08:00
YunaiV 3e6524932b ✨ CRM：优化客户的详情、更新成交状态 2024-02-20 12:55:44 +08:00
YunaiV 69a974ef02 📖 CRM：线索的跟进逻辑 2024-02-19 22:47:28 +08:00
芋道源码 bac476c131
!871 fix: 根据code-review修改Crm Backlog 
Merge pull request !871 from dhb52/develop
 2024-02-19 14:10:17 +00:00
YunaiV 38e410cae0 📖 CRM：线索的转化逻辑 2024-02-19 20:41:10 +08:00
YunaiV fe330482b3 📖 CRM：线索 clue 新增/修改的完善 2024-02-19 19:02:12 +08:00
YunaiV 49bc70ed82 📖 CRM：线索 clue 列表的完善 2024-02-19 13:02:41 +08:00
dhb52 dca262c64b fix: 根据code-review修改 2024-02-18 22:58:23 +08:00
YunaiV 1bfb406041 📖 CRM：code review 待提醒逻辑 2024-02-18 21:47:36 +08:00
芋道源码 51f52ff4b7
!870 feat: CRM/backlog 提醒数量 
Merge pull request !870 from dhb52/develop
 2024-02-18 13:27:44 +00:00
YunaiV 4bf4432f93 ✨ CRM：单测暂时不写 2024-02-18 21:11:43 +08:00
dhb52 1ba2b7b600 fix: Customer,Clue增加followUpStatus自动查询 2024-02-18 00:21:10 +08:00
dhb52 cd1e73cc3f Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
 2024-02-18 00:05:24 +08:00
dhb52 d23dfd4276 feat: CRM/backlog 提醒数量 2024-02-18 00:03:11 +08:00
YunaiV 21452af780 ✨ 2.0.1 版本发布准备 2024-02-17 23:44:23 +08:00
YunaiV 0fba56cda8 📖 CRM：code review 合同逻辑 2024-02-17 19:14:48 +08:00
YunaiV c6041da3c4 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImplTest.java
 2024-02-17 18:17:32 +08:00
YunaiV c40ea1eaa6 📖 CRM：code review 商业智能的排行版 2024-02-17 18:14:28 +08:00
芋道源码 bba32c6ba3
!866 新增：CRM 商业智能，其他排名接口 
Merge pull request !866 from 安浩浩/develop
 2024-02-17 10:06:18 +00:00
YunaiV 5955f39e24 📖 CRM：code review 待办项目的实现 2024-02-17 18:02:48 +08:00
dhb52 a5d33692c1 refactor: TodayCustomer利用CrmCustomerController#getCustomerPage 2024-02-16 22:45:37 +08:00
puhui999 9caaa96e5b CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品 2024-02-08 11:53:23 +08:00
dhb52 3b612b2e6d feat: 待回款提醒,即将到期的合同,待审核回款 2024-02-07 23:53:48 +08:00
dhb52 6fc8c4809f feat: 合同[审批状态]条件筛选 2024-02-06 22:58:01 +08:00
puhui999 84f3b230d2 CRM-合同: 新增合同关联商品 2024-02-05 00:14:50 +08:00
安浩浩 3213cad317 新增：CRM 商业智能，其他排名接口 2024-02-04 23:54:58 +08:00
YunaiV bf8ec22144 📖 CRM：code review 合同的代码实现 2024-02-04 12:57:26 +08:00
YunaiV 3347d3320d 📖 CRM：code review 合同的代码实现 2024-02-04 09:41:50 +08:00
puhui999 ba6218b835 CRM-合同: transfer 2024-02-03 22:13:02 +08:00
puhui999 59dfa10461 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/business/CrmBusinessServiceImpl.java
 2024-02-03 20:52:08 +08:00
puhui999 53badfc367 CRM-CONTRACT: 完善合同编辑回显 2024-02-03 20:49:13 +08:00
puhui999 6a63f2f078 CRM-CONTRACT: 完善合同编辑回显 2024-02-03 14:08:06 +08:00
puhui999 59e6f23788 CRM-CONTRACT: 完善 TODO 2024-02-03 12:29:28 +08:00
YunaiV e9a29e6dd4 CRM：优化合同金额排行、回款金额排行 2024-02-03 01:14:35 +08:00
芋道源码 1fd731a90a
!861 修改：CRM 商业智能，合并模块到 crm，优化查询 
Merge pull request !861 from 安浩浩/develop
 2024-02-02 01:29:35 +00:00
puhui999 1a96fb2ffc 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
 2024-02-01 14:17:15 +08:00
YunaiV f5f827b59f 📖 CRM：code review 合同流程 2024-02-01 09:46:32 +08:00
puhui999 624b35988e BPM: 实现业务流程结果监听器 2024-02-01 00:45:29 +08:00
安浩浩 46e01e07a8 修改：CRM 商业智能，合并模块到 crm，优化查询 2024-01-31 23:35:27 +08:00
芋道源码 acb8d3f23b
!858 CRM-客户: 完善客户导入 
Merge pull request !858 from puhui999/develop
 2024-01-30 04:41:14 +00:00
YunaiV 6f95f37117 📖 CRM：code review 待进入公海的客户 2024-01-30 12:40:23 +08:00
puhui999 4418a7bebc CRM-合同：完善新增合同插入关联的商品 2024-01-28 20:15:11 +08:00
puhui999 ea6752f15e BPM: 新增通过流程标识获取流程图 2024-01-28 16:34:39 +08:00
puhui999 1cab3c009c CRM-合同：新增发起合同审批 2024-01-28 01:50:27 +08:00
dhb52 5d8ca19b17 feat: CRM-backlog-待进入公海的客户 2024-01-28 00:22:58 +08:00
YunaiV ebd9222764 ✨ ERP：初始化模块，立个 2024 年的 flag 2024-01-27 17:25:07 +08:00
puhui999 a877bb4731 CRM-客户: 完善客户导入 2024-01-27 15:15:30 +08:00
puhui999 4605e93105 CRM-客户: 完善客户导入 2024-01-27 14:30:30 +08:00
puhui999 d8b2da8eed CRM-客户: 完善 TODO 2024-01-27 13:34:59 +08:00
YunaiV d492daced4 📖 CRM：code review 跟进记录 2024-01-27 00:55:42 +08:00
芋道源码 6a6f669c7f
!854 CRM：【线索】 
Merge pull request !854 from Minh-X/develop
 2024-01-26 15:46:47 +00:00
YunaiV 814b6f688d 📖 CRM：code review 跟进记录 2024-01-26 23:46:02 +08:00
Minh-X 11ce24ad1e
修改CrmClueRespVO字段描述 
Signed-off-by: Minh-X <bluesfish@yeah.net>
 2024-01-25 14:17:24 +00:00
min ce397d4fbd CRM：【线索】增加字段 2024-01-24 00:27:09 +08:00
puhui999 ed92bf45ce CRM: 客户自动掉入公海 2024-01-23 23:30:13 +08:00
puhui999 6850c7c71d CRM: 完善跟进日志 TODO 2024-01-23 22:31:51 +08:00
YunaiV a86bce6f8b 📖 CRM：code review 商机模块 2024-01-23 09:35:45 +08:00
YunaiV 655fc03394 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-01-23 09:24:00 +08:00
芋道源码 14d2195c6d
!850 商机模块代码优化 
Merge pull request !850 from lzxhqs/develop
 2024-01-23 01:23:52 +00:00
YunaiV d732008ef8 📖 CRM：code review 跟进日志 2024-01-23 09:22:02 +08:00
puhui999 86a177226d FIX: 修复启动报错 2024-01-22 23:23:00 +08:00
puhui999 ca9f3c522d CRM-线索：完善操作日志 2024-01-22 22:46:52 +08:00
puhui999 8675d13548 CRM-线索：完善线索转客户 2024-01-22 22:23:23 +08:00
puhui999 f7d41186e4 CRM: 获取模块操作日志接口抽离 2024-01-22 20:30:12 +08:00
lzxhqs fb54c5fc89 商机模块代码优化 2024-01-22 16:48:59 +08:00
YunaiV 206899bfc0 📖 CRM：code review 待办事项 2024-01-22 12:23:24 +08:00
芋道源码 422b19caf7
!847 fix: 根据Code Review修改代办消息backlog 
Merge pull request !847 from dhb52/crm-msg
 2024-01-22 04:14:18 +00:00
YunaiV 23ef3c8ae0 📖 CRM：code review 跟进记录 2024-01-22 08:53:59 +08:00
puhui999 227a4f126a CRM: 完善跟进 TODO 2024-01-20 23:07:15 +08:00
puhui999 f366d440d8 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-20 22:50:35 +08:00
puhui999 d293fdd474 fix: 修复 CRM 的一些 bug 2024-01-20 22:49:47 +08:00
dhb52 231fd68435 Merge remote-tracking branch 'upstream/develop' into crm-msg 2024-01-20 22:03:32 +08:00
YunaiV c6c8dddfec 📖 CRM：code review 跟进记录 2024-01-20 19:05:16 +08:00
芋道源码 5b26d8fa00
!844 CRM: 完善跟进 TODO 
Merge pull request !844 from puhui999/develop
 2024-01-20 11:00:23 +00:00
YunaiV 39ae547b9d 📖 CRM：code review 线索逻辑 2024-01-20 18:55:28 +08:00
puhui999 8920b9787d fix: CRM selectBatchIds 权限查询 ids 筛选不生效的 bug 2024-01-20 18:42:06 +08:00
min 604611e1d2 CRM：【线索】补充相关日志 2024-01-20 15:38:55 +08:00
min 4ce9271ece CRM：【线索】创建、删除线索时同时创建、删除数据权限 2024-01-20 15:08:45 +08:00
puhui999 7914423c66 CRM: 完善跟进 TODO 2024-01-20 14:56:31 +08:00
min ba4f9207e2 CRM：【线索】使用工具类替换stream操作 2024-01-20 13:55:05 +08:00
YunaiV 6624a93a84 CRM：跟进记录 code review 2024-01-18 12:17:12 +08:00
YunaiV ca55282516 CRM：商机 code review 2024-01-18 12:06:14 +08:00