huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,392 Commits 1 Branch 0 Tags 176 MiB
2d29bf4e6f
Commit Graph

484 Commits

Author SHA1 Message Date
YunaiV
87126d8385 【功能修复】CRM：回款管理导出报错的问题 2024-07-26 22:37:35 +08:00
YunaiV
4de27eb12d 【依赖】easy-trans from 1.6.6 to 1.7.8 2024-07-15 12:38:23 +08:00
芋道源码
b586a09b90
!1011 新增 mall 客服 
Merge pull request !1011 from 芋道源码/develop
 2024-07-13 04:11:46 +00:00
YunaiV
97e8c35f70 【修复】CRM：CrmBusinessStatusDO 缺少 BaseDO 2024-06-04 19:39:11 +08:00
YunaiV
4a0ad205ae 【代码评审】CRM：优化员工业绩统计的实现 2024-05-11 22:30:37 +08:00
YunaiV
95a8aa9ba9 Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
 2024-05-11 22:07:43 +08:00
scholar
99ab07de69 完成todo xml部分 2024-05-11 11:35:27 +08:00
YunaiV
52c86cd290 【优化】CRM：员工业绩统计的实现 2024-05-07 23:08:38 +08:00
YunaiV
d0d1d6d208 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-05-07 22:48:39 +08:00
YunaiV
408378f5ab Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
 2024-05-07 22:32:12 +08:00
scholar
3afd2cba0c 完成todo部分，优化环比同比数据的计算。 2024-05-04 22:24:23 +08:00
YunaiV
ebd5ba02d2 【优化】CRM：增加对 JDK8 的兼容性，使用 ListUtil 替代 List of 2024-05-04 09:36:15 +08:00
YunaiV
f381568f6b 【修复】CRM：商机添加商品时，businessProducts 参数错误，应该是 products 2024-05-03 10:35:58 +08:00
YunaiV
ab00986a1d Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-05-01 08:37:56 +08:00
puhui999
9a2eb2d02c Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop 2024-04-25 23:16:52 +08:00
puhui999
0808bdaa41 fix: CRM 管理员数据权限 bug 2024-04-25 23:16:34 +08:00
YunaiV
53db8309e9 【修复】CRM 分类删除时，判断商品数量是否为空不正确的问题，导致无法删除分类 2024-04-24 21:08:53 +08:00
YunaiV
6f42da1b77 【修复】部分菜单，确实 menu.sql 配置的权限标识 2024-04-24 20:11:11 +08:00
YunaiV
9ab53ee263 crm：code review 员工业绩统计 2024-04-23 23:12:36 +08:00
芋道源码
af610c621f
!952 CRM员工业绩统计完善及bug修复 
Merge pull request !952 from scholarli/develop
 2024-04-23 14:51:12 +00:00
scholar
9e6474a123 1，优化mapper.xml的sql语句； 
2，对于无销售数据的月份，插入销售结果为0的数据；
 2024-04-19 17:09:12 +08:00
芋道源码
488c46073b
!947 fix: selectCustomerDealCycleGroupByProductId使用LEFT JOIN替换子查询 
Merge pull request !947 from dhb52/develop
 2024-04-18 01:22:41 +00:00
YunaiV
b20ff55511 code review：销售统计 2024-04-18 09:19:07 +08:00
YunaiV
b5af357dfc 同步最新的 bugfix 2024-04-17 21:29:04 +08:00
puhui999
bb25f0712b Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop 2024-04-15 16:40:51 +08:00
puhui999
c573585e75 CRM: 新增商机赢单转化率分析 2024-04-15 16:40:36 +08:00
puhui999
5cf34c2ba7 CRM: 完善销售漏斗 2024-04-15 15:26:05 +08:00
YunaiV
2a40678ff8 同步最新的 bugfix 2024-04-14 22:09:11 +08:00
dhb52
488f99b512 fix: selectCustomerDealCycleGroupByProductId使用LEFT JOIN替换子查询 2024-04-14 21:55:45 +08:00
YunaiV
ed5f3a6bc2 crm：code review 销售漏斗 2024-04-14 21:22:02 +08:00
芋道源码
0eff2ae602
!946 CRM: 完善销售漏斗分析 
Merge pull request !946 from puhui999/develop
 2024-04-14 12:23:49 +00:00
YunaiV
5159da30b4 crm：code review 员工客户分析 2024-04-14 20:13:31 +08:00
puhui999
20b4bfd1b0 CRM: 完善新增商机分析 2024-04-14 16:31:53 +08:00
puhui999
6c9a3b0e11 CRM: 完善销售漏斗分析 2024-04-13 23:30:11 +08:00
dhb52
67b02c7e5b feat: 客户成交周期分析(按区域、按产品) 2024-04-12 22:15:24 +08:00
YunaiV
9cba258d8f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-04-12 19:14:56 +08:00
芋道源码
48aef10d2d
回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)' 2024-04-12 11:13:11 +00:00
YunaiV
1e348dbf83 【优化】将项目的 annotations 统一修改成 annotation 包 2024-04-11 22:52:34 +08:00
YunaiV
2e03dcba69 移除 resilience4j 组件 2024-04-10 20:57:44 +08:00
dhb52
d9407ab40a feat: 客户成交周期分析(按区域、按产品) 2024-04-09 00:07:42 +08:00
YunaiV
c4ce9068f9 crm：code review 公海客户分析 2024-04-07 21:27:40 +08:00
dhb52
44c22e1ef5 wip: 增加公海客户分析(mapper模拟数据) 2024-04-06 14:49:37 +08:00
dhb52
dfe11eb4c0 fix: [CRM-客户统计]增加times[]时间范围校验 2024-04-06 14:44:03 +08:00
dhb52
1121c21c8b fix: [CRM-客户统计]按客户创建时间筛选,关联合同是否有成交记录,有则视为[成交客户] 2024-04-06 14:44:03 +08:00
YunaiV
05af77b786 crm：code review 客户画像 2024-04-05 14:44:00 +08:00
芋道源码
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