dhb52
|
a0b413b3a3
|
refactor: CRM/数据统计/排行榜 重命名
|
2024-02-28 21:41:53 +08:00 |
|
dhb52
|
7d120a2f36
|
feat: CRM/数据统计/客户总量分析
|
2024-02-28 21:41:10 +08:00 |
|
YunaiV
|
91b3c16a90
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-02-28 21:04:19 +08:00 |
|
YunaiV
|
6dcb1277b3
|
✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块
|
2024-02-28 21:03:40 +08:00 |
|
YunaiV
|
0dc23d38b9
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java
|
2024-02-28 20:32:16 +08:00 |
|
YunaiV
|
0317e4279d
|
✨ 全局：简化 captcha 组件，融合到 system 模块
|
2024-02-28 20:31:55 +08:00 |
|
YunaiV
|
2dc7376ec6
|
✨ 全局：简化 file 组件，融合到 infra 模块
|
2024-02-28 19:17:18 +08:00 |
|
YunaiV
|
0480cdf03f
|
✨ 全局：简化 file 组件，融合到 infra 模块
|
2024-02-28 19:17:00 +08:00 |
|
YunaiV
|
746133226f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentDAOImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java
|
2024-02-28 19:08:05 +08:00 |
|
YunaiV
|
77d634038c
|
✨ 全局：简化 file 组件，融合到 infra 模块
|
2024-02-28 18:59:33 +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 |
|
puhui999
|
c3337f21ce
|
fix：主子表 props
|
2024-02-28 00:07:25 +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
|
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
|
2024-02-27 21:01:52 +08:00 |
|
YunaiV
|
067ff6cc4d
|
✨ bugfix master 的一些 pr
|
2024-02-27 21:01:02 +08:00 |
|
芋道源码
|
ccc0a09317
|
!877 修正注释错误
Merge pull request !877 from moon69/master
|
2024-02-27 12:49:13 +00:00 |
|
芋道源码
|
74a669f6aa
|
!878 修复：错误的queryWrapper构建
Merge pull request !878 from oah/fixbug
|
2024-02-27 12:42:04 +00:00 |
|
YunaiV
|
d134bfc4a6
|
✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类
|
2024-02-27 17:15:55 +08:00 |
|
dhb52
|
e4f1564ade
|
fix: 获取redis命令统计指令有误
Signed-off-by: dhb52 <dhb52@126.com>
|
2024-02-27 08:22:19 +00: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 |
|
芋道源码
|
b285548b9d
|
!882 fix: 兼容有些21jdk getFirst 会找不到符合的错误
Merge pull request !882 from e7c_corp/N/A
|
2024-02-26 15:08:09 +00:00 |
|
e7c_corp
|
a6e13da602
|
fix: 兼容有些21jdk getFirst 会找不到符合的错误
兼容有些21jdk getFirst 会找不到符合的错误
|
2024-02-26 15:00:50 +00:00 |
|
YunaiV
|
02466aca2e
|
✨ 2.0.1 版本发布准备
|
2024-02-26 13:14:39 +08:00 |
|
YunaiV
|
0c600a7358
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-02-26 13:09:59 +08:00 |
|
YunaiV
|
31e8777a7b
|
✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能
|
2024-02-26 13:09:51 +08:00 |
|
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
|
2024-02-26 12:57:56 +08: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 |
|
芋道源码
|
85c9524a2d
|
!880 CRM: 完善回款
Merge pull request !880 from puhui999/develop
|
2024-02-25 00:15:45 +00: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 |
|