曹鹏飞
|
a324ff6f23
|
Merge branch 'prod/20260313' into feature/quotation
|
2026-03-13 16:07:24 +08:00 |
|
曹鹏飞
|
94baf89b03
|
调整问题类型列表
|
2026-03-13 16:06:52 +08:00 |
|
曹鹏飞
|
473c8f3240
|
Merge branch 'feature/bug-1369' into feature/quotation
|
2026-03-11 17:47:41 +08:00 |
|
曹鹏飞
|
f68b70dc3d
|
feat: bug-1369 工服模块，服务报告里上传报告，以及派工结案时上传附件报告时，限制上传文件在1G以内，并增加上传进度
|
2026-03-11 17:47:09 +08:00 |
|
曹鹏飞
|
75bdb66ab2
|
Merge branch 'prod/20260213' into develop
|
2026-02-12 21:18:06 +08:00 |
|
曹鹏飞
|
2bd98a83c1
|
fix(ticket): 移除工单处理中的自移除限制
- 注释掉管理员移除自己时的业务错误校验逻辑
- 允许管理员从工单处理人员列表中移除自己
- 保留其他工单处理功能的完整性
|
2026-02-12 21:17:23 +08:00 |
|
曹鹏飞
|
5ebcdf30e6
|
Merge branch 'prod/20260206' into develop
|
2026-02-06 16:54:18 +08:00 |
|
曹鹏飞
|
e788baf7dc
|
fix: bug-1314 从crm同步设备逻辑调整
移动破和工服的设备，从crm同步数据时，如果是更新设备，忽略crm中的代理商编号和名称信息，如果是新增，则不忽略
|
2026-02-06 16:49:45 +08:00 |
|
曹鹏飞
|
98c4d21568
|
Merge branch 'prod/20260203' into develop
|
2026-02-03 14:38:55 +08:00 |
|
曹鹏飞
|
2e056a3324
|
feat(device): 设备列表添加导出搜索结果功能
|
2026-02-03 14:38:36 +08:00 |
|
曹鹏飞
|
25b5f1b99b
|
Merge branch 'feature/bug-1286' into prod/20260203
# Conflicts:
# nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
|
2026-02-03 12:19:42 +08:00 |
|
曹鹏飞
|
27cd13eb3b
|
Merge branch 'feature/gongfu-20260126' into prod/20260203
|
2026-02-03 12:14:37 +08:00 |
|
曹鹏飞
|
19e37daaaf
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:46:14 +08:00 |
|
曹鹏飞
|
d6a1074a79
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:46:00 +08:00 |
|
曹鹏飞
|
c52f86f85a
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:41:31 +08:00 |
|
曹鹏飞
|
634a245b3d
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:41:14 +08:00 |
|
曹鹏飞
|
3fb86a4565
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:30:09 +08:00 |
|
曹鹏飞
|
1d72e4bcc0
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:29:56 +08:00 |
|
曹鹏飞
|
b2d1065233
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:25:00 +08:00 |
|
曹鹏飞
|
6bac73d8b7
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:24:48 +08:00 |
|
曹鹏飞
|
422489018c
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:21:59 +08:00 |
|
曹鹏飞
|
5c20d07732
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:21:44 +08:00 |
|
曹鹏飞
|
2b74adc20c
|
Merge branch 'feature/bug-1286' into develop
# Conflicts:
# nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
|
2026-02-03 10:19:16 +08:00 |
|
曹鹏飞
|
604895d758
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:16:19 +08:00 |
|
曹鹏飞
|
57d850e17f
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-02 20:35:46 +08:00 |
|
曹鹏飞
|
3f063a29cd
|
feat(device): 修改设备服务代理商编码功能支持批量操作
- 将 ChangeServiceAgentCodeQuery 中的 deviceId 字段改为 deviceIds 列表
- 添加 List 类型和 NotEmpty 注解支持批量设备ID验证
- 更新 Controller 层逻辑以支持批量处理设备代理商编码变更
- 添加设备存在性检查避免无效操作
- 仅对代理商编码不同的设备执行更新操作
- 批量为每个符合条件的设备创建代理商变更记录
|
2026-02-02 20:30:57 +08:00 |
|
曹鹏飞
|
9dca96b3cf
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-02 17:44:15 +08:00 |
|
曹鹏飞
|
8ba7ca24b1
|
feat(gongfu): 修改设备批量操作功能
- 将ChangeServiceAgentCodeQuery中的deviceId字段改为deviceIds列表
- 移除Controller中的@Valid注解并优化参数验证逻辑
- 实现设备批量修改代理商编码功能，支持多个设备同时处理
- 修复部署脚本中的文件路径处理逻辑
- 添加空值检查和业务逻辑优化
|
2026-02-02 17:43:57 +08:00 |
|
曹鹏飞
|
c0dfd52506
|
Merge branch 'feature/quotation' into develop
# Conflicts:
# nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java
|
2026-01-30 10:26:07 +08:00 |
|
曹鹏飞
|
6ff6b0c64f
|
Merge branch 'feature/bug-1286' into develop
|
2026-01-29 17:57:15 +08:00 |
|
曹鹏飞
|
24dcb9df96
|
feat: bug-1286 设备售后公司转移
|
2026-01-29 17:57:06 +08:00 |
|
曹鹏飞
|
9c5425877c
|
Merge branch 'feature/bug-1286' into develop
|
2026-01-29 17:44:11 +08:00 |
|
曹鹏飞
|
8ba818a74a
|
feat: bug-1286 设备售后公司转移
|
2026-01-29 17:41:18 +08:00 |
|
曹鹏飞
|
4d40c002fb
|
Merge branch 'feature/bug-1286' into develop
|
2026-01-29 17:01:23 +08:00 |
|
曹鹏飞
|
c1f91ad75a
|
feat: bug-1286 设备售后公司转移
|
2026-01-29 17:01:13 +08:00 |
|
曹鹏飞
|
44ca42144c
|
Merge branch 'prod/20260130' into develop
# Conflicts:
# nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java
|
2026-01-29 16:57:28 +08:00 |
|
曹鹏飞
|
d58eaae0d1
|
如果同步过来，这条ID的设备编号被删掉了（就是由非空变为空），需要把CFS里这条设备信息删掉
|
2026-01-29 16:52:54 +08:00 |
|
曹鹏飞
|
1a59b8ef62
|
Merge branch 'feature/bug-1286' into develop
|
2026-01-29 16:16:46 +08:00 |
|
曹鹏飞
|
4f204375af
|
feat: bug-1286 设备售后公司转移
|
2026-01-29 16:16:11 +08:00 |
|
曹鹏飞
|
2c678c27cb
|
feat(gongfu): 添加测试控制器并完善设备组件功能
- 新增TestController用于初始化设备组件产品线数据
- 实现批量更新设备组件的产品线信息功能
- 添加设备机型字段到GongfuDeviceComponent实体类
- 在SolutionMeasuresSaveRequest中增加componentId非空验证
- 实现设备组件详情的批量创建和更新逻辑
- 添加多产品线设备组件的复制处理机制
|
2026-01-29 16:09:01 +08:00 |
|
曹鹏飞
|
d8c99e3cf9
|
Merge branch 'feature/bug-1286' into develop
|
2026-01-29 11:26:09 +08:00 |
|
曹鹏飞
|
34db62ba2f
|
feat: bug-1286 设备售后公司转移
|
2026-01-29 11:25:55 +08:00 |
|
曹鹏飞
|
64f7d7cf74
|
设备的发货日期和开始质保日期类型由LocalDate改为String
|
2026-01-28 17:20:28 +08:00 |
|
曹鹏飞
|
dcb02879c1
|
设备的发货日期和开始质保日期类型由LocalDate改为String
|
2026-01-28 17:19:54 +08:00 |
|
曹鹏飞
|
b9830ab001
|
Merge branch 'develop' into feature/quotation
# Conflicts:
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java
|
2026-01-28 17:14:46 +08:00 |
|
曹鹏飞
|
ef3357f150
|
设备的发货日期和开始质保日期类型由LocalDate改为String
|
2026-01-28 17:12:14 +08:00 |
|
曹鹏飞
|
8f9fcc2dda
|
Merge branch 'feature/gongfu' into develop
|
2026-01-28 14:40:10 +08:00 |
|
曹鹏飞
|
1edb6ce1c5
|
Revert "设备的发货日期和开始质保日期类型由LocalDate改为String"
This reverts commit 7be8384fbc.
|
2026-01-28 14:38:10 +08:00 |
|
曹鹏飞
|
b3e65348ff
|
Merge branch 'develop' into feature/quotation
|
2026-01-28 13:52:01 +08:00 |
|
曹鹏飞
|
04d2482850
|
工服调整20260126
1、创建订单时的区域的先隐藏，先默认为空；
2、所有的类别属性移除；
3、设备配置调整，部件不再绑定机型，改为绑定产品线；
4、修改解决方案添加组件字段
|
2026-01-27 17:17:03 +08:00 |