feat:页面bug修改
This commit is contained in:
1 parent
621a04b45b
commit
ac4e081070
4 files changed
+20
-4
No files matched your search
+1
-1
@@ -117,7 +117,7 @@ public class HardApptController {
|
||||
@GetMapping("/{id}")
|
||||
@PreAuthorize("@pms.hasPermission('hard_hardAppt_view')")
|
||||
public R getById(@PathVariable("id") Long id) {
|
||||
return R.ok(hardApptService.getById(id));
|
||||
return R.ok(hardApptService.join(id));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增设备预约管理", description = "新增设备预约管理")
|
||||
|
||||
-3
@@ -80,9 +80,6 @@ import java.util.Map;
|
||||
|
||||
/**
|
||||
* 订单表
|
||||
*
|
||||
* @author dzc
|
||||
* @date 2025-01-05 16:46:25
|
||||
*/
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
|
||||
+5
@@ -34,4 +34,9 @@ public interface HardApptService extends IService<HardApptEntity> {
|
||||
Page<HardApptVo> scopePage(Page page, HardApptDto dto, DataScope of);
|
||||
|
||||
List<HardApptVo> scopeList(HardApptDto dto, DataScope of);
|
||||
|
||||
/**
|
||||
* 查询详情
|
||||
*/
|
||||
HardApptVo join(Long id);
|
||||
}
|
||||
+14
@@ -120,6 +120,20 @@ public class HardApptServiceImpl extends ServiceImpl<HardApptMapper, HardApptEnt
|
||||
return resultList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询详情
|
||||
*/
|
||||
@Override
|
||||
public HardApptVo join(Long id) {
|
||||
HardApptEntity hardAppt = baseMapper.selectById(id);
|
||||
if (ObjectUtil.isEmpty(hardAppt)) {
|
||||
throw new RuntimeException("时间预约不存在");
|
||||
}
|
||||
List<HardApptVo> resultList = List.of(BeanUtil.toBean(hardAppt, HardApptVo.class));
|
||||
disposePageList(resultList);
|
||||
return resultList.get(0);
|
||||
}
|
||||
|
||||
// 创建预约时间
|
||||
private void createApptTime(HardApptEntity apptEntity, List<String> reserveTimeList) {
|
||||
if (!ObjectUtil.isAllNotEmpty(apptEntity.getId(), apptEntity.getMchId(), reserveTimeList)) {
|
||||
|
||||
Reference in new issue
Block a user