Commit Graph

358 Commits

Author SHA1 Message Date
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
芋道源码 cd28128e42
!859 feat: CRM-backlog-待进入公海的客户
Merge pull request !859 from dhb52/crm-msg
2024-01-30 04:14:32 +00:00
YunaiV 52a68e1838 📖 CRM:code review 合同金额排行榜、回款金额排行榜 2024-01-30 09:24:42 +08:00
anhaohao bfed37af6f 修改:CRM 商业智能,回款金额排行榜时间字段 bug 2024-01-28 21:47:52 +08:00
puhui999 4418a7bebc CRM-合同:完善新增合同插入关联的商品 2024-01-28 20:15:11 +08:00
anhaohao fdd5d55fc8 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:11:00 +08:00
anhaohao 65d7f8c4ab 新增:CRM 商业智能,合同金额排行榜和回款金额排行榜 2024-01-28 20:06:56 +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
puhui999 7b36eb888e CRM-合同:RespVO 添加导出注解 2024-01-17 12:11:39 +08:00
puhui999 ff9cef6a92 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔ 2024-01-17 12:00:51 +08:00
dhb52 5105c6d16f wip: LocalDate.now().atTime 2024-01-16 11:06:01 +08:00
dhb52 08e23a7dc4 wip: style-fix 2024-01-15 22:47:46 +08:00
YunaiV 9819e05d4e Merge branch 'develop' of https://gitee.com/aberizofur/ruoyi-vue-pro into develop 2024-01-15 21:34:47 +08:00
YunaiV a886ad9785 📖 CRM:跟进记录的 code review 2024-01-15 21:30:32 +08:00
lzxhqs 510b4fd3de 商机模块合并代码 2024-01-15 17:50:46 +08:00
dhb52 4bd97c4baf wip: 根据code review优化代码 2024-01-15 17:41:21 +08:00
YunaiV 410c551e03 📖 CRM:跟进记录的 code review 2024-01-15 13:43:15 +08:00
芋道源码 e64e60c711
!832 CRM: 完善一些 TODO
Merge pull request !832 from puhui999/develop
2024-01-15 04:37:24 +00:00
芋道源码 cc6cb83507
!833 修改:CRM 产品,产品列表查询接入数据权限
Merge pull request !833 from 安浩浩/develop
2024-01-15 04:33:16 +00:00
YunaiV 9b7f6cfbac 📖 CRM:线索的 code review 2024-01-15 12:29:57 +08:00
芋道源码 4ca1f72d4f
!829 CRM:【线索】
Merge pull request !829 from Minh-X/develop
2024-01-15 04:22:23 +00:00
YunaiV 64e1d68923 📖 CRM:待办事项的 code review 2024-01-15 12:15:52 +08:00
anhaohao 454e800067 修改:CRM 产品,产品列表查询接入数据权限 2024-01-15 10:51:23 +08:00
puhui999 5efa0f327f crm: 完善一些 TODO 2024-01-14 22:49:01 +08:00
dhb52 4558ecd836 wip: 待办事项 2024-01-14 22:45:16 +08:00
lzxhqs f361d05940 商机模块 2024-01-14 09:52:35 +08:00
puhui999 73c459f360 完善更进 2024-01-14 00:22:17 +08:00
min 2de0fb48ea CRM:【线索】 线索如果不存在或者已经转化,抛出异常 2024-01-13 23:27:21 +08:00
min fe0bde8417 CRM:【线索】 CrmClueExcelVO 融合到 CrmClueRespVO 里 2024-01-13 23:27:21 +08:00
puhui999 eaa8e4be96 操作日志字段解析方法调整 2024-01-13 22:29:05 +08:00
YunaiV df29f0682f 📖 CRM:线索模块的 review 2024-01-13 11:07:28 +08:00
YunaiV 8d2008f2b5 Merge branch 'develop' of https://gitee.com/Minh-X/ruoyi-vue-pro into develop
# Conflicts:
#	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/clue/CrmClueServiceImpl.java
2024-01-13 11:04:20 +08:00
YunaiV 6891b75e27 📖 CRM:产品模块的 review 2024-01-13 10:25:04 +08:00
芋道源码 19c0227cef
!826 CRM 产品分类和产品,优化了操作日志 ,新增获得产品操作日志
Merge pull request !826 from 安浩浩/develop
2024-01-13 02:04:37 +00:00
YunaiV e79c750b46 📖 CRM:code review 跟进记录的实现 2024-01-13 09:56:53 +08:00
anhaohao 008f88d185 新增:CRM 产品,新增获得产品操作日志 2024-01-11 17:45:09 +08:00
anhaohao 803816b162 修改:CRM 产品分类和产品,优化了操作日志 2024-01-11 16:02:05 +08:00
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