Commit Graph

742 Commits

Author SHA1 Message Date
a0675bb828 Merge branch 'dev'
# Conflicts:
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionWorkNodeMapper.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java
#	yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
2024-11-11 18:19:46 +08:00
许允枞
3620064c2f 更新修改检测项目提成 2024-11-11 18:06:25 +08:00
许允枞
1aa4436ce6 更新修改检测项目提成 2024-11-11 16:31:26 +08:00
25987034e1 检测工人
(cherry picked from commit 0e6aa49c68)
2024-11-11 12:46:40 +08:00
ee30997021 检测工人 2024-11-11 10:35:46 +08:00
0e6aa49c68 检测工人 2024-11-11 10:22:03 +08:00
Vinjor
29939dc277 1 2024-11-11 10:03:13 +08:00
许允枞
8a75e00e26 更新 2024-11-09 21:23:54 +08:00
许允枞
fd94f59ee1 websocket方法调用(检测) 2024-11-09 10:57:53 +08:00
8b74bc9496 检测工人声音 2024-11-09 09:53:26 +08:00
许允枞
b623133c22 员工提成 2024-11-08 17:35:17 +08:00
许允枞
c55205c535 员工提成 2024-11-08 13:28:58 +08:00
许允枞
b6c5d5515b 增加检测第一步与最后一步需要上传图片 2024-11-07 18:03:42 +08:00
PQZ
8adf0e01f3 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-07 15:15:52 +08:00
PQZ
cccf884a2c 1 2024-11-07 15:15:49 +08:00
许允枞
b2682976d5 新增检测项目子表 2024-11-07 14:53:07 +08:00
Vinjor
142daa0baa Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-07 14:18:49 +08:00
Vinjor
79ad252cb5 1 2024-11-07 14:18:42 +08:00
xiaofajia
fae6ae4882 预约了服务顾问,消息带上 2024-11-07 11:53:08 +08:00
xiaofajia
1e0df9f82b 加上维修工单子项状态 2024-11-07 11:07:10 +08:00
xiaofajia
83fd022dfc 修改默认的维修类别为维修 2024-11-07 10:53:08 +08:00
xiaofajia
cf4cf9e246 修改默认的维修类别为维修保养 2024-11-07 10:49:52 +08:00
xiaofajia
6cf53afc9c 补正结算逻辑 2024-11-07 10:41:30 +08:00
xiaofajia
ce90f714e2 修改所有用到工单号to车牌号 2024-11-06 18:54:54 +08:00
xiaofajia
6de3b73fc2 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-06 18:42:46 +08:00
xiaofajia
5de31ac2c4 工单每一步给客户发消息 2024-11-06 18:42:30 +08:00
Vinjor
a9f2a8f967 1 2024-11-06 18:23:52 +08:00
xiaofajia
ffbf0130d6 预约时通知服务顾问 2024-11-06 16:01:49 +08:00
xiaofajia
2a182b0614 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-06 15:07:19 +08:00
xiaofajia
8bd53b225c 暂提 2024-11-06 15:07:08 +08:00
Vinjor
07df7503be 1 2024-11-06 14:17:32 +08:00
Vinjor
d0c0d02f97 1 2024-11-06 13:58:56 +08:00
xiaofajia
20b6bbe763 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-06 12:04:55 +08:00
xiaofajia
3aa44b5d90 修改预约选择业务 2024-11-06 12:04:41 +08:00
PQZ
0b6a2f57ae 1 2024-11-06 11:54:41 +08:00
许允枞
95bb7a285e 更新检测相关功能 2024-11-06 10:24:14 +08:00
Vinjor
cf196bd497 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-05 18:27:36 +08:00
Vinjor
1112dfd883 1 2024-11-05 18:27:30 +08:00
许允枞
ef1cd46a97 更新检测相关功能 2024-11-05 18:04:02 +08:00
xiaofajia
e51d404fe9 修改结算完成工单逻辑 2024-11-05 17:25:17 +08:00
PQZ
97edaf4046 1 2024-11-05 14:12:20 +08:00
Vinjor
e02e370fbb 1 2024-11-05 11:43:19 +08:00
Vinjor
6148f263af Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair
# Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
2024-11-05 10:54:57 +08:00
Vinjor
b2e1a3ed22 1 2024-11-05 10:52:49 +08:00
xiaofajia
e87cafee78 修改重新派工逻辑 2024-11-05 10:44:40 +08:00
xiaofajia
56f84995cc Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair
# Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
2024-11-05 10:38:42 +08:00
xiaofajia
3f45d05344 修改重新派工逻辑 2024-11-05 10:37:01 +08:00
PQZ
f8544d6569 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-04 18:44:22 +08:00
PQZ
d1715c2c2b 1 2024-11-04 18:44:19 +08:00
Vinjor
2dde810dec 1 2024-11-04 18:43:25 +08:00