hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 04:08:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,429 Commits 20 Branches 0 Tags
286e24ad6cc6c7cee81dc78bfb8cb6f54c9f858c
Commit Graph

452 Commits

Author SHA1 Message Date
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
puhui999
a9a8efc808 CRM: 完善用户画像数据统计 2024-04-03 10:09:46 +08:00
dhb52
1944199f67 fix: 按Code-Review修改CrmStatisticsCustomerMapper.xml 2024-04-02 23:44:17 +08:00
YunaiV
beea186507 全局：增加 VO 数据翻译的支持 2024-04-01 12:42:27 +08:00
YunaiV
a68abc43ae CRM：修复 @RequestBody 和 Multipart 不能同时存在的异常和导入客户后序列化产生的异常 2024-03-30 17:06:13 +08:00
YunaiV
f591a04317 CRM：code review【员工业绩】的实现 2024-03-30 14:39:34 +08:00
芋道源码
08c851aeab !916 CRM员工业绩统计PR v1.0 
Merge pull request !916 from scholarli/develop
 2024-03-30 06:25:28 +00:00
YunaiV
3f5724e978 CRM：code review【客户画像】的实现 2024-03-30 14:17:28 +08:00
YunaiV
924580f4a2 CRM：重构【客户画像】，从【客户统计】拆分出去先~ 2024-03-30 13:51:46 +08:00
YunaiV
3b379d8cc0 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
 2024-03-30 11:54:27 +08:00
YunaiV
8266fb8f94 CRM：完善【排行版】功能 2024-03-30 11:49:06 +08:00
YunaiV
a8bec19196 CRM：code review【客户统计】的代码实现 2024-03-30 11:00:15 +08:00
YunaiV
90f82b157d CRM：优化【客户统计】的代码实现 2024-03-30 09:22:54 +08:00
芋道源码
eab9627253 !909 feat: [CRM-客户分析]增加[时间间隔]选项 
Merge pull request !909 from dhb52/develop
 2024-03-28 11:13:18 +00:00
YunaiV
a80ba48889 bugfix：同步 master 修改的 bug 2024-03-28 19:05:16 +08:00
YunaiV
907f3a58ba Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2024-03-28 18:53:54 +08:00
YunaiV
3b8dee4963 BPM：完善相关的代码注释 2024-03-26 08:38:59 +08:00
puhui999
22191e81e3 CRM: 新增客户区域数据统计 2024-03-24 22:24:46 +08:00
puhui999
ce013a2562 CRM: 新增客户行业、来源、级别统计数据统计 2024-03-24 17:15:56 +08:00
YunaiV
e5444c5d47 BPM：优化 convert 的逻辑 2024-03-20 21:32:01 +08:00
YunaiV
c4688d887c BPM：增加 task 的审批建议 2024-03-18 18:41:04 +08:00
scholar
705a3e53ca CRM员工业绩统计PR v2.0 2024-03-15 12:09:19 +08:00
dhb52
03213e3254 fix: [CRM-客户分析]更新http-client脚本,增加intervalType请求参数 2024-03-10 14:30:59 +08:00
dhb52
4ac28603b8 feat: [CRM-客户分析]增加[时间间隔]选项 2024-03-10 10:30:25 +08:00
dhb52
ee2be79987 fix: [CRM-客户统计]根据Code-Review 修改代码 2024-03-09 22:51:38 +08:00
YunaiV
d556b29214 CRM：code review 权限的优化 2024-03-09 18:27:58 +08:00
芋道源码
6b752b5cb4 !907 CRM: 根据 review 完善数据权限 
Merge pull request !907 from puhui999/develop
 2024-03-09 10:01:41 +00:00
puhui999
af5fbb6ff4 CRM: TransferReqVO bizId -> id、修复商机转移错误 2024-03-09 17:54:14 +08:00
puhui999
47a698868c CRM: 根据 review 完善数据权限 2024-03-09 17:00:05 +08:00
YunaiV
8dcc12f215 CRM：code review 客户总量统计 2024-03-09 16:32:18 +08:00
芋道源码
85817a2426 !902 fix: [CRM-客户统计]根据Code-Review 修改 
Merge pull request !902 from dhb52/develop
 2024-03-09 07:38:44 +00:00
puhui999
0043d02d0a fix：商机 api 文档生成不对的问题 2024-03-09 14:31:43 +08:00
YunaiV
89fc83c419 CRM：code review 客户权限的实现 2024-03-09 11:58:05 +08:00
芋道源码
e2ec426a9f !900 CRM：完善数据权限，实现数据权限同时添加、同时转移 
Merge pull request !900 from puhui999/develop
 2024-03-09 03:18:12 +00:00
dhb52
0386820a1c feat: 增加[客户行业、客户来源]等字段显示，重构代码 2024-03-05 23:16:16 +08:00
dhb52
06c0d86544 fix: 使用convertSetByFlatMap避免 ID 重复 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-03-05 15:08:40 +00:00
dhb52
a23ea45632 fix: [CRM-客户统计]根据Code-Review 修改 2024-03-04 23:51:25 +08:00
puhui999
ba1b028001 CRM：完善数据权限，实现数据权限同时添加、同时转移 2024-03-03 20:10:30 +08:00
puhui999
f56fab932a CRM：完善 excel 导出 review 提到的问题 2024-03-02 23:24:42 +08:00
YunaiV
1f35ef59d1 CRM：code review excel 导出的重构 2024-03-02 00:25:51 +08:00
YunaiV
fc7734319b Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	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/service/receivable/CrmReceivableServiceImpl.java
 2024-03-01 23:46:50 +08:00