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/mapper/TLineUpMapper.java | 7 +
manage/src/main/java/com/jilongda/manage/utils/TaskUtil.java | 38 +++++
manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java | 87 ++++++++++++
manage/src/main/java/com/jilongda/manage/service/TLineUpService.java | 5
manage/src/main/java/com/jilongda/manage/model/TLineUp.java | 9 +
manage/src/main/java/com/jilongda/manage/query/TLineUpQuery.java | 21 +++
manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java | 41 +++++
manage/src/main/java/com/jilongda/manage/model/TOptometryDetail.java | 4
manage/src/main/resources/mapping/TOptometryMapper.xml | 4
manage/src/main/java/com/jilongda/manage/vo/TOptometryVO.java | 25 +++
manage/src/main/java/com/jilongda/manage/service/TOptometristService.java | 4
manage/src/main/resources/mapping/TLineUpMapper.xml | 22 +++
manage/src/main/java/com/jilongda/manage/query/TOptometryQuery.java | 28 ++++
manage/src/main/resources/mapping/TOptometristMapper.xml | 35 +++++
manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java | 17 ++
manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java | 10 +
applet/src/main/java/com/jilongda/applet/model/TOptometryDetail.java | 4
manage/src/main/java/com/jilongda/manage/model/TOptometry.java | 6
manage/src/main/java/com/jilongda/manage/service/impl/TLineUpServiceImpl.java | 12 +
optometry/src/main/java/com/jilongda/optometry/model/TOptometryDetail.java | 4
20 files changed, 368 insertions(+), 15 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/model/TOptometryDetail.java b/applet/src/main/java/com/jilongda/applet/model/TOptometryDetail.java
index 1dc87bd..a1111f6 100644
--- a/applet/src/main/java/com/jilongda/applet/model/TOptometryDetail.java
+++ b/applet/src/main/java/com/jilongda/applet/model/TOptometryDetail.java
@@ -41,11 +41,11 @@
@ApiModelProperty(value = "球镜")
@TableField("ballMirror")
- private Integer ballMirror;
+ private Double ballMirror;
@ApiModelProperty(value = "柱镜")
@TableField("columnMirror")
- private Integer columnMirror;
+ private Double columnMirror;
@ApiModelProperty(value = "轴位")
@TableField("axis")
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java
index 99bb104..e362032 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java
@@ -1,9 +1,22 @@
package com.jilongda.manage.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.jilongda.common.basic.ApiResult;
+import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.model.TAppUser;
+import com.jilongda.manage.model.TLineUp;
+import com.jilongda.manage.model.TOptometryDetail;
+import com.jilongda.manage.query.TLineUpQuery;
+import com.jilongda.manage.query.TOptometryQuery;
+import com.jilongda.manage.service.TAppUserService;
+import com.jilongda.manage.service.TLineUpService;
+import com.jilongda.manage.vo.TOptometryVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
/**
* <p>
@@ -16,6 +29,28 @@
@RestController
@RequestMapping("/t-line-up")
public class TLineUpController {
-
+ @Autowired
+ private TLineUpService lineUpService;
+ @Autowired
+ private TAppUserService appUserService;
+ @ApiOperation(value = "获取排号分页列表",tags = "排号管理")
+ @PostMapping(value = "/pageList")
+ public ApiResult<PageInfo<TLineUp>> pageList(@RequestBody TLineUpQuery query) {
+ PageInfo<TLineUp> res = lineUpService.pageList(query);
+ return ApiResult.success(res);
+ }
+ @ApiOperation(value = "查询当前排队人数",tags = "排号a管理")
+ @PostMapping(value = "/getCount")
+ public ApiResult getCount() {
+ return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStatus,1).list().size());
+ }
+ @ApiOperation(value = "取消排队",tags = "排号管理")
+ @GetMapping(value = "/cancel")
+ public ApiResult cancel(Integer id) {
+ TLineUp byId = lineUpService.getById(id);
+ byId.setStatus(5);
+ lineUpService.updateById(byId);
+ return ApiResult.success();
+ }
}
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);
+ }
}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/TLineUpMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/TLineUpMapper.java
index ddde9f2..ed2cb5a 100644
--- a/manage/src/main/java/com/jilongda/manage/mapper/TLineUpMapper.java
+++ b/manage/src/main/java/com/jilongda/manage/mapper/TLineUpMapper.java
@@ -1,7 +1,12 @@
package com.jilongda.manage.mapper;
+import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLineUp;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jilongda.manage.query.TLineUpQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +18,6 @@
*/
public interface TLineUpMapper extends BaseMapper<TLineUp> {
+ List<TLineUp> pageList(@Param("query")TLineUpQuery query, @Param("pageInfo") PageInfo<TLineUp> pageInfo);
+
}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java
index 90e6335..abb1777 100644
--- a/manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java
+++ b/manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java
@@ -1,7 +1,15 @@
package com.jilongda.manage.mapper;
+import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TOptometrist;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jilongda.manage.query.TOptometryQuery;
+import com.jilongda.manage.query.TSupplierQuery;
+import com.jilongda.manage.vo.TOptometryVO;
+import com.jilongda.manage.vo.TSupplierVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +21,6 @@
*/
public interface TOptometristMapper extends BaseMapper<TOptometrist> {
+ List<TOptometryVO> pageList(@Param("query")TOptometryQuery query, @Param("pageInfo")PageInfo<TOptometryVO> pageInfo);
+
}
diff --git a/manage/src/main/java/com/jilongda/manage/model/TLineUp.java b/manage/src/main/java/com/jilongda/manage/model/TLineUp.java
index 8e02f7c..22ffcd2 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TLineUp.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TLineUp.java
@@ -36,6 +36,15 @@
@ApiModelProperty(value = "编号")
@TableField("code")
private String code;
+ @ApiModelProperty(value = "微信名称")
+ @TableField(exist = false)
+ private String name;
+ @ApiModelProperty(value = "手机号")
+ @TableField(exist = false)
+ private String phone;
+ @ApiModelProperty(value = "验光师")
+ @TableField(exist = false)
+ private String optometrist;
@ApiModelProperty(value = "用户id")
@TableField("userId")
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOptometry.java b/manage/src/main/java/com/jilongda/manage/model/TOptometry.java
index 7cc5037..5f6c318 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOptometry.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOptometry.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.jilongda.common.pojo.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -50,8 +51,8 @@
private Integer gender;
@ApiModelProperty(value = "姓名")
- @TableField("name")
- private String name;
+ @TableField("realName")
+ private String realName;
@ApiModelProperty(value = "手机号")
@TableField("phone")
@@ -70,6 +71,7 @@
private Integer status;
@ApiModelProperty(value = "注册时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@TableField("registerTime")
private LocalDateTime registerTime;
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOptometryDetail.java b/manage/src/main/java/com/jilongda/manage/model/TOptometryDetail.java
index e50a8a3..90c37aa 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOptometryDetail.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOptometryDetail.java
@@ -43,11 +43,11 @@
@ApiModelProperty(value = "球镜")
@TableField("ballMirror")
- private Integer ballMirror;
+ private Double ballMirror;
@ApiModelProperty(value = "柱镜")
@TableField("columnMirror")
- private Integer columnMirror;
+ private Double columnMirror;
@ApiModelProperty(value = "轴位")
@TableField("axis")
diff --git a/manage/src/main/java/com/jilongda/manage/query/TLineUpQuery.java b/manage/src/main/java/com/jilongda/manage/query/TLineUpQuery.java
new file mode 100644
index 0000000..f24ac5f
--- /dev/null
+++ b/manage/src/main/java/com/jilongda/manage/query/TLineUpQuery.java
@@ -0,0 +1,21 @@
+package com.jilongda.manage.query;
+
+import com.jilongda.common.pojo.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "排号管理查询参数")
+public class TLineUpQuery extends BasePage {
+
+ @ApiModelProperty(value = "微信昵称")
+ private String name;
+ @ApiModelProperty(value = "门店id")
+ private Integer storeId;
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "状态1排队中2验光中3已完成4已过号5已取消")
+ private Integer status;
+
+}
diff --git a/manage/src/main/java/com/jilongda/manage/query/TOptometryQuery.java b/manage/src/main/java/com/jilongda/manage/query/TOptometryQuery.java
new file mode 100644
index 0000000..c1d7998
--- /dev/null
+++ b/manage/src/main/java/com/jilongda/manage/query/TOptometryQuery.java
@@ -0,0 +1,28 @@
+package com.jilongda.manage.query;
+
+import com.jilongda.common.pojo.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "验光单查询参数")
+public class TOptometryQuery extends BasePage {
+
+ @ApiModelProperty(value = "微信昵称")
+ private String name;
+ @ApiModelProperty(value = "姓名")
+ private String realName;
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "出单日期 2020-11-11 - 2022-11-11")
+ private String createTime;
+ @ApiModelProperty(value = "店铺id")
+ private Integer storeId;
+ @ApiModelProperty(value = "验光师id")
+ private Integer optometristId;
+ @ApiModelProperty(value = "开始时间 前端忽略")
+ private String startTime;
+ @ApiModelProperty(value = "结束时间 前端忽略")
+ private String endTime;
+}
diff --git a/manage/src/main/java/com/jilongda/manage/service/TLineUpService.java b/manage/src/main/java/com/jilongda/manage/service/TLineUpService.java
index c7d32b8..2c89d97 100644
--- a/manage/src/main/java/com/jilongda/manage/service/TLineUpService.java
+++ b/manage/src/main/java/com/jilongda/manage/service/TLineUpService.java
@@ -1,7 +1,10 @@
package com.jilongda.manage.service;
+import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLineUp;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.jilongda.manage.query.TLineUpQuery;
+import com.jilongda.manage.vo.TOptometryVO;
/**
* <p>
@@ -13,4 +16,6 @@
*/
public interface TLineUpService extends IService<TLineUp> {
+ PageInfo<TLineUp> pageList(TLineUpQuery query);
+
}
diff --git a/manage/src/main/java/com/jilongda/manage/service/TOptometristService.java b/manage/src/main/java/com/jilongda/manage/service/TOptometristService.java
index c0df28f..97d2d7c 100644
--- a/manage/src/main/java/com/jilongda/manage/service/TOptometristService.java
+++ b/manage/src/main/java/com/jilongda/manage/service/TOptometristService.java
@@ -1,7 +1,10 @@
package com.jilongda.manage.service;
+import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TOptometrist;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.jilongda.manage.query.TOptometryQuery;
+import com.jilongda.manage.vo.TOptometryVO;
/**
* <p>
@@ -13,4 +16,5 @@
*/
public interface TOptometristService extends IService<TOptometrist> {
+ PageInfo<TOptometryVO> pageList(TOptometryQuery query);
}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TLineUpServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TLineUpServiceImpl.java
index e82af0f..2ebcb19 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TLineUpServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TLineUpServiceImpl.java
@@ -1,10 +1,15 @@
package com.jilongda.manage.service.impl;
+import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLineUp;
import com.jilongda.manage.mapper.TLineUpMapper;
+import com.jilongda.manage.query.TLineUpQuery;
import com.jilongda.manage.service.TLineUpService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jilongda.manage.vo.TOptometryVO;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +22,11 @@
@Service
public class TLineUpServiceImpl extends ServiceImpl<TLineUpMapper, TLineUp> implements TLineUpService {
+ @Override
+ public PageInfo<TLineUp> pageList(TLineUpQuery query) {
+ PageInfo<TLineUp> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TLineUp> list=this.baseMapper.pageList(query, pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java
index 2beea25..388cb7b 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java
@@ -1,10 +1,20 @@
package com.jilongda.manage.service.impl;
+import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.mapper.TOptometryMapper;
import com.jilongda.manage.model.TOptometrist;
import com.jilongda.manage.mapper.TOptometristMapper;
+import com.jilongda.manage.query.TOptometryQuery;
import com.jilongda.manage.service.TOptometristService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jilongda.manage.vo.TOptometryVO;
+import com.jilongda.manage.vo.TSupplierVO;
+import org.apache.poi.ss.formula.functions.T;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -16,5 +26,12 @@
*/
@Service
public class TOptometristServiceImpl extends ServiceImpl<TOptometristMapper, TOptometrist> implements TOptometristService {
+ @Override
+ public PageInfo<TOptometryVO> pageList(TOptometryQuery query) {
+ PageInfo<TOptometryVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TOptometryVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/manage/src/main/java/com/jilongda/manage/utils/TaskUtil.java b/manage/src/main/java/com/jilongda/manage/utils/TaskUtil.java
new file mode 100644
index 0000000..c9f6d3c
--- /dev/null
+++ b/manage/src/main/java/com/jilongda/manage/utils/TaskUtil.java
@@ -0,0 +1,38 @@
+package com.jilongda.manage.utils;
+
+
+import com.jilongda.manage.model.TLineUp;
+import com.jilongda.manage.service.TLineUpService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+
+/**
+ * 定时任务工具类
+ */
+@Component
+public class TaskUtil {
+
+ @Resource
+ private TLineUpService lineUpService;
+
+ // 每天晚上9点执行的定时任务
+ @Scheduled(cron = "0 0 23 * * ?")
+ public void taskNineDay() {
+ try {
+ System.err.println("执行每天晚上定时任务 排号修改状态");
+ List<TLineUp> list = lineUpService.lambdaQuery().eq(TLineUp::getStatus, 1).list();
+ for (TLineUp tLineUp : list) {
+ tLineUp.setStatus(5);
+ }
+ lineUpService.updateBatchById(list);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/manage/src/main/java/com/jilongda/manage/vo/TOptometryVO.java b/manage/src/main/java/com/jilongda/manage/vo/TOptometryVO.java
new file mode 100644
index 0000000..14efd3a
--- /dev/null
+++ b/manage/src/main/java/com/jilongda/manage/vo/TOptometryVO.java
@@ -0,0 +1,25 @@
+package com.jilongda.manage.vo;
+
+import com.jilongda.manage.model.TOptometry;
+import com.jilongda.manage.model.TSupplier;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "验光单VO")
+public class TOptometryVO extends TOptometry {
+ @ApiModelProperty(value = "门店名称")
+ private String storeName;
+ @ApiModelProperty(value = "微信名称")
+ private String name;
+ @ApiModelProperty(value = "R值")
+ private String rValue;
+ @ApiModelProperty(value = "L值")
+ private String lValue;
+ @ApiModelProperty(value = "瞳距")
+ private String pupilDistance;
+ @ApiModelProperty(value = "验光师名称")
+ private String optometristName;
+
+}
diff --git a/manage/src/main/resources/mapping/TLineUpMapper.xml b/manage/src/main/resources/mapping/TLineUpMapper.xml
index 382f795..0a2778c 100644
--- a/manage/src/main/resources/mapping/TLineUpMapper.xml
+++ b/manage/src/main/resources/mapping/TLineUpMapper.xml
@@ -21,5 +21,27 @@
<sql id="Base_Column_List">
id, code, userId, optometristId, storeId, status, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="pageList" resultType="com.jilongda.manage.model.TLineUp">
+ select t.*,u.name,u.phone,u.age,u.gender,u.realName,s.name storeName,o.name optometrist
+ from t_line_up t
+ left join t_user u on t.userId = u.id
+ left join t_optometrist o on t.optometristId = o.id
+ left join t_store s on t.storeId = s.id
+ <where>
+ <if test="query.status != null">
+ and t.status = #{query.status}
+ </if>
+ <if test="query.phone != null and query.phone != ''">
+ AND u.phone like concat('%',#{query.phone},'%')
+ </if>
+ <if test="query.name != null and query.name != ''">
+ AND u.name like concat('%',#{query.name},'%')
+ </if>
+ <if test="query.storeId != null">
+ and s.id = #{query.storeId}
+ </if>
+ </where>
+ order by t.createTime desc
+ </select>
</mapper>
diff --git a/manage/src/main/resources/mapping/TOptometristMapper.xml b/manage/src/main/resources/mapping/TOptometristMapper.xml
index 3ffe98a..8855ca9 100644
--- a/manage/src/main/resources/mapping/TOptometristMapper.xml
+++ b/manage/src/main/resources/mapping/TOptometristMapper.xml
@@ -22,5 +22,40 @@
<sql id="Base_Column_List">
id, name, phone, status, storeId, img, registerTime, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="pageList" resultType="com.jilongda.manage.vo.TOptometryVO">
+ select t1.id, t1.code, t1.userId, t1.age, t1.gender,
+ t1.realName, t1.phone, t1.optometristId,
+ t1.storeId, t1.status, t1.registerTime,
+ t1.createTime, t1.updateTime, t1.createBy,
+ t1.updateBy, t1.isDelete,t2.`name`,
+ t3.name as storeName,t4.name as optometristName
+ from t_optometry t1
+ left join t_app_user t2 on t1.userId = t2.id
+ left join t_store t3 on t1.storeId = t3.id
+ left join t_optometrist t4 on t1.optometristId = t4.id
+ <where>
+ <if test="query.name != null and query.name != ''">
+ and t2.`name` like concat('%',#{query.name},'%')
+ </if>
+ <if test="query.realName != null and query.realName != ''">
+ and t1.`name` like concat('%',#{query.realName},'%')
+ </if>
+ <if test="query.phone != null and query.phone != ''">
+ and t1.phone like concat('%',#{query.phone},'%')
+ </if>
+ <if test="query.storeId != null and query.storeId != ''">
+ and t1.storeId = #{query.storeId}
+ </if>
+ <if test="query.optometristId != null and query.optometristId != ''">
+ and t1.optometristId = #{query.optometristId}
+ </if>
+ <if test="req.startTime != null and req.startTime!=''">
+ and (t1.createTime between #{req.startTime} and #{req.endTime})
+ </if>
+ AND t3.type=1
+ AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY createTime DESC
+ </select>
</mapper>
diff --git a/manage/src/main/resources/mapping/TOptometryMapper.xml b/manage/src/main/resources/mapping/TOptometryMapper.xml
index 5414257..decd722 100644
--- a/manage/src/main/resources/mapping/TOptometryMapper.xml
+++ b/manage/src/main/resources/mapping/TOptometryMapper.xml
@@ -9,7 +9,7 @@
<result column="userId" property="userId" />
<result column="age" property="age" />
<result column="gender" property="gender" />
- <result column="name" property="name" />
+ <result column="realName" property="realName" />
<result column="phone" property="phone" />
<result column="optometristId" property="optometristId" />
<result column="storeId" property="storeId" />
@@ -24,7 +24,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, code, userId, age, gender, name, phone, optometristId, storeId, status, registerTime, createTime, updateTime, createBy, updateBy, isDelete
+ id, code, userId, age, gender, realName, phone, optometristId, storeId, status, registerTime, createTime, updateTime, createBy, updateBy, isDelete
</sql>
</mapper>
diff --git a/optometry/src/main/java/com/jilongda/optometry/model/TOptometryDetail.java b/optometry/src/main/java/com/jilongda/optometry/model/TOptometryDetail.java
index efc2111..9fecfe7 100644
--- a/optometry/src/main/java/com/jilongda/optometry/model/TOptometryDetail.java
+++ b/optometry/src/main/java/com/jilongda/optometry/model/TOptometryDetail.java
@@ -41,11 +41,11 @@
@ApiModelProperty(value = "球镜")
@TableField("ballMirror")
- private Integer ballMirror;
+ private Double ballMirror;
@ApiModelProperty(value = "柱镜")
@TableField("columnMirror")
- private Integer columnMirror;
+ private Double columnMirror;
@ApiModelProperty(value = "轴位")
@TableField("axis")
--
Gitblit v1.7.1