首页统计

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/HospitalController.java

@@ -74,9 +74,6 @@ public class HospitalController extends BaseController {
     @SaCheckPermission("info:hospital:list")
     @GetMapping("/page")
     public TableDataInfo<HospitalVo> page(@Validated(QueryGroup.class) HospitalBo bo, PageQuery pageQuery) {
-        if (bo.getCreateTimeEnd() != null) {
-            bo.setCreateTimeEnd(LocalDateTimeUtils.getEndOfDate(bo.getCreateTimeEnd()));
-        }
         return iHospitalService.queryPageList(bo, pageQuery);
     }
 

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/bo/HospitalBo.java

@@ -189,5 +189,19 @@ public class HospitalBo extends BaseEntity {
     @ApiModelProperty(value = "创建时间结束")
     private Date createTimeEnd;
 
+    /**
+     * 开始日期(查询用)
+     */
+    @ApiModelProperty(value = "开始日期(查询用)", required = true)
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
 
+    /**
+     * 结束日期(查询用)
+     */
+    @ApiModelProperty(value = "结束日期(查询用)", required = true)
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 }

ruoyi-info/src/main/java/com/ruoyi/info/hospital/service/impl/HospitalServiceImpl.java

@@ -1,11 +1,9 @@
 package com.ruoyi.info.hospital.service.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,11 +20,12 @@ import com.ruoyi.info.hospital.domain.vo.HospitalVo;
 import com.ruoyi.info.hospital.exception.HospitalExceptionEnum;
 import com.ruoyi.info.hospital.mapper.HospitalMapper;
 import com.ruoyi.info.hospital.service.IHospitalService;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 医院信息Service业务层处理
@@ -81,6 +80,12 @@ public class HospitalServiceImpl implements IHospitalService {
         lqw.eq(bo.getAreaId() != null, Hospital::getAreaId, bo.getAreaId());
         lqw.ge(ObjectUtil.isNotNull(bo.getCreateTimeStart()), Hospital::getCreateTime, bo.getCreateTimeStart());
         lqw.le(ObjectUtil.isNotNull(bo.getCreateTimeEnd()), Hospital::getCreateTime, bo.getCreateTimeEnd());
+        if(bo.getStartTime() != null) {
+            lqw.ge(Hospital::getCreateTime, DateUtil.beginOfDay(bo.getStartTime()));
+        }
+        if(bo.getEndTime() != null) {
+            lqw.le(Hospital::getCreateTime, DateUtil.endOfDay(bo.getEndTime()));
+        }
         lqw.orderByDesc(Hospital::getSortOrder).orderByDesc(Hospital::getId);
         return lqw;
     }

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/vo/OrderVo.java

@@ -2,6 +2,8 @@ package com.ruoyi.info.order.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelEnumConvert;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
 import com.ruoyi.info.order.enums.CancellationMethod;
 import com.ruoyi.info.order.enums.OrderStatus;
@@ -31,41 +33,41 @@ public class OrderVo {
     /**
      * ID
      */
-    @ExcelProperty(value = "ID")
     @ApiModelProperty("ID")
     private Long id;
 
     /**
      * 订单号
      */
-    @ExcelProperty(value = "订单号")
+    @ExcelProperty(value = "订单号", order = 1)
     @ApiModelProperty("订单号")
     private String orderNo;
 
     /**
      * C端用户ID
      */
-    @ExcelProperty(value = "C端用户ID")
     @ApiModelProperty("C端用户ID")
     private Long userId;
     @ApiModelProperty(value = "C端用户名称")
     private String userName;
+    @ExcelProperty(value = "下单手机号", order = 7)
     @ApiModelProperty(value = "C端用户手机号")
     private String userMobile;
 
     /**
      * 状态
      */
-    @ExcelProperty(value = "状态")
+    @ExcelProperty(value = "订单状态", converter = ExcelEnumConvert.class, order = 10)
+    @ExcelDictFormat(readConverterExp = "1=待确认,2=待服务,3=进行中,5=已完成,6=已取消,7=已退款")
     @ApiModelProperty("状态")
     private OrderStatus status;
 
     /**
      * 医院ID
      */
-    @ExcelProperty(value = "医院ID")
     @ApiModelProperty("医院ID")
     private Long hospitalId;
+    @ExcelProperty(value = "下单医院", order = 8)
     @ApiModelProperty(value = "医院名称")
     private String hospitalName;
     @ApiModelProperty(value = "医院信息")
@@ -74,30 +76,27 @@ public class OrderVo {
     /**
      * 医院科室ID
      */
-    @ExcelProperty(value = "医院科室ID")
     @ApiModelProperty("医院科室ID")
     private Long hospitalDepartmentId;
+    @ExcelProperty(value = "所在科室", order = 9)
     @ApiModelProperty(value = "医院科室名称")
     private String hospitalDepartmentName;
 
     /**
      * 房床号
      */
-    @ExcelProperty(value = "房床号")
     @ApiModelProperty("房床号")
     private String roomNumber;
 
     /**
      * 订单备注
      */
-    @ExcelProperty(value = "订单备注")
     @ApiModelProperty("订单备注")
     private String remarks;
 
     /**
      * 就诊人ID
      */
-    @ExcelProperty(value = "就诊人ID")
     @ApiModelProperty("就诊人ID")
     private Long patientId;
     @ApiModelProperty("就诊人信息")
@@ -106,14 +105,16 @@ public class OrderVo {
     /**
      * 服务ID
      */
-    @ExcelProperty(value = "服务ID")
     @ApiModelProperty("服务ID")
     private Long serviceId;
+    @ExcelProperty(value = "服务名称", order = 2)
     @ApiModelProperty("服务名称")
     private String serviceName;
     /**
      * 服务单位
      */
+    @ExcelProperty(value = "服务单位", converter = ExcelEnumConvert.class, order = 5)
+    @ExcelDictFormat(readConverterExp = "0=天,1=小时,2=次,3=套")
     @ApiModelProperty("服务单位")
     private ServiceUnit serviceUnit;
     /**
@@ -125,28 +126,27 @@ public class OrderVo {
     /**
      * 期望时间
      */
-    @ExcelProperty(value = "期望时间")
     @ApiModelProperty("期望时间")
     private Date expectedTime;
 
     /**
      * 下单数量
      */
-    @ExcelProperty(value = "下单数量")
+    @ExcelProperty(value = "下单数量", order = 4)
     @ApiModelProperty("下单数量")
     private Integer orderNum;
 
     /**
      * 销售价
      */
-    @ExcelProperty(value = "销售价")
+    @ExcelProperty(value = "销售价", order = 3)
     @ApiModelProperty("销售价")
     private BigDecimal sellingPrice;
 
     /**
      * 应付价格
      */
-    @ExcelProperty(value = "应付价格")
+    @ExcelProperty(value = "应付金额", order = 6)
     @ApiModelProperty("应付价格")
     private BigDecimal totalPrice;
 
@@ -169,14 +169,13 @@ public class OrderVo {
     /**
      * 创建时间
      */
-    @ExcelProperty(value = "创建时间")
+    @ExcelProperty(value = "下单时间", order = 11)
     @ApiModelProperty("创建时间")
     private Date createTime;
 
     /**
      * 修改时间
      */
-    @ExcelProperty(value = "修改时间")
     @ApiModelProperty("修改时间")
     private Date updateTime;
 }

ruoyi-info/src/main/java/com/ruoyi/info/order/enums/OrderStatus.java

@@ -13,9 +13,10 @@ public enum OrderStatus implements IIntegerEnum<Integer> {
 
     wait_confirmed(1, "待确认"),
     wait_service(2, "待服务"),
-    in_progress(3, "进行中"),
-    wait_evaluated(4, "待评价"),
+    in_progress(3, "服务中"),
+//    wait_evaluated(4, "待评价"),
     done(5, "已完成"),
+    refunded(7, "已退款"),
     canceled(6, "已取消"),
     ;
 

ruoyi-info/src/main/java/com/ruoyi/info/order/service/impl/OrderServiceImpl.java

@@ -101,6 +101,10 @@ public class OrderServiceImpl implements IOrderService {
         lqw.eq(bo.getOrderNum() != null, Order::getOrderNum, bo.getOrderNum());
         lqw.eq(bo.getSellingPrice() != null, Order::getSellingPrice, bo.getSellingPrice());
         lqw.eq(bo.getTotalPrice() != null, Order::getTotalPrice, bo.getTotalPrice());
+        //日期
+        buildTime(bo);
+        lqw.ge(bo.getStartTime() != null, Order::getCreateTime, bo.getStartTime());
+        lqw.le(bo.getEndTime() != null, Order::getCreateTime, bo.getEndTime());
         lqw.orderByDesc(Order::getCreateTime);
         return lqw;
     }
@@ -241,6 +245,7 @@ public class OrderServiceImpl implements IOrderService {
 
     @Override
     public TableDataInfo<OrderVo> queryAllPageList(OrderBo bo, PageQuery pageQuery) {
+        buildTime(bo);
         Page<OrderVo> result = baseMapper.queryAllPageList(bo, pageQuery.build());
         result.setRecords(convertAllList(result.getRecords()));
         return TableDataInfo.build(result);
@@ -248,9 +253,19 @@ public class OrderServiceImpl implements IOrderService {
 
     @Override
     public List<OrderVo> queryAllList(OrderBo bo) {
+        buildTime(bo);
         return convertAllList(baseMapper.queryAllList(bo));
     }
 
+    private void buildTime(OrderBo bo) {
+        if(bo.getStartTime() != null) {
+            bo.setStartTime(DateUtil.beginOfDay(bo.getStartTime()));
+        }
+        if(bo.getEndTime() != null) {
+            bo.setEndTime(DateUtil.endOfDay(bo.getEndTime()));
+        }
+    }
+
     @Override
     public Integer querySumForHome() {
         Long count = baseMapper.selectCount(new LambdaQueryWrapper<Order>());

ruoyi-info/src/main/java/com/ruoyi/info/service/domain/ServiceProduct.java

@@ -32,10 +32,12 @@ public class ServiceProduct extends BaseEntity {
     /**
      * 服务分类
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long serviceCategorizeId;
     /**
      * 服务图片
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String image;
     /**
      * 销售价
@@ -64,10 +66,12 @@ public class ServiceProduct extends BaseEntity {
     /**
      * 服务须知
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String serviceNotice;
     /**
      * 状态
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Boolean status;
     /**
      * 删除标志（0代表存在 2代表删除）