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
芋道源码 9ea43ce55a
!932 CRM: 完善用户画像数据统计 
Merge pull request !932 from puhui999/develop
 2024-04-05 05:55:15 +00:00
YunaiV 9b9f54bb03 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
 2024-04-05 13:32:17 +08:00
YunaiV 20583417a4 【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:49:49 +08:00
YunaiV 000b6cf47f 【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:21:08 +08:00
puhui999 eeed1fdf66 Merge remote-tracking branch 'yudao/develop' into develop 2024-04-03 11:04:42 +08:00
puhui999 a9a8efc808 CRM: 完善用户画像数据统计 2024-04-03 10:09:46 +08:00
dhb52 1944199f67 fix: 按Code-Review修改CrmStatisticsCustomerMapper.xml 2024-04-02 23:44:17 +08:00
YunaiV beea186507 全局：增加 VO 数据翻译的支持 2024-04-01 12:42:27 +08:00
YunaiV a68abc43ae CRM：修复 `@RequestBody` 和 Multipart 不能同时存在的异常和导入客户后序列化产生的异常 2024-03-30 17:06:13 +08:00
YunaiV f591a04317 CRM：code review【员工业绩】的实现 2024-03-30 14:39:34 +08:00
芋道源码 08c851aeab
!916 CRM员工业绩统计PR v1.0 
Merge pull request !916 from scholarli/develop
 2024-03-30 06:25:28 +00:00
YunaiV 3f5724e978 CRM：code review【客户画像】的实现 2024-03-30 14:17:28 +08:00
YunaiV 924580f4a2 CRM：重构【客户画像】，从【客户统计】拆分出去先~ 2024-03-30 13:51:46 +08:00
YunaiV 3b379d8cc0 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/statistics/CrmStatisticsCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
 2024-03-30 11:54:27 +08:00
YunaiV 8266fb8f94 CRM：完善【排行版】功能 2024-03-30 11:49:06 +08:00
YunaiV a8bec19196 CRM：code review【客户统计】的代码实现 2024-03-30 11:00:15 +08:00
YunaiV 90f82b157d CRM：优化【客户统计】的代码实现 2024-03-30 09:22:54 +08:00
芋道源码 eab9627253
!909 feat: [CRM-客户分析]增加[时间间隔]选项 
Merge pull request !909 from dhb52/develop
 2024-03-28 11:13:18 +00:00
YunaiV a80ba48889 bugfix：同步 master 修改的 bug 2024-03-28 19:05:16 +08:00
YunaiV 907f3a58ba Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2024-03-28 18:53:54 +08:00
YunaiV 3b8dee4963 BPM：完善相关的代码注释 2024-03-26 08:38:59 +08:00
puhui999 22191e81e3 CRM: 新增客户区域数据统计 2024-03-24 22:24:46 +08:00
puhui999 ce013a2562 CRM: 新增客户行业、来源、级别统计数据统计 2024-03-24 17:15:56 +08:00
YunaiV e5444c5d47 BPM：优化 convert 的逻辑 2024-03-20 21:32:01 +08:00
YunaiV c4688d887c BPM：增加 task 的审批建议 2024-03-18 18:41:04 +08:00
scholar 705a3e53ca CRM员工业绩统计PR v2.0 2024-03-15 12:09:19 +08:00
dhb52 03213e3254 fix: [CRM-客户分析]更新http-client脚本,增加intervalType请求参数 2024-03-10 14:30:59 +08:00
dhb52 4ac28603b8 feat: [CRM-客户分析]增加[时间间隔]选项 2024-03-10 10:30:25 +08:00
dhb52 ee2be79987 fix: [CRM-客户统计]根据Code-Review 修改代码 2024-03-09 22:51:38 +08:00
YunaiV d556b29214 CRM：code review 权限的优化 2024-03-09 18:27:58 +08:00
芋道源码 6b752b5cb4
!907 CRM: 根据 review 完善数据权限 
Merge pull request !907 from puhui999/develop
 2024-03-09 10:01:41 +00:00
puhui999 af5fbb6ff4 CRM: TransferReqVO bizId -> id、修复商机转移错误 2024-03-09 17:54:14 +08:00
puhui999 47a698868c CRM: 根据 review 完善数据权限 2024-03-09 17:00:05 +08:00
YunaiV 8dcc12f215 CRM：code review 客户总量统计 2024-03-09 16:32:18 +08:00
芋道源码 85817a2426
!902 fix: [CRM-客户统计]根据Code-Review 修改 
Merge pull request !902 from dhb52/develop
 2024-03-09 07:38:44 +00:00
puhui999 0043d02d0a fix：商机 api 文档生成不对的问题 2024-03-09 14:31:43 +08:00
YunaiV 89fc83c419 CRM：code review 客户权限的实现 2024-03-09 11:58:05 +08:00
芋道源码 e2ec426a9f
!900 CRM：完善数据权限，实现数据权限同时添加、同时转移 
Merge pull request !900 from puhui999/develop
 2024-03-09 03:18:12 +00:00
dhb52 0386820a1c feat: 增加[客户行业、客户来源]等字段显示，重构代码 2024-03-05 23:16:16 +08:00
dhb52 06c0d86544
fix: 使用convertSetByFlatMap避免 ID 重复 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-03-05 15:08:40 +00:00
dhb52 a23ea45632 fix: [CRM-客户统计]根据Code-Review 修改 2024-03-04 23:51:25 +08:00
puhui999 ba1b028001 CRM：完善数据权限，实现数据权限同时添加、同时转移 2024-03-03 20:10:30 +08:00
puhui999 f56fab932a CRM：完善 excel 导出 review 提到的问题 2024-03-02 23:24:42 +08:00
YunaiV 1f35ef59d1 CRM：code review excel 导出的重构 2024-03-02 00:25:51 +08:00
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
 2024-03-01 23:46:50 +08:00
YunaiV 379bd95840 CRM：code review 客户分析（客户总量分析） 2024-03-01 23:37:07 +08:00
芋道源码 2bf5c7a701
!889 feat: CRM/数据统计/员工客户分析 初稿 
Merge pull request !889 from dhb52/develop
 2024-03-01 14:21:40 +00:00
YunaiV dda0909843 🎉 2.0.1 版本发布！ 2024-03-01 20:01:16 +08:00
zhanhong 814acb83ae fix:跟进记录分页不显示商机 2024-03-01 09:28:06 +08:00
YunaiV 8ff710e49d ✨ 同步 master 的一些 pr 代码变更 2024-03-01 09:00:43 +08:00
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