Skip to content

P
peizhen-java
Commit 0d0f9eb2 by 邹磊浩
Options

修改代码

parent 90d90668
Showing with 2153 additions and 44 deletions
pz-admin/src/main/java/com/pz/web/controller/system/DbghOrderController.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.DbghOrderVo;
import com.pz.system.domain.bo.DbghOrderBo;
import com.pz.system.service.IDbghOrderService;
import com.pz.common.core.page.TableDataInfo;
/**
* 代办挂号订单
*
* @author ruoyi
* @date 2023-09-11
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/dbghOrder")
public class DbghOrderController extends BaseController {
private final IDbghOrderService iDbghOrderService;
/**
* 查询代办挂号订单列表
*/
@SaCheckPermission("system:dbghOrder:list")
@GetMapping("/list")
public TableDataInfo<DbghOrderVo> list(DbghOrderBo bo, PageQuery pageQuery) {
return iDbghOrderService.queryPageList(bo, pageQuery);
}
/**
* 导出代办挂号订单列表
*/
@SaCheckPermission("system:dbghOrder:export")
@Log(title = "代办挂号订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbghOrderBo bo, HttpServletResponse response) {
List<DbghOrderVo> list = iDbghOrderService.queryList(bo);
ExcelUtil.exportExcel(list, "代办挂号订单", DbghOrderVo.class, response);
}
/**
* 获取代办挂号订单详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:dbghOrder:query")
@GetMapping("/{id}")
public R<DbghOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(iDbghOrderService.queryById(id));
}
/**
* 新增代办挂号订单
*/
@SaCheckPermission("system:dbghOrder:add")
@Log(title = "代办挂号订单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DbghOrderBo bo) {
return toAjax(iDbghOrderService.insertByBo(bo));
}
/**
* 修改代办挂号订单
*/
@SaCheckPermission("system:dbghOrder:edit")
@Log(title = "代办挂号订单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbghOrderBo bo) {
return toAjax(iDbghOrderService.updateByBo(bo));
}
/**
* 删除代办挂号订单
*
* @param ids 主键串
*/
@SaCheckPermission("system:dbghOrder:remove")
@Log(title = "代办挂号订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(iDbghOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
pz-admin/src/main/java/com/pz/web/controller/system/DbwzOrderController.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.DbwzOrderVo;
import com.pz.system.domain.bo.DbwzOrderBo;
import com.pz.system.service.IDbwzOrderService;
import com.pz.common.core.page.TableDataInfo;
/**
* 代办问诊订单
*
* @author ruoyi
* @date 2023-09-11
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/dbwzOrder")
public class DbwzOrderController extends BaseController {
private final IDbwzOrderService iDbwzOrderService;
/**
* 查询代办问诊订单列表
*/
@SaCheckPermission("system:dbwzOrder:list")
@GetMapping("/list")
public TableDataInfo<DbwzOrderVo> list(DbwzOrderBo bo, PageQuery pageQuery) {
return iDbwzOrderService.queryPageList(bo, pageQuery);
}
/**
* 导出代办问诊订单列表
*/
@SaCheckPermission("system:dbwzOrder:export")
@Log(title = "代办问诊订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbwzOrderBo bo, HttpServletResponse response) {
List<DbwzOrderVo> list = iDbwzOrderService.queryList(bo);
ExcelUtil.exportExcel(list, "代办问诊订单", DbwzOrderVo.class, response);
}
/**
* 获取代办问诊订单详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:dbwzOrder:query")
@GetMapping("/{id}")
public R<DbwzOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(iDbwzOrderService.queryById(id));
}
/**
* 新增代办问诊订单
*/
@SaCheckPermission("system:dbwzOrder:add")
@Log(title = "代办问诊订单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DbwzOrderBo bo) {
return toAjax(iDbwzOrderService.insertByBo(bo));
}
/**
* 修改代办问诊订单
*/
@SaCheckPermission("system:dbwzOrder:edit")
@Log(title = "代办问诊订单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbwzOrderBo bo) {
return toAjax(iDbwzOrderService.updateByBo(bo));
}
/**
* 删除代办问诊订单
*
* @param ids 主键串
*/
@SaCheckPermission("system:dbwzOrder:remove")
@Log(title = "代办问诊订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(iDbwzOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
pz-admin/src/main/java/com/pz/web/controller/system/StoreInfoController.java
......@@ -24,7 +24,7 @@ import com.pz.system.service.IStoreInfoService;
import com.pz.common.core.page.TableDataInfo;
/**
* 商户
* 商城商户
*
* @author ruoyi
* @date 2023-09-08
......
pz-admin/src/main/java/com/pz/web/controller/system/YypzOrderController.java
......@@ -32,7 +32,7 @@ import com.pz.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/order")
@RequestMapping("/system/yypzOrder")
public class YypzOrderController extends BaseController {
private final IYypzOrderService iYypzOrderService;
......@@ -40,7 +40,7 @@ public class YypzOrderController extends BaseController {
/**
* 查询预约陪诊订单列表
*/
@SaCheckPermission("system:order:list")
@SaCheckPermission("system:yypzOrder:list")
@GetMapping("/list")
public TableDataInfo<YypzOrderVo> list(YypzOrderBo bo, PageQuery pageQuery) {
return iYypzOrderService.queryPageList(bo, pageQuery);
......@@ -49,7 +49,7 @@ public class YypzOrderController extends BaseController {
/**
* 导出预约陪诊订单列表
*/
@SaCheckPermission("system:order:export")
@SaCheckPermission("system:yypzOrder:export")
@Log(title = "预约陪诊订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(YypzOrderBo bo, HttpServletResponse response) {
......@@ -62,7 +62,7 @@ public class YypzOrderController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("system:order:query")
@SaCheckPermission("system:yypzOrder:query")
@GetMapping("/{id}")
public R<YypzOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
......@@ -72,7 +72,7 @@ public class YypzOrderController extends BaseController {
/**
* 新增预约陪诊订单
*/
@SaCheckPermission("system:order:add")
@SaCheckPermission("system:yypzOrder:add")
@Log(title = "预约陪诊订单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -83,7 +83,7 @@ public class YypzOrderController extends BaseController {
/**
* 修改预约陪诊订单
*/
@SaCheckPermission("system:order:edit")
@SaCheckPermission("system:yypzOrder:edit")
@Log(title = "预约陪诊订单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -96,7 +96,7 @@ public class YypzOrderController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("system:order:remove")
@SaCheckPermission("system:yypzOrder:remove")
@Log(title = "预约陪诊订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
pz-admin/src/main/java/com/pz/web/controller/system/ZyphOrderController.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.ZyphOrderVo;
import com.pz.system.domain.bo.ZyphOrderBo;
import com.pz.system.service.IZyphOrderService;
import com.pz.common.core.page.TableDataInfo;
/**
* 住院陪诊订单
*
* @author ruoyi
* @date 2023-09-11
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/zyphOrder")
public class ZyphOrderController extends BaseController {
private final IZyphOrderService iZyphOrderService;
/**
* 查询住院陪诊订单列表
*/
@SaCheckPermission("system:zyphOrder:list")
@GetMapping("/list")
public TableDataInfo<ZyphOrderVo> list(ZyphOrderBo bo, PageQuery pageQuery) {
return iZyphOrderService.queryPageList(bo, pageQuery);
}
/**
* 导出住院陪诊订单列表
*/
@SaCheckPermission("system:zyphOrder:export")
@Log(title = "住院陪诊订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ZyphOrderBo bo, HttpServletResponse response) {
List<ZyphOrderVo> list = iZyphOrderService.queryList(bo);
ExcelUtil.exportExcel(list, "住院陪诊订单", ZyphOrderVo.class, response);
}
/**
* 获取住院陪诊订单详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:zyphOrder:query")
@GetMapping("/{id}")
public R<ZyphOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(iZyphOrderService.queryById(id));
}
/**
* 新增住院陪诊订单
*/
@SaCheckPermission("system:zyphOrder:add")
@Log(title = "住院陪诊订单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ZyphOrderBo bo) {
return toAjax(iZyphOrderService.insertByBo(bo));
}
/**
* 修改住院陪诊订单
*/
@SaCheckPermission("system:zyphOrder:edit")
@Log(title = "住院陪诊订单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZyphOrderBo bo) {
return toAjax(iZyphOrderService.updateByBo(bo));
}
/**
* 删除住院陪诊订单
*
* @param ids 主键串
*/
@SaCheckPermission("system:zyphOrder:remove")
@Log(title = "住院陪诊订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(iZyphOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
pz-system/src/main/java/com/pz/merchant/domain/vo/EmployeesVo.java
......@@ -101,5 +101,11 @@ public class EmployeesVo {
@ExcelProperty(value = "注册时间")
private Date createTime;
private String companyName;
private String userName;
private String cityName;
private Integer cityId;
}
pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java
......@@ -16,6 +16,9 @@ import com.pz.merchant.domain.bo.SetEmployeeWorkingHourBo;
import com.pz.merchant.domain.vo.EmployeesListVo;
import com.pz.merchant.domain.vo.OrderInfoVO;
import com.pz.merchant.domain.vo.TodayOrderListVo;
import com.pz.merchant.mapper.CompanyMapper;
import com.pz.system.mapper.CityMapper;
import com.pz.system.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.merchant.domain.bo.EmployeesBo;
......@@ -24,10 +27,7 @@ import com.pz.merchant.domain.Employees;
import com.pz.merchant.mapper.EmployeesMapper;
import com.pz.merchant.service.IEmployeesService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Objects;
import java.util.*;
/**
* 陪诊员Service业务层处理
......@@ -41,6 +41,10 @@ public class EmployeesServiceImpl implements IEmployeesService {
private final EmployeesMapper baseMapper;
private final CompanyMapper companyMapper;
private final SysUserMapper sysUserMapper;
private final CityMapper cityMapper;
/**
* 查询陪诊员
*/
......@@ -56,6 +60,23 @@ public class EmployeesServiceImpl implements IEmployeesService {
public TableDataInfo<EmployeesVo> queryPageList(EmployeesBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Employees> lqw = buildQueryWrapper(bo);
Page<EmployeesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
Optional.ofNullable(result.getRecords()).ifPresent(employeesVos -> {
employeesVos.forEach(employeesVo -> {
//获取商户名称
Optional.ofNullable(companyMapper.selectVoById(employeesVo.getCompanyId()))
.ifPresent(companyVo -> employeesVo.setCompanyName(companyVo.getName()));
//获取用户名称
Optional.ofNullable(sysUserMapper.selectUserById(employeesVo.getUid().longValue())).ifPresent(
sysUser -> employeesVo.setUserName(sysUser.getNickName())
);
//获取城市
Optional.ofNullable(cityMapper.selectVoById(employeesVo.getCityId())).ifPresent(
cityVo -> employeesVo.setCityName(cityVo.getName())
);
});
});
return TableDataInfo.build(result);
}
......
pz-system/src/main/java/com/pz/system/domain/DbghOrder.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;
/**
* 代办挂号订单对象 dbgh_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("dbgh_order")
public class DbghOrder extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "id")
private Integer id;
/**
* 主订单
*/
private Integer orderId;
/**
* 医院
*/
private Integer hid;
/**
* 就诊人员
*/
private Integer visitor;
/**
* 期望就诊时间
*/
private String visitTime;
/**
* 科室
*/
private Integer did;
/**
* 当前状态
*/
private Integer status;
/**
* 服务结束时间
*/
private Date overTime;
/**
* 完成凭证
*/
private String voucher;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/DbwzOrder.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;
/**
* 代办问诊订单对象 dbwz_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("dbwz_order")
public class DbwzOrder extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "id")
private Integer id;
/**
* 主订单
*/
private Integer orderId;
/**
* 就诊人员
*/
private Integer visitor;
/**
* 期望就诊时间
*/
private String visitTime;
/**
* 科室
*/
private Integer did;
/**
* 主诉
*/
private String chiefComplaint;
/**
* 现病史
*/
private String historyOfPresentIllness;
/**
* 即往史
*/
private String pastHistory;
/**
* 上次就医情况
*/
private String lastMedicalTreatmentSituation;
/**
* 治疗后情况
*/
private String postTreatmentCondition;
/**
* 相关报告
*/
private String relatedReports;
/**
* 服务要求
*/
private String serviceRequirements;
/**
* 当前状态
*/
private Integer status;
/**
* 服务完成时间
*/
private Date overTime;
/**
* 完成凭证
*/
private String voucher;
/**
* 说明
*/
private String indications;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/ZyphOrder.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;
/**
* 住院陪诊订单对象 zyph_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("zyph_order")
public class ZyphOrder 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 visitor;
/**
* 开始日期
*/
private String startDay;
/**
* 结束日期
*/
private String endDay;
/**
* 开始时间
*/
private String startTime;
/**
* 结束时间
*/
private String endTime;
/**
* 当前状态
*/
private Integer status;
/**
* 服务完成时间
*/
private Date overTime;
/**
* 完成凭证
*/
private String voucher;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/bo/DbghOrderBo.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;
/**
* 代办挂号订单业务对象 dbgh_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class DbghOrderBo extends BaseEntity {
/**
*
*/
private Integer id;
/**
* 主订单
*/
private Integer orderId;
/**
* 医院
*/
private Integer hid;
/**
* 就诊人员
*/
private Integer visitor;
/**
* 期望就诊时间
*/
private String visitTime;
/**
* 科室
*/
private Integer did;
/**
* 当前状态
*/
private Integer status;
/**
* 服务结束时间
*/
private Date overTime;
/**
* 完成凭证
*/
private String voucher;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/bo/DbwzOrderBo.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;
/**
* 代办问诊订单业务对象 dbwz_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class DbwzOrderBo extends BaseEntity {
/**
*
*/
private Integer id;
/**
* 主订单
*/
private Integer orderId;
/**
* 就诊人员
*/
private Integer visitor;
/**
* 期望就诊时间
*/
private String visitTime;
/**
* 科室
*/
private Integer did;
/**
* 主诉
*/
private String chiefComplaint;
/**
* 现病史
*/
private String historyOfPresentIllness;
/**
* 即往史
*/
private String pastHistory;
/**
* 上次就医情况
*/
private String lastMedicalTreatmentSituation;
/**
* 治疗后情况
*/
private String postTreatmentCondition;
/**
* 相关报告
*/
private String relatedReports;
/**
* 服务要求
*/
private String serviceRequirements;
/**
* 当前状态
*/
private Integer status;
/**
* 服务完成时间
*/
private Date overTime;
/**
* 完成凭证
*/
private String voucher;
/**
* 说明
*/
private String indications;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/bo/StoreIncomeBo.java
......@@ -29,6 +29,8 @@ public class StoreIncomeBo extends BaseEntity {
*/
private Integer storeId;
private String storeName;
/**
* 金额
*/
......
pz-system/src/main/java/com/pz/system/domain/bo/YypzOrderBo.java
......@@ -30,6 +30,11 @@ public class YypzOrderBo extends BaseEntity {
private Integer orderId;
/**
* 订单号
*/
private String orderSn;
/**
* 医院
*/
private Integer hid;
......
pz-system/src/main/java/com/pz/system/domain/bo/ZyphOrderBo.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;
/**
* 住院陪诊订单业务对象 zyph_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ZyphOrderBo extends BaseEntity {
/**
*
*/
private Integer id;
/**
* 主订单
*/
private Integer orderId;
/**
* 医院
*/
private Integer hid;
/**
* 科室
*/
private Integer did;
/**
* 就诊人员
*/
private Integer visitor;
/**
* 开始日期
*/
private String startDay;
/**
* 结束日期
*/
private String endDay;
/**
* 开始时间
*/
private String startTime;
/**
* 结束时间
*/
private String endTime;
/**
* 当前状态
*/
private Integer status;
/**
* 服务完成时间
*/
private Date overTime;
/**
* 完成凭证
*/
private String voucher;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderVo.java 0 → 100644
package com.pz.system.domain.vo;
import java.math.BigDecimal;
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;
/**
* 代办挂号订单视图对象 dbgh_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@ExcelIgnoreUnannotated
public class DbghOrderVo {
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 visitor;
/**
* 期望就诊时间
*/
@ExcelProperty(value = "期望就诊时间")
private String visitTime;
/**
* 科室
*/
@ExcelProperty(value = "科室")
private Integer did;
/**
* 订单号
*/
private String orderSn;
/**
* 订单价格
*/
private BigDecimal payMoney;
/**
* 服务
*/
private String serviceName;
/**
* 城市
*/
private String cityName;
/**
* 医院
*/
private String hName;
/**
* 科室
*/
private String title;
/**
* 当前状态
*/
@ExcelProperty(value = "当前状态")
private Integer status;
/**
* 服务结束时间
*/
@ExcelProperty(value = "服务结束时间")
private Date overTime;
/**
* 完成凭证
*/
@ExcelProperty(value = "完成凭证")
private String voucher;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 就诊人员
*/
private UserVsitorVo userVsitorVo;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderVo.java 0 → 100644
package com.pz.system.domain.vo;
import java.math.BigDecimal;
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;
/**
* 代办问诊订单视图对象 dbwz_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@ExcelIgnoreUnannotated
public class DbwzOrderVo {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Integer id;
/**
* 主订单
*/
@ExcelProperty(value = "主订单")
private Integer orderId;
/**
* 就诊人员
*/
@ExcelProperty(value = "就诊人员")
private Integer visitor;
/**
* 期望就诊时间
*/
@ExcelProperty(value = "期望就诊时间")
private String visitTime;
/**
* 科室
*/
@ExcelProperty(value = "科室")
private Integer did;
/**
* 订单号
*/
private String orderSn;
/**
* 订单价格
*/
private BigDecimal payMoney;
/**
* 服务
*/
private String serviceName;
/**
* 城市
*/
private String cityName;
/**
* 科室
*/
private String title;
/**
* 主诉
*/
@ExcelProperty(value = "主诉")
private String chiefComplaint;
/**
* 现病史
*/
@ExcelProperty(value = "现病史")
private String historyOfPresentIllness;
/**
* 即往史
*/
@ExcelProperty(value = "即往史")
private String pastHistory;
/**
* 上次就医情况
*/
@ExcelProperty(value = "上次就医情况")
private String lastMedicalTreatmentSituation;
/**
* 治疗后情况
*/
@ExcelProperty(value = "治疗后情况")
private String postTreatmentCondition;
/**
* 相关报告
*/
@ExcelProperty(value = "相关报告")
private String relatedReports;
/**
* 服务要求
*/
@ExcelProperty(value = "服务要求")
private String serviceRequirements;
/**
* 当前状态
*/
@ExcelProperty(value = "当前状态")
private Integer status;
/**
* 服务完成时间
*/
@ExcelProperty(value = "服务完成时间")
private Date overTime;
/**
* 完成凭证
*/
@ExcelProperty(value = "完成凭证")
private String voucher;
/**
* 说明
*/
@ExcelProperty(value = "说明")
private String indications;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 就诊人员
*/
private UserVsitorVo userVsitorVo;
}
pz-system/src/main/java/com/pz/system/domain/vo/StoreInfoVo.java
......@@ -4,6 +4,7 @@ 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 com.pz.common.core.domain.BaseEntity;
import lombok.Data;
......@@ -15,7 +16,7 @@ import lombok.Data;
*/
@Data
@ExcelIgnoreUnannotated
public class StoreInfoVo {
public class StoreInfoVo extends BaseEntity {
private static final long serialVersionUID = 1L;
......
pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderVo.java
......@@ -45,6 +45,11 @@ public class YypzOrderVo {
private BigDecimal payMoney;
/**
* 服务
*/
private String serviceName;
/**
* 城市
*/
private String cityName;
......@@ -52,6 +57,16 @@ public class YypzOrderVo {
/**
* 医院
*/
private String hName;
/**
* 科室
*/
private String title;
/**
* 医院
*/
@ExcelProperty(value = "医院")
private Integer hid;
......@@ -103,5 +118,8 @@ public class YypzOrderVo {
@ExcelProperty(value = "备注")
private String remark;
/**
* 就诊人员
*/
private UserVsitorVo userVsitorVo;
}
pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderVo.java 0 → 100644
package com.pz.system.domain.vo;
import java.math.BigDecimal;
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;
/**
* 住院陪诊订单视图对象 zyph_order
*
* @author ruoyi
* @date 2023-09-11
*/
@Data
@ExcelIgnoreUnannotated
public class ZyphOrderVo {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Integer id;
/**
* 主订单
*/
@ExcelProperty(value = "主订单")
private Integer orderId;
/**
* 订单号
*/
private String orderSn;
/**
* 订单价格
*/
private BigDecimal payMoney;
/**
* 服务
*/
private String serviceName;
/**
* 城市
*/
private String cityName;
/**
* 医院
*/
private String hName;
/**
* 科室
*/
private String title;
/**
* 医院
*/
@ExcelProperty(value = "医院")
private Integer hid;
/**
* 科室
*/
@ExcelProperty(value = "科室")
private Integer did;
/**
* 就诊人员
*/
@ExcelProperty(value = "就诊人员")
private Integer visitor;
/**
* 开始日期
*/
@ExcelProperty(value = "开始日期")
private String startDay;
/**
* 结束日期
*/
@ExcelProperty(value = "结束日期")
private String endDay;
/**
* 开始时间
*/
@ExcelProperty(value = "开始时间")
private String startTime;
/**
* 结束时间
*/
@ExcelProperty(value = "结束时间")
private String endTime;
/**
* 当前状态
*/
@ExcelProperty(value = "当前状态")
private Integer status;
/**
* 服务完成时间
*/
@ExcelProperty(value = "服务完成时间")
private Date overTime;
/**
* 完成凭证
*/
@ExcelProperty(value = "完成凭证")
private String voucher;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 就诊人员
*/
private UserVsitorVo userVsitorVo;
}
pz-system/src/main/java/com/pz/system/mapper/DbghOrderMapper.java 0 → 100644
package com.pz.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pz.system.domain.DbghOrder;
import com.pz.system.domain.YypzOrder;
import com.pz.system.domain.bo.DbghOrderBo;
import com.pz.system.domain.bo.YypzOrderBo;
import com.pz.system.domain.vo.DbghOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus;
import com.pz.system.domain.vo.YypzOrderVo;
import org.apache.ibatis.annotations.Param;
/**
* 代办挂号订单Mapper接口
*
* @author ruoyi
* @date 2023-09-11
*/
public interface DbghOrderMapper extends BaseMapperPlus<DbghOrderMapper, DbghOrder, DbghOrderVo> {
Page<DbghOrderVo> findDbghOrderVoPage(IPage<DbghOrder> iPage, @Param("bo") DbghOrderBo bo);
}
pz-system/src/main/java/com/pz/system/mapper/DbwzOrderMapper.java 0 → 100644
package com.pz.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pz.system.domain.DbghOrder;
import com.pz.system.domain.DbwzOrder;
import com.pz.system.domain.bo.DbghOrderBo;
import com.pz.system.domain.bo.DbwzOrderBo;
import com.pz.system.domain.vo.DbghOrderVo;
import com.pz.system.domain.vo.DbwzOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* 代办问诊订单Mapper接口
*
* @author ruoyi
* @date 2023-09-11
*/
public interface DbwzOrderMapper extends BaseMapperPlus<DbwzOrderMapper, DbwzOrder, DbwzOrderVo> {
Page<DbwzOrderVo> findDbwzOrderVoPage(IPage<DbwzOrder> iPage, @Param("bo") DbwzOrderBo bo);
}
pz-system/src/main/java/com/pz/system/mapper/StoreIncomeMapper.java
package com.pz.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pz.system.domain.StoreIncome;
import com.pz.system.domain.bo.StoreIncomeBo;
import com.pz.system.domain.vo.StoreIncomeVo;
import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* 商城提现审批Mapper接口
......@@ -11,5 +15,5 @@ import com.pz.common.core.mapper.BaseMapperPlus;
* @date 2023-09-10
*/
public interface StoreIncomeMapper extends BaseMapperPlus<StoreIncomeMapper, StoreIncome, StoreIncomeVo> {
Page<StoreIncomeVo> findStoreIncomeVoPage(IPage<StoreIncome> page, @Param("bo") StoreIncomeBo bo);
}
pz-system/src/main/java/com/pz/system/mapper/ZyphOrderMapper.java 0 → 100644
package com.pz.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pz.system.domain.YypzOrder;
import com.pz.system.domain.ZyphOrder;
import com.pz.system.domain.bo.YypzOrderBo;
import com.pz.system.domain.bo.ZyphOrderBo;
import com.pz.system.domain.vo.YypzOrderVo;
import com.pz.system.domain.vo.ZyphOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* 住院陪诊订单Mapper接口
*
* @author ruoyi
* @date 2023-09-11
*/
public interface ZyphOrderMapper extends BaseMapperPlus<ZyphOrderMapper, ZyphOrder, ZyphOrderVo> {
Page<ZyphOrderVo> findZyphOrderVoPage(IPage<ZyphOrder> iPage, @Param("bo") ZyphOrderBo zyphOrderBo);
}
pz-system/src/main/java/com/pz/system/service/IDbghOrderService.java 0 → 100644
package com.pz.system.service;
import com.pz.system.domain.DbghOrder;
import com.pz.system.domain.vo.DbghOrderVo;
import com.pz.system.domain.bo.DbghOrderBo;
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-11
*/
public interface IDbghOrderService {
/**
* 查询代办挂号订单
*/
DbghOrderVo queryById(Integer id);
/**
* 查询代办挂号订单列表
*/
TableDataInfo<DbghOrderVo> queryPageList(DbghOrderBo bo, PageQuery pageQuery);
/**
* 查询代办挂号订单列表
*/
List<DbghOrderVo> queryList(DbghOrderBo bo);
/**
* 新增代办挂号订单
*/
Boolean insertByBo(DbghOrderBo bo);
/**
* 修改代办挂号订单
*/
Boolean updateByBo(DbghOrderBo bo);
/**
* 校验并批量删除代办挂号订单信息
*/
Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
}
pz-system/src/main/java/com/pz/system/service/IDbwzOrderService.java 0 → 100644
package com.pz.system.service;
import com.pz.system.domain.DbwzOrder;
import com.pz.system.domain.vo.DbwzOrderVo;
import com.pz.system.domain.bo.DbwzOrderBo;
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-11
*/
public interface IDbwzOrderService {
/**
* 查询代办问诊订单
*/
DbwzOrderVo queryById(Integer id);
/**
* 查询代办问诊订单列表
*/
TableDataInfo<DbwzOrderVo> queryPageList(DbwzOrderBo bo, PageQuery pageQuery);
/**
* 查询代办问诊订单列表
*/
List<DbwzOrderVo> queryList(DbwzOrderBo bo);
/**
* 新增代办问诊订单
*/
Boolean insertByBo(DbwzOrderBo bo);
/**
* 修改代办问诊订单
*/
Boolean updateByBo(DbwzOrderBo bo);
/**
* 校验并批量删除代办问诊订单信息
*/
Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
}
pz-system/src/main/java/com/pz/system/service/IZyphOrderService.java 0 → 100644
package com.pz.system.service;
import com.pz.system.domain.ZyphOrder;
import com.pz.system.domain.vo.ZyphOrderVo;
import com.pz.system.domain.bo.ZyphOrderBo;
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-11
*/
public interface IZyphOrderService {
/**
* 查询住院陪诊订单
*/
ZyphOrderVo queryById(Integer id);
/**
* 查询住院陪诊订单列表
*/
TableDataInfo<ZyphOrderVo> queryPageList(ZyphOrderBo bo, PageQuery pageQuery);
/**
* 查询住院陪诊订单列表
*/
List<ZyphOrderVo> queryList(ZyphOrderBo bo);
/**
* 新增住院陪诊订单
*/
Boolean insertByBo(ZyphOrderBo bo);
/**
* 修改住院陪诊订单
*/
Boolean updateByBo(ZyphOrderBo bo);
/**
* 校验并批量删除住院陪诊订单信息
*/
Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
}
pz-system/src/main/java/com/pz/system/service/impl/DbghOrderServiceImpl.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.system.mapper.UserVsitorMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.DbghOrderBo;
import com.pz.system.domain.vo.DbghOrderVo;
import com.pz.system.domain.DbghOrder;
import com.pz.system.mapper.DbghOrderMapper;
import com.pz.system.service.IDbghOrderService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Optional;
/**
* 代办挂号订单Service业务层处理
*
* @author ruoyi
* @date 2023-09-11
*/
@RequiredArgsConstructor
@Service
public class DbghOrderServiceImpl implements IDbghOrderService {
private final DbghOrderMapper baseMapper;
private final UserVsitorMapper userVsitorMapper;
/**
* 查询代办挂号订单
*/
@Override
public DbghOrderVo queryById(Integer id) {
return baseMapper.selectVoById(id);
}
/**
* 查询代办挂号订单列表
*/
@Override
public TableDataInfo<DbghOrderVo> queryPageList(DbghOrderBo bo, PageQuery pageQuery) {
Page<DbghOrderVo> result = baseMapper.findDbghOrderVoPage(pageQuery.build(), bo);
Optional.ofNullable(result.getRecords()).ifPresent(dbghOrderVos -> {
dbghOrderVos.forEach(dbghOrderVo -> {
Optional.ofNullable(userVsitorMapper.selectVoById(dbghOrderVo.getVisitor())).ifPresent(
//就诊人员
userVsitorVo -> dbghOrderVo.setUserVsitorVo(userVsitorVo)
);
});
});
return TableDataInfo.build(result);
}
/**
* 查询代办挂号订单列表
*/
@Override
public List<DbghOrderVo> queryList(DbghOrderBo bo) {
LambdaQueryWrapper<DbghOrder> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<DbghOrder> buildQueryWrapper(DbghOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DbghOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getOrderId() != null, DbghOrder::getOrderId, bo.getOrderId());
lqw.eq(bo.getHid() != null, DbghOrder::getHid, bo.getHid());
lqw.eq(bo.getVisitor() != null, DbghOrder::getVisitor, bo.getVisitor());
lqw.eq(StringUtils.isNotBlank(bo.getVisitTime()), DbghOrder::getVisitTime, bo.getVisitTime());
lqw.eq(bo.getDid() != null, DbghOrder::getDid, bo.getDid());
lqw.eq(bo.getStatus() != null, DbghOrder::getStatus, bo.getStatus());
lqw.eq(bo.getOverTime() != null, DbghOrder::getOverTime, bo.getOverTime());
lqw.eq(StringUtils.isNotBlank(bo.getVoucher()), DbghOrder::getVoucher, bo.getVoucher());
return lqw;
}
/**
* 新增代办挂号订单
*/
@Override
public Boolean insertByBo(DbghOrderBo bo) {
DbghOrder add = BeanUtil.toBean(bo, DbghOrder.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改代办挂号订单
*/
@Override
public Boolean updateByBo(DbghOrderBo bo) {
DbghOrder update = BeanUtil.toBean(bo, DbghOrder.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbghOrder entity) {
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除代办挂号订单
*/
@Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}
pz-system/src/main/java/com/pz/system/service/impl/DbwzOrderServiceImpl.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.system.mapper.UserVsitorMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.DbwzOrderBo;
import com.pz.system.domain.vo.DbwzOrderVo;
import com.pz.system.domain.DbwzOrder;
import com.pz.system.mapper.DbwzOrderMapper;
import com.pz.system.service.IDbwzOrderService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Optional;
/**
* 代办问诊订单Service业务层处理
*
* @author ruoyi
* @date 2023-09-11
*/
@RequiredArgsConstructor
@Service
public class DbwzOrderServiceImpl implements IDbwzOrderService {
private final DbwzOrderMapper baseMapper;
private final UserVsitorMapper userVsitorMapper;
/**
* 查询代办问诊订单
*/
@Override
public DbwzOrderVo queryById(Integer id) {
return baseMapper.selectVoById(id);
}
/**
* 查询代办问诊订单列表
*/
@Override
public TableDataInfo<DbwzOrderVo> queryPageList(DbwzOrderBo bo, PageQuery pageQuery) {
Page<DbwzOrderVo> result = baseMapper.findDbwzOrderVoPage(pageQuery.build(), bo);
Optional.ofNullable(result.getRecords()).ifPresent(dbwzOrderVos -> {
dbwzOrderVos.forEach(dbwzOrderVo -> {
Optional.ofNullable(userVsitorMapper.selectVoById(dbwzOrderVo.getVisitor())).ifPresent(
//就诊人员
userVsitorVo -> dbwzOrderVo.setUserVsitorVo(userVsitorVo)
);
});
});
return TableDataInfo.build(result);
}
/**
* 查询代办问诊订单列表
*/
@Override
public List<DbwzOrderVo> queryList(DbwzOrderBo bo) {
LambdaQueryWrapper<DbwzOrder> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<DbwzOrder> buildQueryWrapper(DbwzOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DbwzOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getOrderId() != null, DbwzOrder::getOrderId, bo.getOrderId());
lqw.eq(bo.getVisitor() != null, DbwzOrder::getVisitor, bo.getVisitor());
lqw.eq(StringUtils.isNotBlank(bo.getVisitTime()), DbwzOrder::getVisitTime, bo.getVisitTime());
lqw.eq(bo.getDid() != null, DbwzOrder::getDid, bo.getDid());
lqw.eq(StringUtils.isNotBlank(bo.getChiefComplaint()), DbwzOrder::getChiefComplaint, bo.getChiefComplaint());
lqw.eq(StringUtils.isNotBlank(bo.getHistoryOfPresentIllness()), DbwzOrder::getHistoryOfPresentIllness, bo.getHistoryOfPresentIllness());
lqw.eq(StringUtils.isNotBlank(bo.getPastHistory()), DbwzOrder::getPastHistory, bo.getPastHistory());
lqw.eq(StringUtils.isNotBlank(bo.getLastMedicalTreatmentSituation()), DbwzOrder::getLastMedicalTreatmentSituation, bo.getLastMedicalTreatmentSituation());
lqw.eq(StringUtils.isNotBlank(bo.getPostTreatmentCondition()), DbwzOrder::getPostTreatmentCondition, bo.getPostTreatmentCondition());
lqw.eq(StringUtils.isNotBlank(bo.getRelatedReports()), DbwzOrder::getRelatedReports, bo.getRelatedReports());
lqw.eq(StringUtils.isNotBlank(bo.getServiceRequirements()), DbwzOrder::getServiceRequirements, bo.getServiceRequirements());
lqw.eq(bo.getStatus() != null, DbwzOrder::getStatus, bo.getStatus());
lqw.eq(bo.getOverTime() != null, DbwzOrder::getOverTime, bo.getOverTime());
lqw.eq(StringUtils.isNotBlank(bo.getVoucher()), DbwzOrder::getVoucher, bo.getVoucher());
lqw.eq(StringUtils.isNotBlank(bo.getIndications()), DbwzOrder::getIndications, bo.getIndications());
return lqw;
}
/**
* 新增代办问诊订单
*/
@Override
public Boolean insertByBo(DbwzOrderBo bo) {
DbwzOrder add = BeanUtil.toBean(bo, DbwzOrder.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改代办问诊订单
*/
@Override
public Boolean updateByBo(DbwzOrderBo bo) {
DbwzOrder update = BeanUtil.toBean(bo, DbwzOrder.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbwzOrder entity) {
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除代办问诊订单
*/
@Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}
pz-system/src/main/java/com/pz/system/service/impl/StoreIncomeServiceImpl.java
......@@ -47,26 +47,7 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService {
*/
@Override
public TableDataInfo<StoreIncomeVo> queryPageList(StoreIncomeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<StoreIncome> lqw = buildQueryWrapper(bo);
Page<StoreIncomeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
List<Integer> storeIds = Optional.ofNullable(result.getRecords())
.orElse(Collections.emptyList())
.stream()
.map(StoreIncomeVo::getStoreId)
.collect(Collectors.toList());
List<StoreInfoVo> storeInfoVos = storeInfoMapper.selectVoBatchIds(storeIds);
Optional.ofNullable(result.getRecords())
.ifPresent(storeIncomeVos -> storeIncomeVos.parallelStream()
.forEach(storeIncomeVo -> {
Optional<StoreInfoVo> storeInfoVoOptional = storeInfoVos.stream()
.filter(storeInfoVo -> Objects.equals(storeInfoVo.getId(), storeIncomeVo.getStoreId()))
.findFirst();
//商户名称
storeInfoVoOptional.ifPresent(storeInfoVo -> storeIncomeVo.setStoreName(storeInfoVo.getName()));
}));
Page<StoreIncomeVo> result = baseMapper.findStoreIncomeVoPage(pageQuery.build(), bo);
return TableDataInfo.build(result);
}
......
pz-system/src/main/java/com/pz/system/service/impl/StoreInfoServiceImpl.java
......@@ -7,6 +7,7 @@ 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.system.mapper.CityMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.StoreInfoBo;
......@@ -18,6 +19,7 @@ import com.pz.system.service.IStoreInfoService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Optional;
/**
* 商户Service业务层处理
......@@ -31,11 +33,13 @@ public class StoreInfoServiceImpl implements IStoreInfoService {
private final StoreInfoMapper baseMapper;
private final CityMapper cityMapper;
/**
* 查询商户
*/
@Override
public StoreInfoVo queryById(Integer id){
public StoreInfoVo queryById(Integer id) {
return baseMapper.selectVoById(id);
}
......@@ -46,6 +50,13 @@ public class StoreInfoServiceImpl implements IStoreInfoService {
public TableDataInfo<StoreInfoVo> queryPageList(StoreInfoBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<StoreInfo> lqw = buildQueryWrapper(bo);
Page<StoreInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
Optional.ofNullable(result.getRecords()).ifPresent(
storeInfoVos -> {
storeInfoVos.forEach(storeInfoVo -> {
});
}
);
return TableDataInfo.build(result);
}
......@@ -107,7 +118,7 @@ public class StoreInfoServiceImpl implements IStoreInfoService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(StoreInfo entity){
private void validEntityBeforeSave(StoreInfo entity) {
//TODO 做一些数据校验,如唯一约束
}
......@@ -116,7 +127,7 @@ public class StoreInfoServiceImpl implements IStoreInfoService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
......
pz-system/src/main/java/com/pz/system/service/impl/YypzOrderServiceImpl.java
......@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.system.mapper.CityMapper;
import com.pz.system.mapper.TotalOrderMapper;
import com.pz.system.mapper.UserVsitorMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.YypzOrderBo;
......@@ -34,10 +35,7 @@ import java.util.Optional;
public class YypzOrderServiceImpl implements IYypzOrderService {
private final YypzOrderMapper baseMapper;
private final TotalOrderMapper totalOrderMapper;
private final CityMapper cityMapper;
private final UserVsitorMapper userVsitorMapper;
/**
* 查询预约陪诊订单
......@@ -53,6 +51,15 @@ public class YypzOrderServiceImpl implements IYypzOrderService {
@Override
public TableDataInfo<YypzOrderVo> queryPageList(YypzOrderBo bo, PageQuery pageQuery) {
Page<YypzOrderVo> result = baseMapper.findYypzOrderVoPage(pageQuery.build(), bo);
Optional.ofNullable(result.getRecords()).ifPresent(yypzOrderVos -> {
yypzOrderVos.forEach(yypzOrderVo -> {
Optional.ofNullable(userVsitorMapper.selectVoById(yypzOrderVo.getVisitor())).ifPresent(
userVsitorVo ->
//就诊人员
yypzOrderVo.setUserVsitorVo(userVsitorVo)
);
});
});
return TableDataInfo.build(result);
}
......
pz-system/src/main/java/com/pz/system/service/impl/ZyphOrderServiceImpl.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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.ZyphOrderBo;
import com.pz.system.domain.vo.ZyphOrderVo;
import com.pz.system.domain.ZyphOrder;
import com.pz.system.mapper.ZyphOrderMapper;
import com.pz.system.service.IZyphOrderService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 住院陪诊订单Service业务层处理
*
* @author ruoyi
* @date 2023-09-11
*/
@RequiredArgsConstructor
@Service
public class ZyphOrderServiceImpl implements IZyphOrderService {
private final ZyphOrderMapper baseMapper;
/**
* 查询住院陪诊订单
*/
@Override
public ZyphOrderVo queryById(Integer id){
return baseMapper.selectVoById(id);
}
/**
* 查询住院陪诊订单列表
*/
@Override
public TableDataInfo<ZyphOrderVo> queryPageList(ZyphOrderBo bo, PageQuery pageQuery) {
Page<ZyphOrderVo> result = baseMapper.findZyphOrderVoPage(pageQuery.build(), bo);
return TableDataInfo.build(result);
}
/**
* 查询住院陪诊订单列表
*/
@Override
public List<ZyphOrderVo> queryList(ZyphOrderBo bo) {
LambdaQueryWrapper<ZyphOrder> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<ZyphOrder> buildQueryWrapper(ZyphOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ZyphOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getOrderId() != null, ZyphOrder::getOrderId, bo.getOrderId());
lqw.eq(bo.getHid() != null, ZyphOrder::getHid, bo.getHid());
lqw.eq(bo.getDid() != null, ZyphOrder::getDid, bo.getDid());
lqw.eq(bo.getVisitor() != null, ZyphOrder::getVisitor, bo.getVisitor());
lqw.eq(StringUtils.isNotBlank(bo.getStartDay()), ZyphOrder::getStartDay, bo.getStartDay());
lqw.eq(StringUtils.isNotBlank(bo.getEndDay()), ZyphOrder::getEndDay, bo.getEndDay());
lqw.eq(StringUtils.isNotBlank(bo.getStartTime()), ZyphOrder::getStartTime, bo.getStartTime());
lqw.eq(StringUtils.isNotBlank(bo.getEndTime()), ZyphOrder::getEndTime, bo.getEndTime());
lqw.eq(bo.getStatus() != null, ZyphOrder::getStatus, bo.getStatus());
lqw.eq(bo.getOverTime() != null, ZyphOrder::getOverTime, bo.getOverTime());
lqw.eq(StringUtils.isNotBlank(bo.getVoucher()), ZyphOrder::getVoucher, bo.getVoucher());
return lqw;
}
/**
* 新增住院陪诊订单
*/
@Override
public Boolean insertByBo(ZyphOrderBo bo) {
ZyphOrder add = BeanUtil.toBean(bo, ZyphOrder.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改住院陪诊订单
*/
@Override
public Boolean updateByBo(ZyphOrderBo bo) {
ZyphOrder update = BeanUtil.toBean(bo, ZyphOrder.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ZyphOrder entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除住院陪诊订单
*/
@Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}
pz-system/src/main/resources/mapper/system/DbghOrderMapper.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.DbghOrderMapper">
<resultMap type="com.pz.system.domain.DbghOrder" id="DbghOrderResult">
<result property="id" column="id"/>
<result property="orderId" column="order_id"/>
<result property="hid" column="hid"/>
<result property="visitor" column="visitor"/>
<result property="visitTime" column="visit_time"/>
<result property="did" column="did"/>
<result property="status" column="status"/>
<result property="overTime" column="over_time"/>
<result property="voucher" column="voucher"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="findDbghOrderVoPage" resultType="com.pz.system.domain.vo.DbghOrderVo">
SELECT
tlo.order_sn AS orderSn,
tlo.pay_money AS PayMoney,
s.`name` AS serviceName,
c.`name` AS cityName,
h.`name` AS hName,
d.title AS title,
e.`name` AS eName,
tlo.remark AS remark,
yyod.visit_time AS visitTime,
yyod.`status` AS yStatus,
tlo.`status` AS tStatus,
tlo.is_satisfaction AS isSatisfaction,
tlo.evaluation_content AS evaluationContent,
yyod.over_time AS overtime,
yyod.voucher AS voucher
FROM dbgh_order AS yyod
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 hospital AS h ON h.id = yyod.hid
LEFT JOIN department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''">
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if>
</select>
</mapper>
pz-system/src/main/resources/mapper/system/DbwzOrderMapper.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.DbwzOrderMapper">
<resultMap type="com.pz.system.domain.DbwzOrder" id="DbwzOrderResult">
<result property="id" column="id"/>
<result property="orderId" column="order_id"/>
<result property="visitor" column="visitor"/>
<result property="visitTime" column="visit_time"/>
<result property="did" column="did"/>
<result property="chiefComplaint" column="chief_complaint"/>
<result property="historyOfPresentIllness" column="history_of_present_illness"/>
<result property="pastHistory" column="past_history"/>
<result property="lastMedicalTreatmentSituation" column="last_medical_treatment_situation"/>
<result property="postTreatmentCondition" column="post_treatment_condition"/>
<result property="relatedReports" column="related_reports"/>
<result property="serviceRequirements" column="service_requirements"/>
<result property="status" column="status"/>
<result property="overTime" column="over_time"/>
<result property="voucher" column="voucher"/>
<result property="indications" column="indications"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="findDbwzOrderVoPage" resultType="com.pz.system.domain.vo.DbwzOrderVo">
SELECT
tlo.order_sn AS orderSn,
tlo.pay_money AS PayMoney,
s.`name` AS serviceName,
c.`name` AS cityName,
d.title AS title,
e.`name` AS eName,
tlo.remark AS remark,
yyod.visit_time AS visitTime,
yyod.`status` AS yStatus,
tlo.`status` AS tStatus,
tlo.is_satisfaction AS isSatisfaction,
tlo.evaluation_content AS evaluationContent,
yyod.over_time AS overtime,
yyod.voucher AS voucher
FROM dbwz_order AS yyod
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 department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''">
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if>
</select>
</mapper>
pz-system/src/main/resources/mapper/system/StoreIncomeMapper.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.StoreIncomeMapper">
<resultMap type="com.pz.system.domain.StoreIncome" id="StoreIncomeResult">
<result property="id" column="id"/>
<result property="storeId" column="store_id"/>
<result property="amount" column="amount"/>
<result property="invoice" column="invoice"/>
<result property="feedback" column="feedback"/>
<result property="status" column="status"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="findStoreIncomeVoPage" resultType="com.pz.system.domain.vo.StoreIncomeVo">
select sin.name as storeName,si.* from store_income AS si
left join store_info AS sin on sin.id = si.store_id
<if test="bo.storeName != null and bo.storeName != ''">
where sin.name LIKE CONCAT('%', #{bo.storeName}, '%')
</if>
</select>
</mapper>
pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml
......@@ -47,7 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''">
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if>
</select>
</mapper>
pz-system/src/main/resources/mapper/system/ZyphOrderMapper.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.ZyphOrderMapper">
<resultMap type="com.pz.system.domain.ZyphOrder" id="ZyphOrderResult">
<result property="id" column="id"/>
<result property="orderId" column="order_id"/>
<result property="hid" column="hid"/>
<result property="did" column="did"/>
<result property="visitor" column="visitor"/>
<result property="startDay" column="start_day"/>
<result property="endDay" column="end_day"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="status" column="status"/>
<result property="overTime" column="over_time"/>
<result property="voucher" column="voucher"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="findZyphOrderVoPage" resultType="com.pz.system.domain.vo.ZyphOrderVo">
SELECT
tlo.order_sn AS orderSn,
tlo.pay_money AS PayMoney,
s.`name` AS serviceName,
c.`name` AS cityName,
d.title AS title,
e.`name` AS eName,
tlo.remark AS remark,
yyod.`status` AS yStatus,
h.`name` AS hName,
tlo.`status` AS tStatus,
tlo.is_satisfaction AS isSatisfaction,
tlo.evaluation_content AS evaluationContent,
yyod.over_time AS overtime,
yyod.voucher AS voucher,
yyod.start_day,
yyod.end_day,
yyod.start_time,
yyod.end_time
FROM zyph_order AS yyod
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 hospital AS h ON h.id = yyod.hid
LEFT JOIN department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''">
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if>
</select>
</mapper>
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