修改代码

pz-admin/src/main/java/com/pz/web/controller/system/YypzOrderController.java

@@ -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

+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-system/src/main/java/com/pz/system/domain/ZqghOrder.java

+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

+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 {
     private Integer orderId;
     private Integer orderId;
 
 
     /**
     /**
+     * 订单号
+     */
+    private String orderSn;
+
+    /**
      * 医院
      * 医院
      */
      */
     @ExcelProperty(value = "医院")
     @ExcelProperty(value = "医院")
@@ -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 {
     @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;
 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 {
      * 评价内容
      * 评价内容
      */
      */
     private String evaluationContent;
     private String evaluationContent;
+
+    private Date createTime;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/ZqghOrderVo.java

+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/ZqghOrderMapper.java

+package com.pz.system.mapper;
+
+import com.pz.system.domain.ZqghOrder;
+import com.pz.system.domain.vo.ZqghOrderVo;
+import com.pz.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 诊前挂号订单Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+public interface ZqghOrderMapper extends BaseMapperPlus<ZqghOrderMapper, ZqghOrder, ZqghOrderVo> {
+
+}

pz-system/src/main/java/com/pz/system/service/IZqghOrderService.java

+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/ZqghOrderServiceImpl.java

+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.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 {
+
+    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;
+    }
+}

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -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,9 +46,9 @@
         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 != ''">
-            where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
-        </if>
+<!--        <if test="bo.orderSn != null and bo.orderSn != ''">-->
+<!--            where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')-->
+<!--        </if>-->
     </select>
     </select>
 
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">