szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,912 Commits 13 Branches 41 Tags 242 MiB
Commit Graph

510 Commits

Author SHA1 Message Date
YunaiV 6c6babb4c3 reactor：yudao-common 增加 biz 包，将 framework 依赖的 api 统一迁移，方便后续 yudao-framework 独立仓库 2025-05-14 19:23:40 +08:00
YunaiV 0cd831d5f5 fix：【CRM】receiveContactLog 记录日志不正确的问题 2025-05-13 09:55:19 +08:00
YunaiV b634a1e97b 【缺陷修复】CRM：修复跟进日志的操作日志记录失败 2025-03-23 16:54:48 +08:00
YunaiV eb7269083a Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-03-17 08:54:10 +08:00
YunaiV 2d18f593ae V2.4.1 发布~ 2025-02-09 12:33:24 +08:00
YunaiV bb11fdd3fa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
 2025-02-09 07:23:17 +08:00
mcwindy 4e43958fe3 fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId 2025-02-05 11:42:59 +08:00
YunaiV 8236154ae8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java
#	yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/thingmodel/IotThingModelTypeEnum.java
 2025-01-28 03:54:16 +08:00
puhui999 d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型，通过泛型指定 2025-01-24 17:31:41 +08:00
YunaiV c9904f0994 【代码评审】IoT：ThingModel 维护 2024-12-28 21:06:19 +08:00
YunaiV 4a8d146422 fix:修复CRM模块待办列表和数据权限BUG。 2024-12-01 15:58:35 +08:00
panjiabao b478eb9f08 fix:修复CRM模块待办列表和数据权限BUG。 2024-11-28 10:09:36 +08:00
dhb52 d893bb4adf
fix: LogRecord表达式有误 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-11-25 16:32:21 +00:00
YunaiV d50844246c 【缺陷修复】CRM：上级无法读取下级的数据问题 
① CrmPermissionUtils 解决分页过滤
② CrmPermissionAspect 解决查询详情过滤
 2024-10-02 11:13:21 +08:00
YunaiV 7cbd447b69 【代码优化】CRM：移除多余的 selectBatchIds 逻辑 2024-10-02 10:51:06 +08:00
YunaiV 945d379625 【代码优化】CRM：数据权限拼接时，把 pool 条件拿回到 customer 里，只有它有公海逻辑 2024-10-02 09:25:09 +08:00
YunaiV 12ce87b305 【功能修复】框架：操作日志异步记录时，丢失 request 的问题 2024-09-06 21:43:59 +08:00
YunaiV 9d26381dcc 【代码优化】增强 JDK17、JDK8 之间的兼容性 2024-08-26 12:32:54 +08:00
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