From a0ee72503f51825f465f4564dc8c19b727d00c6e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 十二月 2024 14:59:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
index c46d107..2ff265e 100644
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
+++ b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
@@ -8,18 +8,17 @@
import com.jilongda.optometrist.authority.service.SecUserService;
import com.jilongda.optometrist.model.*;
import com.jilongda.optometrist.query.TOptometristQuery;
+import com.jilongda.optometrist.query.TOptometryQuery;
import com.jilongda.optometrist.query.TicketQuery;
import com.jilongda.optometrist.service.*;
import com.jilongda.optometrist.utils.LoginInfoUtil;
-import com.jilongda.optometrist.vo.TAddOptometryVO;
-import com.jilongda.optometrist.vo.TLineUpDetailVO;
-import com.jilongda.optometrist.vo.TOptometristVO;
-import com.jilongda.optometrist.vo.TOptometryDetailVO;
+import com.jilongda.optometrist.vo.*;
import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
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.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -56,6 +55,20 @@
private TOrderService orderService;
@Autowired
private TOptometryDetailService optometryDetailService;
+ @ApiOperation(value = "获取验光单分页列表",tags = "验光单")
+ @PostMapping(value = "/pageList")
+ public ApiResult<PageInfo<TOptometryVO>> pageList(@RequestBody TOptometryQuery query) {
+ String startTime = null;
+ String endTime = null;
+ if (StringUtils.hasLength(query.getTime())){
+ startTime = query.getTime()+" 00:00:00";
+ endTime = query.getTime()+" 23:59:59";
+ }
+ query.setStartTime(startTime);
+ query.setEndTime(endTime);
+ PageInfo<TOptometryVO> tOptometryVOPageInfo = optometristService.pageList(query);
+ return ApiResult.success(tOptometryVOPageInfo);
+ }
@ApiOperation(value = "首页")
@PostMapping(value = "/index")
public ApiResult<TOptometristVO> index() {
@@ -65,6 +78,8 @@
SecUser byId = secUserService.getById(userId);
TStore byId1 = storeService.getById(byId.getStoreId());
tOptometristVO.setStoreName(byId1.getName());
+ tOptometristVO.setName(byId.getNickName());
+ tOptometristVO.setPhone(byId.getPhone());
int size = optometryService.lambdaQuery().eq(TOptometry::getOptometristId, userId)
.eq(TOptometry::getStatus, 3).list().size();
tOptometristVO.setOptometryCount(size);
@@ -178,18 +193,5 @@
return ApiResult.success();
}
- @ApiOperation(value = "验光师编辑")
- @PostMapping(value = "/update")
- public ApiResult<String> update(@RequestBody TOptometrist dto) {
- optometristService.updateById(dto);
- return ApiResult.success();
- }
-
- @ApiOperation(value = "验光师上下架")
- @GetMapping(value = "/upAndDown")
- public ApiResult<Boolean> upAndDown(@RequestParam Integer id,
- @RequestParam Integer status) {
- return ApiResult.success(optometristService.upAndDown(id,status));
- }
}
--
Gitblit v1.7.1