Skip to content

P
peizhen-java
Commit d59b5211 by sdif
Options

Merge remote-tracking branch 'origin/dev' into dev

parents cbdb14f3 34872f46
Showing with 699 additions and 35 deletions
pz-admin/src/main/java/com/pz/web/controller/system/YypzOrderController.java
...@@ -43,7 +43,8 @@ public class YypzOrderController extends BaseController { ...@@ -43,7 +43,8 @@ public class YypzOrderController extends BaseController {
@SaCheckPermission("system:yypzOrder:list") @SaCheckPermission("system:yypzOrder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<YypzOrderVo> list(YypzOrderBo bo, PageQuery pageQuery) { public TableDataInfo<YypzOrderVo> list(YypzOrderBo bo, PageQuery pageQuery) {
return iYypzOrderService.queryPageList(bo, pageQuery); TableDataInfo<YypzOrderVo> yypzOrderVoTableDataInfo = iYypzOrderService.queryPageList(bo, pageQuery);
return yypzOrderVoTableDataInfo;
} }
/** /**
......
pz-admin/src/main/java/com/pz/web/controller/system/ZqghOrderController.java 0 → 100644
package com.pz.web.controller.system;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.pz.common.annotation.RepeatSubmit;
import com.pz.common.annotation.Log;
import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R;
import com.pz.common.core.validate.AddGroup;
import com.pz.common.core.validate.EditGroup;
import com.pz.common.enums.BusinessType;
import com.pz.common.utils.poi.ExcelUtil;
import com.pz.system.domain.vo.ZqghOrderVo;
import com.pz.system.domain.bo.ZqghOrderBo;
import com.pz.system.service.IZqghOrderService;
import com.pz.common.core.page.TableDataInfo;
/**
* 诊前挂号订单
*
* @author ruoyi
* @date 2023-09-12
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/zqghOrder")
public class ZqghOrderController extends BaseController {
private final IZqghOrderService iZqghOrderService;
/**
* 查询诊前挂号订单列表
*/
@SaCheckPermission("system:zqghOrder:list")
@GetMapping("/list")
public TableDataInfo<ZqghOrderVo> list(ZqghOrderBo bo, PageQuery pageQuery) {
return iZqghOrderService.queryPageList(bo, pageQuery);
}
/**
* 导出诊前挂号订单列表
*/
@SaCheckPermission("system:zqghOrder:export")
@Log(title = "诊前挂号订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ZqghOrderBo bo, HttpServletResponse response) {
List<ZqghOrderVo> list = iZqghOrderService.queryList(bo);
ExcelUtil.exportExcel(list, "诊前挂号订单", ZqghOrderVo.class, response);
}
/**
* 获取诊前挂号订单详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:zqghOrder:query")
@GetMapping("/{id}")
public R<ZqghOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(iZqghOrderService.queryById(id));
}
/**
* 新增诊前挂号订单
*/
@SaCheckPermission("system:zqghOrder:add")
@Log(title = "诊前挂号订单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ZqghOrderBo bo) {
return toAjax(iZqghOrderService.insertByBo(bo));
}
/**
* 修改诊前挂号订单
*/
@SaCheckPermission("system:zqghOrder:edit")
@Log(title = "诊前挂号订单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZqghOrderBo bo) {
return toAjax(iZqghOrderService.updateByBo(bo));
}
/**
* 删除诊前挂号订单
*
* @param ids 主键串
*/
@SaCheckPermission("system:zqghOrder:remove")
@Log(title = "诊前挂号订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(iZqghOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
pz-admin/src/main/resources/application.yml
...@@ -281,8 +281,8 @@ management: ...@@ -281,8 +281,8 @@ management:
--- # 小程序设置 --- # 小程序设置
wechat: wechat:
applet: applet:
appid: wxe9c227afec04271d appid: wx6cc2fd1bca9472ae
secret: 1edb961b25799225b894e2e6f6989651 secret: 2edf95828b1a19fc5149f6650cde71f1
token: #微信小程序消息服务器配置的token token: #微信小程序消息服务器配置的token
aesKey: #微信小程序消息服务器配置的EncodingAESKey aesKey: #微信小程序消息服务器配置的EncodingAESKey
msgDataFormat: JSON msgDataFormat: JSON
......
pz-system/src/main/java/com/pz/merchant/domain/bo/WechatLoginBo.java
...@@ -40,7 +40,7 @@ public class WechatLoginBo { ...@@ -40,7 +40,7 @@ public class WechatLoginBo {
* 加密算法初始向量 * 加密算法初始向量
* <p>参见:wx.getUserProfile success回调函#iv属性 * <p>参见:wx.getUserProfile success回调函#iv属性
*/ */
@NotBlank(message = "encryptedData不能为空") @NotBlank(message = "iv不能为空")
private String iv; private String iv;
} }
pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java
...@@ -16,10 +16,9 @@ import com.pz.common.utils.StringUtils; ...@@ -16,10 +16,9 @@ import com.pz.common.utils.StringUtils;
import com.pz.merchant.domain.Company; import com.pz.merchant.domain.Company;
import com.pz.merchant.domain.bo.EmployeesListBo; import com.pz.merchant.domain.bo.EmployeesListBo;
import com.pz.merchant.domain.bo.SetEmployeeWorkingHourBo; import com.pz.merchant.domain.bo.SetEmployeeWorkingHourBo;
import com.pz.merchant.domain.vo.EmployeesListVo; import com.pz.merchant.domain.vo.*;
import com.pz.merchant.domain.vo.OrderInfoVO;
import com.pz.merchant.domain.vo.TodayOrderListVo;
import com.pz.merchant.mapper.CompanyMapper; import com.pz.merchant.mapper.CompanyMapper;
import com.pz.merchant.service.ISonOrderService;
import com.pz.system.domain.TotalOrder; import com.pz.system.domain.TotalOrder;
import com.pz.system.domain.bo.EmployeesCompanyBo; import com.pz.system.domain.bo.EmployeesCompanyBo;
import com.pz.system.mapper.CityMapper; import com.pz.system.mapper.CityMapper;
...@@ -28,7 +27,6 @@ import com.pz.system.mapper.TotalOrderMapper; ...@@ -28,7 +27,6 @@ import com.pz.system.mapper.TotalOrderMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.pz.merchant.domain.bo.EmployeesBo; import com.pz.merchant.domain.bo.EmployeesBo;
import com.pz.merchant.domain.vo.EmployeesVo;
import com.pz.merchant.domain.Employees; import com.pz.merchant.domain.Employees;
import com.pz.merchant.mapper.EmployeesMapper; import com.pz.merchant.mapper.EmployeesMapper;
import com.pz.merchant.service.IEmployeesService; import com.pz.merchant.service.IEmployeesService;
...@@ -46,11 +44,12 @@ import java.util.*; ...@@ -46,11 +44,12 @@ import java.util.*;
public class EmployeesServiceImpl implements IEmployeesService { public class EmployeesServiceImpl implements IEmployeesService {
private final EmployeesMapper baseMapper; private final EmployeesMapper baseMapper;
private final CompanyMapper companyMapper; private final CompanyMapper companyMapper;
private final SysUserMapper sysUserMapper; private final SysUserMapper sysUserMapper;
private final CityMapper cityMapper; private final CityMapper cityMapper;
private final TotalOrderMapper totalOrderMapper; private final TotalOrderMapper totalOrderMapper;
private final SonOrderServiceBuilder sonOrderServiceBuilder;
/** /**
* 查询陪诊员 * 查询陪诊员
*/ */
...@@ -169,13 +168,14 @@ public class EmployeesServiceImpl implements IEmployeesService { ...@@ -169,13 +168,14 @@ public class EmployeesServiceImpl implements IEmployeesService {
/** /**
* 需求广场 * 需求广场
*
* @param bo * @param bo
* @param pageQuery * @param pageQuery
* @return * @return
*/ */
@Override @Override
public TableDataInfo<EmployeesVo> queryPageAppNeed(EmployeesBo bo, PageQuery pageQuery) { public TableDataInfo<EmployeesVo> queryPageAppNeed(EmployeesBo bo, PageQuery pageQuery) {
Page<EmployeesVo> result = baseMapper.selectEmployees(bo,pageQuery); Page<EmployeesVo> result = baseMapper.selectEmployees(bo, pageQuery);
Optional.ofNullable(result.getRecords()).ifPresent(EmployeesVo -> { Optional.ofNullable(result.getRecords()).ifPresent(EmployeesVo -> {
EmployeesVo.forEach(t -> { EmployeesVo.forEach(t -> {
List<TotalOrder> totalOrder = totalOrderMapper.selectList(Wrappers.<TotalOrder>lambdaQuery() List<TotalOrder> totalOrder = totalOrderMapper.selectList(Wrappers.<TotalOrder>lambdaQuery()
...@@ -191,13 +191,14 @@ public class EmployeesServiceImpl implements IEmployeesService { ...@@ -191,13 +191,14 @@ public class EmployeesServiceImpl implements IEmployeesService {
/** /**
* 排行榜 * 排行榜
*
* @param bo * @param bo
* @param pageQuery * @param pageQuery
* @return * @return
*/ */
@Override @Override
public TableDataInfo<EmployeesVo> queryPageAppRanking(EmployeesBo bo, PageQuery pageQuery) { public TableDataInfo<EmployeesVo> queryPageAppRanking(EmployeesBo bo, PageQuery pageQuery) {
Page<EmployeesVo> result = baseMapper.selectEmployees(bo,pageQuery); Page<EmployeesVo> result = baseMapper.selectEmployees(bo, pageQuery);
Optional.ofNullable(result.getRecords()).ifPresent(EmployeesVo -> { Optional.ofNullable(result.getRecords()).ifPresent(EmployeesVo -> {
EmployeesVo.forEach(t -> { EmployeesVo.forEach(t -> {
List<TotalOrder> totalOrder = totalOrderMapper.selectList(Wrappers.<TotalOrder>lambdaQuery() List<TotalOrder> totalOrder = totalOrderMapper.selectList(Wrappers.<TotalOrder>lambdaQuery()
...@@ -216,7 +217,7 @@ public class EmployeesServiceImpl implements IEmployeesService { ...@@ -216,7 +217,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
* 查询陪诊员详情 * 查询陪诊员详情
*/ */
@Override @Override
public EmployeesVo queryByApp(Integer id){ public EmployeesVo queryByApp(Integer id) {
EmployeesVo employeesVo = baseMapper.selectEmployeesById(id); EmployeesVo employeesVo = baseMapper.selectEmployeesById(id);
List<TotalOrder> totalOrder = totalOrderMapper.selectList(Wrappers.<TotalOrder>lambdaQuery() List<TotalOrder> totalOrder = totalOrderMapper.selectList(Wrappers.<TotalOrder>lambdaQuery()
.eq(TotalOrder::getEmId, employeesVo.getId()) .eq(TotalOrder::getEmId, employeesVo.getId())
...@@ -267,6 +268,15 @@ public class EmployeesServiceImpl implements IEmployeesService { ...@@ -267,6 +268,15 @@ public class EmployeesServiceImpl implements IEmployeesService {
public TodayOrderListVo queryEmployeesInfo(Integer emId) { public TodayOrderListVo queryEmployeesInfo(Integer emId) {
TodayOrderListVo result = baseMapper.selectEmployeesInfoById(emId); TodayOrderListVo result = baseMapper.selectEmployeesInfoById(emId);
List<OrderInfoVO> orders = baseMapper.selectTodayOrderByEid(emId); List<OrderInfoVO> orders = baseMapper.selectTodayOrderByEid(emId);
// 根据不同子订单装载就诊人员信息和子订单状态
orders.forEach(suborder -> {
ISonOrderService orderService = sonOrderServiceBuilder.getSonOrderService(suborder.getBid());
SonOrderVo orderStatus;
if (orderService != null && (orderStatus = orderService.getSonOrderInfoByTotalId(suborder.getOrderId())) != null) {
suborder.setUserName(orderStatus.getUserName());
suborder.setSonOrderStatus(orderStatus.getOrderStatus());
}
});
result.setTodayOrderList(orders); result.setTodayOrderList(orders);
result.setTodayOrderNum(orders.size()); result.setTodayOrderNum(orders.size());
return result; return result;
......
pz-system/src/main/java/com/pz/merchant/service/impl/SonOrderServiceBuilder.java 0 → 100644
package com.pz.merchant.service.impl;
import com.pz.common.utils.spring.SpringUtils;
import com.pz.merchant.service.ISonOrderService;
import com.pz.system.service.impl.*;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.HashMap;
/**
* 子订单业务构造器
* <p>created in 2023/9/12 10:08
*
* @author WangMin
* @version 1.0
*/
@Component
@ConditionalOnBean({
DbwzOrderServiceImpl.class, YypzOrderServiceImpl.class, ZqghOrderServiceImpl.class,
DbmyOrderServiceImpl.class, ZyphOrderServiceImpl.class, DbghOrderServiceImpl.class})
public class SonOrderServiceBuilder {
private HashMap<Integer, ISonOrderService> sonOrderHashMap;
@PostConstruct
public void loadSonOrderService() {
DbwzOrderServiceImpl dbwzOrderService = SpringUtils.getBean(DbwzOrderServiceImpl.class);
YypzOrderServiceImpl yypzOrderService = SpringUtils.getBean(YypzOrderServiceImpl.class);
ZqghOrderServiceImpl zqghOrderService = SpringUtils.getBean(ZqghOrderServiceImpl.class);
DbmyOrderServiceImpl dbmyOrderService = SpringUtils.getBean(DbmyOrderServiceImpl.class);
ZyphOrderServiceImpl zyphOrderService = SpringUtils.getBean(ZyphOrderServiceImpl.class);
DbghOrderServiceImpl dbghOrderService = SpringUtils.getBean(DbghOrderServiceImpl.class);
sonOrderHashMap = new HashMap<>(8);
sonOrderHashMap.put(1, yypzOrderService);
sonOrderHashMap.put(2, dbghOrderService);
sonOrderHashMap.put(3, dbwzOrderService);
sonOrderHashMap.put(4, zyphOrderService);
sonOrderHashMap.put(5, dbmyOrderService);
sonOrderHashMap.put(6, zqghOrderService);
}
/**
* 根据业务ID获取对应子订单业务
*
* @param businessId 业务ID
* @return 子订单业务
*/
public ISonOrderService getSonOrderService(int businessId) {
return sonOrderHashMap.get(businessId);
}
}
pz-system/src/main/java/com/pz/system/domain/ZqghOrder.java 0 → 100644
package com.pz.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 诊前挂号订单对象 zqgh_order
*
* @author ruoyi
* @date 2023-09-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("zqgh_order")
public class ZqghOrder extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "id")
private Integer id;
/**
* 主订单
*/
private Integer orderId;
/**
* 医院
*/
private Integer hid;
/**
* 科室
*/
private Integer did;
/**
* 医生
*/
private Integer doctorId;
/**
* 预约时间
*/
private String timeOfAppointment;
/**
* 当前状态
*/
private Integer status;
/**
* 服务完成时间
*/
private Date overTime;
/**
* 完成凭证
*/
private String voucher;
/**
*
*/
private Integer isCal;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/bo/ZqghOrderBo.java 0 → 100644
package com.pz.system.domain.bo;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 诊前挂号订单业务对象 zqgh_order
*
* @author ruoyi
* @date 2023-09-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ZqghOrderBo extends BaseEntity {
/**
*
*/
private Integer id;
/**
* 主订单
*/
private Integer orderId;
/**
* 医院
*/
private Integer hid;
/**
* 科室
*/
private Integer did;
/**
* 医生
*/
private Integer doctorId;
/**
* 预约时间
*/
private String timeOfAppointment;
/**
* 当前状态
*/
private Integer status;
/**
* 服务完成时间
*/
private Date overTime;
/**
* 完成凭证
*/
private String voucher;
/**
*
*/
private Integer isCal;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderVo.java
...@@ -35,6 +35,11 @@ public class DbghOrderVo { ...@@ -35,6 +35,11 @@ public class DbghOrderVo {
private Integer orderId; private Integer orderId;
/** /**
* 订单号
*/
private String orderSn;
/**
* 医院 * 医院
*/ */
@ExcelProperty(value = "医院") @ExcelProperty(value = "医院")
...@@ -59,9 +64,9 @@ public class DbghOrderVo { ...@@ -59,9 +64,9 @@ public class DbghOrderVo {
private Integer did; private Integer did;
/** /**
* 订单号 * 接单人
*/ */
private String orderSn; private String eName;
/** /**
* 订单价格 * 订单价格
...@@ -129,4 +134,5 @@ public class DbghOrderVo { ...@@ -129,4 +134,5 @@ public class DbghOrderVo {
@ExcelProperty(value = "订单状态") @ExcelProperty(value = "订单状态")
private Integer tStatus; private Integer tStatus;
private Date createTime;
} }
pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderVo.java
...@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; ...@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.pz.common.annotation.ExcelDictFormat; import com.pz.common.annotation.ExcelDictFormat;
import com.pz.common.convert.ExcelDictConvert; import com.pz.common.convert.ExcelDictConvert;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
...@@ -143,4 +144,6 @@ public class YypzOrderVo { ...@@ -143,4 +144,6 @@ public class YypzOrderVo {
* 评价内容 * 评价内容
*/ */
private String evaluationContent; private String evaluationContent;
private Date createTime;
} }
pz-system/src/main/java/com/pz/system/domain/vo/ZqghOrderVo.java 0 → 100644
package com.pz.system.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.pz.common.annotation.ExcelDictFormat;
import com.pz.common.convert.ExcelDictConvert;
import lombok.Data;
/**
* 诊前挂号订单视图对象 zqgh_order
*
* @author ruoyi
* @date 2023-09-12
*/
@Data
@ExcelIgnoreUnannotated
public class ZqghOrderVo {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Integer id;
/**
* 主订单
*/
@ExcelProperty(value = "主订单")
private Integer orderId;
/**
* 医院
*/
@ExcelProperty(value = "医院")
private Integer hid;
/**
* 科室
*/
@ExcelProperty(value = "科室")
private Integer did;
/**
* 医生
*/
@ExcelProperty(value = "医生")
private Integer doctorId;
/**
* 预约时间
*/
@ExcelProperty(value = "预约时间")
private String timeOfAppointment;
/**
* 当前状态
*/
@ExcelProperty(value = "当前状态")
private Integer status;
/**
* 服务完成时间
*/
@ExcelProperty(value = "服务完成时间")
private Date overTime;
/**
* 完成凭证
*/
@ExcelProperty(value = "完成凭证")
private String voucher;
/**
*
*/
@ExcelProperty(value = "")
private Integer isCal;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}
pz-system/src/main/java/com/pz/system/mapper/DbmyOrderMapper.java
...@@ -2,6 +2,7 @@ package com.pz.system.mapper; ...@@ -2,6 +2,7 @@ package com.pz.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pz.merchant.domain.vo.SonOrderVo;
import com.pz.system.domain.DbmyOrder; import com.pz.system.domain.DbmyOrder;
import com.pz.system.domain.DbwzOrder; import com.pz.system.domain.DbwzOrder;
import com.pz.system.domain.bo.DbmyOrderBo; import com.pz.system.domain.bo.DbmyOrderBo;
...@@ -9,6 +10,7 @@ import com.pz.system.domain.bo.DbwzOrderBo; ...@@ -9,6 +10,7 @@ import com.pz.system.domain.bo.DbwzOrderBo;
import com.pz.system.domain.vo.DbmyOrderVo; import com.pz.system.domain.vo.DbmyOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import com.pz.system.domain.vo.DbwzOrderVo; import com.pz.system.domain.vo.DbwzOrderVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
...@@ -17,6 +19,14 @@ import org.apache.ibatis.annotations.Param; ...@@ -17,6 +19,14 @@ import org.apache.ibatis.annotations.Param;
* @author ruoyi * @author ruoyi
* @date 2023-09-11 * @date 2023-09-11
*/ */
@Mapper
public interface DbmyOrderMapper extends BaseMapperPlus<DbmyOrderMapper, DbmyOrder, DbmyOrderVo> { public interface DbmyOrderMapper extends BaseMapperPlus<DbmyOrderMapper, DbmyOrder, DbmyOrderVo> {
Page<DbmyOrderVo> findDbmyOrderVoPage(IPage<DbmyOrder> iPage, @Param("bo") DbmyOrderBo bo); Page<DbmyOrderVo> findDbmyOrderVoPage(IPage<DbmyOrder> iPage, @Param("bo") DbmyOrderBo bo);
/**
* 根据主订单ID查询子订单相关信息
* @param totalId 主订单ID
* @return 子订单相关信息
*/
SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
} }
pz-system/src/main/java/com/pz/system/mapper/ZqghOrderMapper.java 0 → 100644
package com.pz.system.mapper;
import com.pz.merchant.domain.vo.SonOrderVo;
import com.pz.system.domain.ZqghOrder;
import com.pz.system.domain.vo.ZqghOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/**
* 诊前挂号订单Mapper接口
*
* @author ruoyi
* @date 2023-09-12
*/
@Mapper
public interface ZqghOrderMapper extends BaseMapperPlus<ZqghOrderMapper, ZqghOrder, ZqghOrderVo> {
/**
* 根据主订单ID查询子订单相关信息
* @param totalId 主订单ID
* @return 子订单相关信息
*/
SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
}
pz-system/src/main/java/com/pz/system/service/IZqghOrderService.java 0 → 100644
package com.pz.system.service;
import com.pz.system.domain.ZqghOrder;
import com.pz.system.domain.vo.ZqghOrderVo;
import com.pz.system.domain.bo.ZqghOrderBo;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 诊前挂号订单Service接口
*
* @author ruoyi
* @date 2023-09-12
*/
public interface IZqghOrderService {
/**
* 查询诊前挂号订单
*/
ZqghOrderVo queryById(Integer id);
/**
* 查询诊前挂号订单列表
*/
TableDataInfo<ZqghOrderVo> queryPageList(ZqghOrderBo bo, PageQuery pageQuery);
/**
* 查询诊前挂号订单列表
*/
List<ZqghOrderVo> queryList(ZqghOrderBo bo);
/**
* 新增诊前挂号订单
*/
Boolean insertByBo(ZqghOrderBo bo);
/**
* 修改诊前挂号订单
*/
Boolean updateByBo(ZqghOrderBo bo);
/**
* 校验并批量删除诊前挂号订单信息
*/
Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
}
pz-system/src/main/java/com/pz/system/service/impl/DbmyOrderServiceImpl.java
...@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery; ...@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.merchant.domain.vo.SonOrderVo;
import com.pz.merchant.service.ISonOrderService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.DbmyOrderBo; import com.pz.system.domain.bo.DbmyOrderBo;
...@@ -27,7 +29,7 @@ import java.util.Collection; ...@@ -27,7 +29,7 @@ import java.util.Collection;
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class DbmyOrderServiceImpl implements IDbmyOrderService { public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService {
private final DbmyOrderMapper baseMapper; private final DbmyOrderMapper baseMapper;
...@@ -35,7 +37,7 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService { ...@@ -35,7 +37,7 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService {
* 查询代办买药订单 * 查询代办买药订单
*/ */
@Override @Override
public DbmyOrderVo queryById(Integer id){ public DbmyOrderVo queryById(Integer id) {
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
...@@ -108,8 +110,8 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService { ...@@ -108,8 +110,8 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService {
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(DbmyOrder entity){ private void validEntityBeforeSave(DbmyOrder entity) {
//TODO 做一些数据校验,如唯一约束 // TODO 做一些数据校验,如唯一约束
} }
/** /**
...@@ -117,9 +119,14 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService { ...@@ -117,9 +119,14 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService {
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if(isValid){ if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 // TODO 做一些业务上的校验,判断是否需要校验
} }
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
} }
@Override
public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) {
return baseMapper.selectSonOrderInfoByTotalId(totalId);
}
} }
pz-system/src/main/java/com/pz/system/service/impl/ZqghOrderServiceImpl.java 0 → 100644
package com.pz.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.merchant.domain.vo.SonOrderVo;
import com.pz.merchant.service.ISonOrderService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.ZqghOrderBo;
import com.pz.system.domain.vo.ZqghOrderVo;
import com.pz.system.domain.ZqghOrder;
import com.pz.system.mapper.ZqghOrderMapper;
import com.pz.system.service.IZqghOrderService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 诊前挂号订单Service业务层处理
*
* @author ruoyi
* @date 2023-09-12
*/
@RequiredArgsConstructor
@Service
public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService {
private final ZqghOrderMapper baseMapper;
/**
* 查询诊前挂号订单
*/
@Override
public ZqghOrderVo queryById(Integer id) {
return baseMapper.selectVoById(id);
}
/**
* 查询诊前挂号订单列表
*/
@Override
public TableDataInfo<ZqghOrderVo> queryPageList(ZqghOrderBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ZqghOrder> lqw = buildQueryWrapper(bo);
Page<ZqghOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询诊前挂号订单列表
*/
@Override
public List<ZqghOrderVo> queryList(ZqghOrderBo bo) {
LambdaQueryWrapper<ZqghOrder> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<ZqghOrder> buildQueryWrapper(ZqghOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ZqghOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getOrderId() != null, ZqghOrder::getOrderId, bo.getOrderId());
lqw.eq(bo.getHid() != null, ZqghOrder::getHid, bo.getHid());
lqw.eq(bo.getDid() != null, ZqghOrder::getDid, bo.getDid());
lqw.eq(bo.getDoctorId() != null, ZqghOrder::getDoctorId, bo.getDoctorId());
lqw.eq(StringUtils.isNotBlank(bo.getTimeOfAppointment()), ZqghOrder::getTimeOfAppointment, bo.getTimeOfAppointment());
lqw.eq(bo.getStatus() != null, ZqghOrder::getStatus, bo.getStatus());
lqw.eq(bo.getOverTime() != null, ZqghOrder::getOverTime, bo.getOverTime());
lqw.eq(StringUtils.isNotBlank(bo.getVoucher()), ZqghOrder::getVoucher, bo.getVoucher());
lqw.eq(bo.getIsCal() != null, ZqghOrder::getIsCal, bo.getIsCal());
return lqw;
}
/**
* 新增诊前挂号订单
*/
@Override
public Boolean insertByBo(ZqghOrderBo bo) {
ZqghOrder add = BeanUtil.toBean(bo, ZqghOrder.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改诊前挂号订单
*/
@Override
public Boolean updateByBo(ZqghOrderBo bo) {
ZqghOrder update = BeanUtil.toBean(bo, ZqghOrder.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ZqghOrder entity) {
// TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除诊前挂号订单
*/
@Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if (isValid) {
// TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) {
return baseMapper.selectSonOrderInfoByTotalId(totalId);
}
}
pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
tlo.is_satisfaction AS isSatisfaction, tlo.is_satisfaction AS isSatisfaction,
tlo.evaluation_content AS evaluationContent, tlo.evaluation_content AS evaluationContent,
yyod.over_time AS overtime, yyod.over_time AS overtime,
yyod.voucher AS voucher yyod.voucher AS voucher,
yyod.create_time as createTime
FROM dbgh_order AS yyod FROM dbgh_order AS yyod
LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
LEFT JOIN city AS c ON c.id = tlo.city_id LEFT JOIN city AS c ON c.id = tlo.city_id
...@@ -45,18 +46,17 @@ ...@@ -45,18 +46,17 @@
LEFT JOIN department AS d ON d.id = yyod.did LEFT JOIN department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''"> <!-- <if test="bo.orderSn != null and bo.orderSn != ''">-->
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%') <!-- where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')-->
</if> <!-- </if>-->
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo"> <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
select user.nick_name as userName, select user.name as userName,
dbgh_order.status as orderStatus dbgh_order.status as orderStatus
from dbgh_order from dbgh_order
left join sys_user as user on user.user_id = dbgh_order.visitor left join user_vsitor as user on user.id = dbgh_order.visitor
where dbgh_order.order_id = #{id} where dbgh_order.order_id = #{id}
</select> </select>
......
pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml
...@@ -52,5 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -52,5 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN employees AS e ON e.id = tlo.em_id LEFT JOIN employees AS e ON e.id = tlo.em_id
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
select dbmy_order.status as orderStatus,
sys_user.nick_name as userName
from dbmy_order
left join total_order on total_order.id = dbmy_order.order_id
left join sys_user on sys_user.user_id = total_order.uid
where dbmy_order.order_id = #{id}
</select>
</mapper> </mapper>
pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
...@@ -56,12 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -56,12 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo"> <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
select user.nick_name as userName, select user_vsitor.name as userName,
dbwz_order.status as orderStatus dbwz_order.status as orderStatus
from dbwz_order from dbwz_order
left join sys_user as user on user.user_id = dbwz_order.visitor left join user_vsitor on user_vsitor.id = dbwz_order.visitor
where dbwz_order.order_id = #{id} where dbwz_order.order_id = #{id}
</select> </select>
......
pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml
...@@ -39,7 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -39,7 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tlo.is_satisfaction AS isSatisfaction, tlo.is_satisfaction AS isSatisfaction,
tlo.evaluation_content AS evaluationContent, tlo.evaluation_content AS evaluationContent,
yyod.over_time AS overtime, yyod.over_time AS overtime,
yyod.voucher AS voucher yyod.voucher AS voucher,
yyod.create_time as createTime
FROM yypz_order AS yyod FROM yypz_order AS yyod
LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
LEFT JOIN city AS c ON c.id = tlo.city_id LEFT JOIN city AS c ON c.id = tlo.city_id
...@@ -53,10 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -53,10 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo"> <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
select user.nick_name as userName, select user.name as userName,
yypz_order.status as orderStatus yypz_order.status as orderStatus
from yypz_order from yypz_order
left join sys_user as user on user.user_id = yypz_order.visitor left join user_vsitor as user on user.id = yypz_order.visitor
where yypz_order.order_id = #{id} where yypz_order.order_id = #{id}
</select> </select>
</mapper> </mapper>
pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pz.system.mapper.ZqghOrderMapper">
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
select user.nick_name as userName,
zqgh_order.status as orderStatus
from zqgh_order
left join total_order on total_order.id = zqgh_order.order_id
left join sys_user as user on user.user_id = total_order.uid
where zqgh_order.order_id = #{id}
</select>
</mapper>
pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml
...@@ -57,10 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -57,10 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo"> <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
select user.nick_name as userName, select user.name as userName,
zyph_order.status as orderStatus zyph_order.status as orderStatus
from zyph_order from zyph_order
left join sys_user as user on user.user_id = zyph_order.visitor left join user_vsitor as user on user.id = zyph_order.visitor
where zyph_order.order_id = #{id} where zyph_order.order_id = #{id}
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment