From b6b06566ef5be45b8191bc4f3b50695f9dca5847 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 16 十二月 2024 09:10:24 +0800 Subject: [PATCH] 排号管理 --- manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java | 87 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 2 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 c535ad9..d6da980 100644 --- a/manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java +++ b/manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java @@ -1,9 +1,27 @@ package com.jilongda.manage.controller; -import org.springframework.web.bind.annotation.RequestMapping; +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.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.vo.TOptometryVO; +import com.jilongda.manage.vo.TSupplierVO; +import io.swagger.annotations.ApiOperation; +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 org.springframework.web.bind.annotation.RestController; +import java.util.List; /** * <p> @@ -16,6 +34,71 @@ @RestController @RequestMapping("/t-optometry") public class TOptometryController { + @Autowired + private TSupplierService supplierService; + @Autowired + private TOptometristService optometristService; + @Autowired + private TOptometryDetailService optometryDetailService; + @Autowired + private TAppUserService appUserService; + /** + * 获取供应商列表 + */ + @ApiOperation(value = "获取验光单分页列表",tags = "验光单") + @PostMapping(value = "/pageList") + public ApiResult<PageInfo<TOptometryVO>> pageList(@RequestBody TOptometryQuery query) { + String startTime = null; + String endTime = null; + if (StringUtils.hasLength(query.getCreateTime())){ + String[] split = query.getCreateTime().split(" - "); + startTime = split[0]+" 00:00:00"; + endTime = split[1]+" 23:59:59"; + } + query.setStartTime(startTime); + query.setEndTime(endTime); + PageInfo<TOptometryVO> tOptometryVOPageInfo = optometristService.pageList(query); + List<TOptometryVO> records = tOptometryVOPageInfo.getRecords(); + for (TOptometryVO record : records) { + if (record.getUserId()!=null){ + TAppUser byId = appUserService.getById(record.getUserId()); + if (byId!=null){ + record.setName(byId.getName()); + } + } + TOptometryDetail l = optometryDetailService.lambdaQuery() + .eq(TOptometryDetail::getOptometryId, record.getId()) + .eq(TOptometryDetail::getType,1) + .eq(TOptometryDetail::getStatus,1) + .one(); + TOptometryDetail r = optometryDetailService.lambdaQuery() + .eq(TOptometryDetail::getOptometryId, record.getId()) + .eq(TOptometryDetail::getType,1) + .eq(TOptometryDetail::getStatus,2) + .one(); + double templ = 0.0; + double tempr = 0.0; + if (l!=null){ + record.setLValue(l.getBallMirror().toString()+(l.getColumnMirror()!=null?"-"+l.getColumnMirror():"")); + templ = Double.parseDouble(l.getPupilDistance()); + } + if (r!=null){ + record.setRValue(r.getBallMirror().toString()+(r.getColumnMirror()!=null?"-"+r.getColumnMirror():"")); + tempr = Double.parseDouble(r.getPupilDistance()); + + } + record.setPupilDistance((templ+tempr)+""); + } + return ApiResult.success(tOptometryVOPageInfo); + } + @ApiOperation(value = "查询验光单详情",tags = "验光单") + @GetMapping(value = "/getDetailById") + public ApiResult<List<TOptometryDetail>> getDetailById(@RequestParam Integer id) { + List<TOptometryDetail> list = optometryDetailService.lambdaQuery() + .eq(TOptometryDetail::getOptometryId, id) + .list(); + return ApiResult.success(list); + } } -- Gitblit v1.7.1