From d69ee0edbb5df260ac6b872357b88499d7914610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 09:08:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java b/manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java
index 3ad7e36..4777c71 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java
@@ -4,24 +4,22 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
-import com.jilongda.manage.model.TAppUser;
-import com.jilongda.manage.model.TOptometryDetail;
-import com.jilongda.manage.model.TSupplier;
+import com.jilongda.manage.model.*;
import com.jilongda.manage.query.TOptometryQuery;
import com.jilongda.manage.query.TSupplierQuery;
-import com.jilongda.manage.service.TAppUserService;
-import com.jilongda.manage.service.TOptometristService;
-import com.jilongda.manage.service.TOptometryDetailService;
-import com.jilongda.manage.service.TSupplierService;
+import com.jilongda.manage.service.*;
+import com.jilongda.manage.vo.TOptometryDetailVO;
import com.jilongda.manage.vo.TOptometryVO;
import com.jilongda.manage.vo.TSupplierVO;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -42,6 +40,10 @@
private TOptometryDetailService optometryDetailService;
@Autowired
private TAppUserService appUserService;
+ @Autowired
+ private TOptometryService optometryService;
+ @Autowired
+ private TStoreService storeService;
/**
* 获取供应商列表
@@ -99,11 +101,34 @@
}
@ApiOperation(value = "查询验光单详情",tags = "验光单")
@GetMapping(value = "/getDetailById")
- public ApiResult<List<TOptometryDetail>> getDetailById(@RequestParam Integer id) {
+ public ApiResult<TOptometryDetailVO> getDetailById(@RequestParam Integer id) {
+
+ TOptometryDetailVO tOptometryDetailVO = new TOptometryDetailVO();
+
+ TOptometry optometry = optometryService.getById(id);
+ tOptometryDetailVO.setOptometryTime(optometry.getCreateTime());
+ tOptometryDetailVO.setOptometry(optometry);
+ // 查询用户信息
+// TAppUser appUser = appUserService.getById(optometry.getUserId());
+// tOptometryDetailVO.setAppUser(appUser);
+
+ // 查询验光师信息
+ TOptometrist optometrist = optometristService.getById(optometry.getOptometristId());
+ if(Objects.nonNull(optometrist)){
+ tOptometryDetailVO.setOptometristName(optometrist.getName());
+ // 查询门店信息
+ TStore store = storeService.getById(optometrist.getStoreId());
+ if(Objects.nonNull(store)){
+ tOptometryDetailVO.setStoreName(store.getName());
+ }
+ }
+
+ // 验光单详情
List<TOptometryDetail> list = optometryDetailService.lambdaQuery()
.eq(TOptometryDetail::getOptometryId, id)
.list();
- return ApiResult.success(list);
+ tOptometryDetailVO.setOptometryDetails(list);
+ return ApiResult.success(tOptometryDetailVO);
}
}
--
Gitblit v1.7.1