411 Commits (ce013a2562883f22884ce267ac8f980dd86c73d4)

Author SHA1 Message Date
YunaiV 4bf4432f93 CRM:单测暂时不写 2 years ago
dhb52 1ba2b7b600 fix: Customer,Clue增加followUpStatus自动查询 2 years ago
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
2 years ago
dhb52 d23dfd4276 feat: CRM/backlog 提醒数量 2 years ago
YunaiV 21452af780 2.0.1 版本发布准备 2 years ago
YunaiV 0fba56cda8 📖 CRM:code review 合同逻辑 2 years ago
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
2 years ago
YunaiV c40ea1eaa6 📖 CRM:code review 商业智能的排行版 2 years ago
芋道源码 bba32c6ba3
!866 新增:CRM 商业智能,其他排名接口
Merge pull request !866 from 安浩浩/develop
2 years ago
YunaiV 5955f39e24 📖 CRM:code review 待办项目的实现 2 years ago
dhb52 a5d33692c1 refactor: TodayCustomer利用CrmCustomerController#getCustomerPage 2 years ago
puhui999 9caaa96e5b CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品 2 years ago
dhb52 3b612b2e6d feat: 待回款提醒,即将到期的合同,待审核回款 2 years ago
dhb52 6fc8c4809f feat: 合同[审批状态]条件筛选 2 years ago
puhui999 84f3b230d2 CRM-合同: 新增合同关联商品 2 years ago
安浩浩 3213cad317 新增:CRM 商业智能,其他排名接口 2 years ago
YunaiV bf8ec22144 📖 CRM:code review 合同的代码实现 2 years ago
YunaiV 3347d3320d 📖 CRM:code review 合同的代码实现 2 years ago
puhui999 ba6218b835 CRM-合同: transfer 2 years ago
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
2 years ago
puhui999 53badfc367 CRM-CONTRACT: 完善合同编辑回显 2 years ago
puhui999 6a63f2f078 CRM-CONTRACT: 完善合同编辑回显 2 years ago
puhui999 59e6f23788 CRM-CONTRACT: 完善 TODO 2 years ago
YunaiV e9a29e6dd4 CRM:优化合同金额排行、回款金额排行 2 years ago
芋道源码 1fd731a90a
!861 修改:CRM 商业智能,合并模块到 crm,优化查询
Merge pull request !861 from 安浩浩/develop
2 years ago
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
2 years ago
YunaiV f5f827b59f 📖 CRM:code review 合同流程 2 years ago
puhui999 624b35988e BPM: 实现业务流程结果监听器 2 years ago
安浩浩 46e01e07a8 修改:CRM 商业智能,合并模块到 crm,优化查询 2 years ago
芋道源码 acb8d3f23b
!858 CRM-客户: 完善客户导入
Merge pull request !858 from puhui999/develop
2 years ago
YunaiV 6f95f37117 📖 CRM:code review 待进入公海的客户 2 years ago
puhui999 4418a7bebc CRM-合同:完善新增合同插入关联的商品 2 years ago
puhui999 ea6752f15e BPM: 新增通过流程标识获取流程图 2 years ago
puhui999 1cab3c009c CRM-合同:新增发起合同审批 2 years ago
dhb52 5d8ca19b17 feat: CRM-backlog-待进入公海的客户 2 years ago
YunaiV ebd9222764 ERP:初始化模块,立个 2024 年的 flag 2 years ago
puhui999 a877bb4731 CRM-客户: 完善客户导入 2 years ago
puhui999 4605e93105 CRM-客户: 完善客户导入 2 years ago
puhui999 d8b2da8eed CRM-客户: 完善 TODO 2 years ago
YunaiV d492daced4 📖 CRM:code review 跟进记录 2 years ago
芋道源码 6a6f669c7f
!854 CRM:【线索】
Merge pull request !854 from Minh-X/develop
2 years ago
YunaiV 814b6f688d 📖 CRM:code review 跟进记录 2 years ago
Minh-X 11ce24ad1e
修改CrmClueRespVO字段描述
Signed-off-by: Minh-X <bluesfish@yeah.net>
2 years ago
min ce397d4fbd CRM:【线索】增加字段 2 years ago
puhui999 ed92bf45ce CRM: 客户自动掉入公海 2 years ago
puhui999 6850c7c71d CRM: 完善跟进日志 TODO 2 years ago
YunaiV a86bce6f8b 📖 CRM:code review 商机模块 2 years ago
YunaiV 655fc03394 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2 years ago
芋道源码 14d2195c6d
!850 商机模块代码优化
Merge pull request !850 from lzxhqs/develop
2 years ago
YunaiV d732008ef8 📖 CRM:code review 跟进日志 2 years ago
puhui999 86a177226d FIX: 修复启动报错 2 years ago
puhui999 ca9f3c522d CRM-线索:完善操作日志 2 years ago
puhui999 8675d13548 CRM-线索:完善线索转客户 2 years ago
puhui999 f7d41186e4 CRM: 获取模块操作日志接口抽离 2 years ago
lzxhqs fb54c5fc89 商机模块代码优化 2 years ago
YunaiV 206899bfc0 📖 CRM:code review 待办事项 2 years ago
芋道源码 422b19caf7
!847 fix: 根据Code Review修改代办消息backlog
Merge pull request !847 from dhb52/crm-msg
2 years ago
YunaiV 23ef3c8ae0 📖 CRM:code review 跟进记录 2 years ago
puhui999 227a4f126a CRM: 完善跟进 TODO 2 years ago
puhui999 f366d440d8 Merge remote-tracking branch 'yudao/develop' into develop 2 years ago
puhui999 d293fdd474 fix: 修复 CRM 的一些 bug 2 years ago
dhb52 231fd68435 Merge remote-tracking branch 'upstream/develop' into crm-msg 2 years ago
YunaiV c6c8dddfec 📖 CRM:code review 跟进记录 2 years ago
芋道源码 5b26d8fa00
!844 CRM: 完善跟进 TODO
Merge pull request !844 from puhui999/develop
2 years ago
YunaiV 39ae547b9d 📖 CRM:code review 线索逻辑 2 years ago
puhui999 8920b9787d fix: CRM selectBatchIds 权限查询 ids 筛选不生效的 bug 2 years ago
min 604611e1d2 CRM:【线索】补充相关日志 2 years ago
min 4ce9271ece CRM:【线索】创建、删除线索时同时创建、删除数据权限 2 years ago
puhui999 7914423c66 CRM: 完善跟进 TODO 2 years ago
min ba4f9207e2 CRM:【线索】使用工具类替换stream操作 2 years ago
YunaiV 6624a93a84 CRM:跟进记录 code review 2 years ago
YunaiV ca55282516 CRM:商机 code review 2 years ago
puhui999 7b36eb888e CRM-合同:RespVO 添加导出注解 2 years ago
puhui999 ff9cef6a92 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔ 2 years ago
dhb52 5105c6d16f wip: LocalDate.now().atTime 2 years ago
dhb52 08e23a7dc4 wip: style-fix 2 years ago
YunaiV 9819e05d4e Merge branch 'develop' of https://gitee.com/aberizofur/ruoyi-vue-pro into develop 2 years ago
YunaiV a886ad9785 📖 CRM:跟进记录的 code review 2 years ago
lzxhqs 510b4fd3de 商机模块合并代码 2 years ago
dhb52 4bd97c4baf wip: 根据code review优化代码 2 years ago
YunaiV 410c551e03 📖 CRM:跟进记录的 code review 2 years ago
芋道源码 e64e60c711
!832 CRM: 完善一些 TODO
Merge pull request !832 from puhui999/develop
2 years ago
芋道源码 cc6cb83507
!833 修改:CRM 产品,产品列表查询接入数据权限
Merge pull request !833 from 安浩浩/develop
2 years ago
YunaiV 9b7f6cfbac 📖 CRM:线索的 code review 2 years ago
芋道源码 4ca1f72d4f
!829 CRM:【线索】
Merge pull request !829 from Minh-X/develop
2 years ago
YunaiV 64e1d68923 📖 CRM:待办事项的 code review 2 years ago
anhaohao 454e800067 修改:CRM 产品,产品列表查询接入数据权限 2 years ago
puhui999 5efa0f327f crm: 完善一些 TODO 2 years ago
dhb52 4558ecd836 wip: 待办事项 2 years ago
lzxhqs f361d05940 商机模块 2 years ago
puhui999 73c459f360 完善更进 2 years ago
min 2de0fb48ea CRM:【线索】 线索如果不存在或者已经转化,抛出异常 2 years ago
min fe0bde8417 CRM:【线索】 CrmClueExcelVO 融合到 CrmClueRespVO 里 2 years ago
puhui999 eaa8e4be96 操作日志字段解析方法调整 2 years ago
YunaiV df29f0682f 📖 CRM:线索模块的 review 2 years ago
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
2 years ago
YunaiV 6891b75e27 📖 CRM:产品模块的 review 2 years ago
芋道源码 19c0227cef
!826 CRM 产品分类和产品,优化了操作日志 ,新增获得产品操作日志
Merge pull request !826 from 安浩浩/develop
2 years ago
YunaiV e79c750b46 📖 CRM:code review 跟进记录的实现 2 years ago
anhaohao 008f88d185 新增:CRM 产品,新增获得产品操作日志 2 years ago
anhaohao 803816b162 修改:CRM 产品分类和产品,优化了操作日志 2 years ago
puhui999 6b426fcd01 CRM: 修复一下差异 2 years ago
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
2 years ago
puhui999 19fa65b0c3 CRM: 新增跟进记录 2 years ago
puhui999 ba103d6e86 CRM: 完善一些 TODO 提到的问题 2 years ago
puhui999 1a5fe6fa9a CRM: 完善客户、联系人、合同、回款计划、回款的操作日志 2 years ago
puhui999 9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2 years ago
min 0ee7fedea8 CRM:【线索】使用BeanUtils替换mapstruct 2 years ago
min 99b8465e29 CRM:【线索】SaveReqVO去除客户编号字段 2 years ago
min 1280f49a04 CRM:【线索】转化为客户接口修改 2 years ago
YunaiV 722b33513c 📖 CRM:code review 线索模块 2 years ago
YunaiV 6a93484260 📖 CRM:code review 线索模块 2 years ago
min 81f838c5d2 CRM:【线索】创建、更新线索时添加校验,改用相同vo 2 years ago
min 4d68e5e747 CRM:【线索】创建线索时客户改为非必填 2 years ago
min 4237cfb4a9 CRM:【线索】线索转化为客户 2 years ago
YunaiV 772b794374 📖 CRM:code review CRM 产品分类 2 years ago
anhaohao 4afff6185e 新增:CRM 产品分类和产品,接入操作日志,数据权限控制 2 years ago
YunaiV 2d1e57554d 📖 CRM:code review CRM 客户逻辑 2 years ago
芋道源码 3c7f63c356
!810 fix:修复 issues 提到的一些公众号上的问题
Merge pull request !810 from puhui999/develop
2 years ago
YunaiV 19d5a0c2aa 📖 CRM:code review crm 联系人新增操作日志 2 years ago
zyna 44d828023c crm联系人新增操作日志 2 years ago
puhui999 68f5edaa88 CRM-客户: 完善一些 TODO 2 years ago
puhui999 3170e7fd97 CRM-客户: 简化客户公海配置 VO,完善相关操作日志 2 years ago
puhui999 9ce50ec369 CRM-客户限制配置:VO 简化 2 years ago
puhui999 269816446a CRM-客户:日志表达式调整 2 years ago
puhui999 a1c17b9b00 CRM-客户:日志表达式调整 2 years ago
puhui999 d8bb55fc0b CRM-客户:完善操作日志 2 years ago
puhui999 ea4b4b8956 CRM-客户:精简 VO 2 years ago
YunaiV a974d055b6 📖 CRM:【还款】code review 还款的代码,补全对应的 todo list 2 years ago
YunaiV c6a9751511 📖 CRM:【合同】code review 合同的代码,补全对应的 todo list 2 years ago
YunaiV 2668e0cfeb 📖 CRM:【产品】code review 产品的代码,补全对应的 todo list 2 years ago
YunaiV b9f1e8ffaf 📖 CRM:【联系人】code review 商机的代码,补全对应的 todo list 2 years ago
YunaiV 02324f9e60 CRM:【联系人】统一字段 2 years ago
YunaiV cff6e520ee 📖 CRM:【联系人】code review 联系人的代码,补全对应的 todo list 2 years ago
YunaiV f8f5e525be CRM:新增跟进记录表 2 years ago
YunaiV 2e7c3e09a9 📖 CRM:code review 所有代码,补充对应 todo 2 years ago
YunaiV d0df0e8e16 📖 CRM:【客户】优化锁定客户的逻辑实现 2 years ago
YunaiV 0253846fdf Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2 years ago
YunaiV 1da8006af3 📖 CRM:【客户】完善列表、新增、修改接口的 todo 2 years ago
YunaiV 9e3055ee1e 📖 CRM:code review 商机模块 2 years ago
YunaiV 2d0537387b Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
2 years ago
YunaiV 8c9b483ac5 📖 code review 操作日志的实现 2 years ago
puhui999 e5377074d5 数据权限:完善 code review 提到的问题 2 years ago
puhui999 6950368991 操作日志:完善 code review 提到的问题 2 years ago
YunaiV 5de6a8bd23 📖 code review:操作日志的实现 2 years ago
puhui999 e8ade5f1fe crm:完善一些遗留的 TODO 2 years ago
puhui999 f56d8a2751 重构操作日志记录实现 2 years ago
puhui999 1fae341cae 重构操作日志记录实现 2 years ago
puhui999 55a215da44 CRM-数据权限:完善数据权限补全管理员和公海相关情况处理逻辑 2 years ago
puhui999 3e91ac73c4 CRM:完善数据分页查询条件构造 CrmQueryWrapperUtils 2 years ago