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

# Conflicts:
#	ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/service/IOrderRefundService.java
#	ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/service/IOrderService.java
#	ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/service/impl/OrderRefundServiceImpl.java
#	ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/service/impl/OrderServiceImpl.java

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiManagementTeacherController.java

@@ -1,12 +1,36 @@
 package com.ruoyi.api.controller.info;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ruoyi.api.controller.common.AbstractApiController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.common.utils.CollectionUtils;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.date.LocalDateTimeUtils;
+import com.ruoyi.info.management.domain.TeacherDepartmentRel;
+import com.ruoyi.info.management.domain.vo.ManagementTeacherBenchVo;
+import com.ruoyi.info.management.domain.vo.ManagementTeacherVo;
 import com.ruoyi.info.management.service.IManagementTeacherService;
+import com.ruoyi.info.management.service.ITeacherDepartmentRelService;
+import com.ruoyi.info.nursing.domain.vo.NursingWorkerBenchVo;
+import com.ruoyi.info.nursing.domain.vo.NursingWorkerVo;
+import com.ruoyi.info.order.domain.bo.OrderCountBo;
+import com.ruoyi.info.order.domain.bo.OrderRefundCountBo;
+import com.ruoyi.info.order.enums.OrderStatus;
+import com.ruoyi.info.order.enums.RefundStatus;
+import com.ruoyi.info.order.service.IOrderRefundService;
+import com.ruoyi.info.order.service.IOrderService;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 
 /**
@@ -18,11 +42,51 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/info/managementTeacher")
-public class ApiManagementTeacherController {
+public class ApiManagementTeacherController extends AbstractApiController {
 
     private final IManagementTeacherService managementTeacherService;
 
+    private final ITeacherDepartmentRelService teacherDepartmentRelService;
+
+    private final IOrderService orderService;
+
+    private final IOrderRefundService orderRefundService;
+
+    @ApiOperation("管理老师工作台信息")
+    @GetMapping("/workbench")
+    public R<ManagementTeacherBenchVo> workbench() {
+        Long teacherId = getTeacherId();
+
+        ManagementTeacherBenchVo managementTeacherBenchVo = new ManagementTeacherBenchVo();
+
+        // 获取基本信息
+        ManagementTeacherVo managementTeacherVo = managementTeacherService.queryById(teacherId);
+        BeanCopyUtils.copy(managementTeacherVo, managementTeacherBenchVo);
+
+        // 获取管理老师管理科室列表
+        List<TeacherDepartmentRel> teacherDepartmentRelList = teacherDepartmentRelService.queryByTeacherId(teacherId);
+        Set<Long> departmentIds = CollectionUtils.convertSet(teacherDepartmentRelList, TeacherDepartmentRel::getDepartmentId);
+
+        // 订单总数
+        Integer orderCount = orderService.queryOrderCount(new OrderCountBo(departmentIds));
+
+        // 今日订单数
+        Date todayBegin = DateUtils.toDate(LocalDateTimeUtils.getToday());
+        Date todayEnd = LocalDateTimeUtils.getEndOfDate(todayBegin);
+        Integer todayCount =  orderService.queryOrderCount(new OrderCountBo(departmentIds, todayBegin, todayEnd));
+
+        // 待确认数量
+        Integer waitConfirmedCount = orderService.queryOrderCount(new OrderCountBo(departmentIds, OrderStatus.wait_confirmed.getCode()));
+
+        // 退款售后数量，这里只查退款中的数量
+        Integer waitRefundCount = orderRefundService.queryOrderRefundCount(new OrderRefundCountBo(departmentIds, RefundStatus.wait.getCode()));
 
+        managementTeacherBenchVo.setOrderCount(orderCount);
+        managementTeacherBenchVo.setTodayCount(todayCount);
+        managementTeacherBenchVo.setWaitConfirmedCount(waitConfirmedCount);
+        managementTeacherBenchVo.setWaitRefundCount(waitRefundCount);
+        return R.ok(managementTeacherBenchVo);
+    }
 
 
 

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiNursingWorkerController.java

@@ -1,5 +1,7 @@
 package com.ruoyi.api.controller.info;
 
+import java.util.Date;
+
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -7,7 +9,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.ruoyi.api.controller.common.AbstractApiController;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.date.LocalDateTimeUtils;
+import com.ruoyi.info.nursing.domain.vo.NursingWorkerBenchVo;
+import com.ruoyi.info.nursing.domain.vo.NursingWorkerVo;
 import com.ruoyi.info.nursing.service.INursingWorkerService;
+import com.ruoyi.info.order.domain.bo.OrderCountBo;
+import com.ruoyi.info.order.enums.OrderStatus;
+import com.ruoyi.info.order.service.IOrderService;
 import com.ruoyi.user.domain.User;
 
 import io.swagger.annotations.Api;
@@ -27,14 +37,36 @@ public class ApiNursingWorkerController extends AbstractApiController {
 
     private final INursingWorkerService nursingWorkerService;
 
+    private final IOrderService orderService;
 
     @ApiOperation("护工工作台信息")
     @GetMapping("/workbench")
-    public R<?> workbench() {
-        User user = getLoginUser();
+    public R<NursingWorkerBenchVo> workbench() {
+        Long workerId = getWorkerId();
+
+        NursingWorkerBenchVo nursingWorkerBenchVo = new NursingWorkerBenchVo();
+
+        //  获取护工的基本信息
+        NursingWorkerVo nursingWorkerVo = nursingWorkerService.queryById(workerId);
+        BeanCopyUtils.copy(nursingWorkerVo, nursingWorkerBenchVo);
 
+        //  获取护工的订单信息
+        // 护工订单总数
+        Integer orderCount = orderService.queryOrderCount(new OrderCountBo(workerId));
+        // 护工今日订单数量
+        Date todayBegin = DateUtils.toDate(LocalDateTimeUtils.getToday());
+        Date todayEnd = LocalDateTimeUtils.getEndOfDate(todayBegin);
+        Integer todayCount = orderService.queryOrderCount(new OrderCountBo(workerId, todayBegin, todayEnd));
+        // 护工待服务数量
+        Integer waitServiceCount = orderService.queryOrderCount(new OrderCountBo(workerId, OrderStatus.wait_service.getCode()));
+        // 护工服务中数量
+        Integer inServiceCount = orderService.queryOrderCount(new OrderCountBo(workerId, OrderStatus.in_progress.getCode()));
+        nursingWorkerBenchVo.setOrderCount(orderCount);
+        nursingWorkerBenchVo.setTodayCount(todayCount);
+        nursingWorkerBenchVo.setWaitServiceCount(waitServiceCount);
+        nursingWorkerBenchVo.setInServiceCount(inServiceCount);
 
-        return null;
+        return R.ok(nursingWorkerBenchVo);
     }
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/UserExtendInfo.java

@@ -1,30 +0,0 @@
-package com.ruoyi.common.core.domain.model;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author fucheng.bai
- * @date 2025/9/29
- */
-@Data
-@NoArgsConstructor
-public class UserExtendInfo {
-
-    /**
-     * 登录用户类型 1-普通用户 2-管理老师 3-护工
-     *
-     * {@link com.ruoyi.common.enums.LoginUserTypeEnum}
-     */
-    private Integer loginUserType;
-
-    /**
-     * 管理老师id
-     */
-    private Long teacherId;
-
-    /**
-     * 护工id
-     */
-    private Long workerId;
-}

ruoyi-common/src/main/java/com/ruoyi/common/utils/date/LocalDateTimeUtils.java

@@ -68,6 +68,15 @@ public class LocalDateTimeUtils {
         return startTime.isBefore(LocalDateTime.now()) && endTime.isAfter(LocalDateTime.now());
     }
 
+    /**
+     * 获取今天的开始时间
+     *
+     * @return 今天
+     */
+    public static LocalDateTime getToday() {
+        return LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
+    }
+
     /**
      * 本周开始时间
      *

ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/UserContext.java

@@ -1,7 +1,6 @@
 package com.ruoyi.framework.interceptor;
 
 
-import com.ruoyi.common.core.domain.model.UserExtendInfo;
 import com.ruoyi.user.domain.User;
 
 public class UserContext {
@@ -20,14 +19,6 @@ public class UserContext {
         return CTX.get();
     }
 
-    /**
-     * 获取用户扩展信息
-     * @return
-     */
-    public static UserExtendInfo currentUserExtendInfo() {
-        return CTX.get().getUserExtendInfo();
-    }
-
 
     public static void close() {
         CTX.remove();

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/domain/vo/ManagementTeacherBenchVo.java

@@ -0,0 +1,68 @@
+package com.ruoyi.info.management.domain.vo;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 管理老师工作台信息
+ *
+ * @author fucheng.bai
+ * @date 2025/10/10
+ */
+@Data
+public class ManagementTeacherBenchVo  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String phoneNumber;
+
+
+    /**
+     * 形象照片url
+     */
+    @ApiModelProperty("形象照片url")
+    private String photographUrl;
+
+    /**
+     * 订单总数
+     */
+    @ApiModelProperty("订单总数")
+    private Integer orderCount;
+
+    /**
+     * 今日订单数量
+     */
+    @ApiModelProperty("今日订单数量")
+    private Integer todayCount;
+
+    /**
+     * 待确认数量
+     */
+    @ApiModelProperty("待服务数量")
+    private Integer waitConfirmedCount;
+
+    /**
+     * 服务中数量
+     */
+    @ApiModelProperty("服务中数量")
+    private Integer waitRefundCount;
+
+}

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/vo/NursingWorkerBenchVo.java

@@ -0,0 +1,75 @@
+package com.ruoyi.info.nursing.domain.vo;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 护工工作台信息
+ *
+ * @author fucheng.bai
+ * @date 2025/10/10
+ */
+@Data
+@ApiModel("护工工作台信息")
+public class NursingWorkerBenchVo implements Serializable  {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String phoneNumber;
+
+    /**
+     * 接单状态 0-正常 1-关闭
+     */
+    @ApiModelProperty("接单状态")
+    private String orderReceivingStatus;
+
+    /**
+     * 形象照片url
+     */
+    @ApiModelProperty("形象照片url")
+    private String photographUrl;
+
+    /**
+     * 护工订单总数
+     */
+    @ApiModelProperty("护工订单总数")
+    private Integer orderCount;
+
+    /**
+     * 今日订单数量
+     */
+    @ApiModelProperty("护工今日订单数量")
+    private Integer todayCount;
+
+    /**
+     * 待服务数量
+     */
+    @ApiModelProperty("待服务数量")
+    private Integer waitServiceCount;
+
+    /**
+     * 退款/售后数量
+     */
+    @ApiModelProperty("退款/售后数量")
+    private Integer inServiceCount;
+}

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/domain/bo/OrderCountBo.java

@@ -0,0 +1,80 @@
+package com.ruoyi.info.order.domain.bo;
+
+import java.util.Collection;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author fucheng.bai
+ * @date 2025/10/10
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderCountBo {
+
+    /**
+     * 护工id
+     */
+    private Long workerId;
+
+    /**
+     * 订单状态
+     */
+    private Integer status;
+
+    /**
+     * 科室id
+     */
+    private Long hospitalDepartmentId;
+
+    /**
+     * 科室id列表
+     */
+    private Collection<Long> departmentIds;
+
+    /**
+     * 创建时间起始时间
+     */
+    private Date startTime;
+
+    /**
+     * 创建时间结束时间
+     */
+    private Date endTime;
+
+
+    public OrderCountBo(Long workerId) {
+        this.workerId = workerId;
+    }
+
+    public OrderCountBo(Long workerId, Integer status) {
+        this.workerId = workerId;
+        this.status = status;
+    }
+
+    public OrderCountBo(Long workerId, Date startTime, Date endTime) {
+        this.workerId = workerId;
+        this.startTime = startTime;
+        this.endTime = endTime;
+    }
+
+    public OrderCountBo(Collection<Long> departmentIds) {
+        this.departmentIds = departmentIds;
+    }
+
+    public OrderCountBo(Collection<Long> departmentIds, Date startTime, Date endTime) {
+        this.departmentIds = departmentIds;
+        this.startTime = startTime;
+        this.endTime = endTime;
+    }
+
+    public OrderCountBo(Collection<Long> departmentIds, Integer status) {
+        this.departmentIds = departmentIds;
+        this.status = status;
+
+    }
+}

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/domain/bo/OrderRefundCountBo.java

@@ -0,0 +1,27 @@
+package com.ruoyi.info.order.domain.bo;
+
+import java.util.Collection;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author fucheng.bai
+ * @date 2025/10/10
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderRefundCountBo {
+
+    /**
+     * 科室id列表
+     */
+    private Collection<Long> departmentIds;
+
+    /**
+     * 订单状态
+     */
+    private Integer status;
+}

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/mapper/OrderMapper.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.info.hospital.domain.vo.HospitalStatisticsVo;
 import com.ruoyi.info.order.domain.Order;
 import com.ruoyi.info.order.domain.bo.OrderBo;
+import com.ruoyi.info.order.domain.bo.OrderCountBo;
 import com.ruoyi.info.order.domain.vo.OrderVo;
 import com.ruoyi.info.order.domain.vo.OrderWorkerSumVo;
 
@@ -27,4 +28,6 @@ public interface OrderMapper extends BaseMapperPlus<OrderMapper, Order, OrderVo>
     List<HospitalStatisticsVo> queryHospitalOrderStatistics();
 
     List<OrderWorkerSumVo> selectOrderWorkerSum();
+
+    Integer selectOrderCount(@Param("bo") OrderCountBo orderCountBo);
 }

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/mapper/OrderRefundMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.info.order.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.info.order.domain.OrderRefund;
 import com.ruoyi.info.order.domain.bo.OrderRefundBo;
+import com.ruoyi.info.order.domain.bo.OrderRefundCountBo;
 import com.ruoyi.info.order.domain.vo.OrderRefundVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,6 @@ public interface OrderRefundMapper extends BaseMapperPlus<OrderRefundMapper, Ord
     Page<OrderRefundVo> selectListPage(@Param("page") Page<Object> build, @Param("bo") OrderRefundBo bo);
 
     List<OrderRefundVo> selectOrderRefundList(@Param("bo") OrderRefundBo bo);
+
+    Integer selectOrderRefundCount(@Param("bo") OrderRefundCountBo bo);
 }

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/service/IOrderRefundService.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.info.order.domain.OrderRefund;
 import com.ruoyi.info.order.domain.bo.OrderRefundBo;
+import com.ruoyi.info.order.domain.bo.OrderRefundCountBo;
 import com.ruoyi.info.order.domain.vo.OrderRefundVo;
 
 import java.util.Collection;
@@ -76,6 +77,14 @@ public interface IOrderRefundService {
 
     boolean cancel(Long id);
 
+    /**
+     * 根据科室id列表统计售后订单
+     *
+     * @param bo
+     * @return
+     */
+    Integer queryOrderRefundCount(OrderRefundCountBo bo);
+
     boolean hasRefund(Long id);
 
     boolean agreeOrRefuse(OrderRefundBo bo);

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/service/IOrderService.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.info.hospital.domain.vo.HospitalStatisticsVo;
 import com.ruoyi.info.order.domain.Order;
 import com.ruoyi.info.order.domain.bo.OrderBo;
+import com.ruoyi.info.order.domain.bo.OrderCountBo;
 import com.ruoyi.info.order.domain.bo.OrderReviewsBo;
 import com.ruoyi.info.order.domain.vo.OrderVo;
 import com.ruoyi.info.order.domain.vo.OrderWorkerSumVo;
@@ -102,5 +103,7 @@ public interface IOrderService {
 
     List<OrderWorkerSumVo> getOrderWorkerSum();
 
+    Integer queryOrderCount(OrderCountBo orderCountBo);
+
     OrderVo convertAllVo(OrderVo vo, boolean queryPatient);
 }

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

@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.info.order.domain.Order;
 import com.ruoyi.info.order.domain.OrderRefund;
 import com.ruoyi.info.order.domain.bo.OrderRefundBo;
+import com.ruoyi.info.order.domain.bo.OrderRefundCountBo;
 import com.ruoyi.info.order.domain.vo.OrderRefundVo;
 import com.ruoyi.info.order.enums.OrderStatus;
 import com.ruoyi.info.order.enums.RefundStatus;
@@ -197,6 +198,12 @@ public class OrderRefundServiceImpl implements IOrderRefundService {
         return baseMapper.updateById(orderRefund) > 0;
     }
 
+    @Override
+    public Integer queryOrderRefundCount(OrderRefundCountBo bo) {
+
+        return baseMapper.selectOrderRefundCount(bo);
+    }
+
     @Override
     public boolean hasRefund(Long id) {
         return baseMapper.selectCount(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getOrderId, id)) > 0;

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

@@ -28,6 +28,7 @@ import com.ruoyi.info.nursing.domain.vo.NursingWorkerVo;
 import com.ruoyi.info.nursing.service.INursingWorkerService;
 import com.ruoyi.info.order.domain.Order;
 import com.ruoyi.info.order.domain.bo.OrderBo;
+import com.ruoyi.info.order.domain.bo.OrderCountBo;
 import com.ruoyi.info.order.domain.bo.OrderReviewsBo;
 import com.ruoyi.info.order.domain.bo.OrderWorkerChangeRecordBo;
 import com.ruoyi.info.order.domain.vo.OrderReviewsVo;
@@ -463,6 +464,12 @@ public class OrderServiceImpl implements IOrderService {
         return baseMapper.selectOrderWorkerSum();
     }
 
+
+    @Override
+    public Integer queryOrderCount(OrderCountBo orderCountBo) {
+        return baseMapper.selectOrderCount(orderCountBo);
+    }
+
     @Override
     public OrderVo convertAllVo(OrderVo vo, boolean queryPatient) {
         HospitalVo hospitalVo = JSONObject.parseObject(vo.getHospitalInfo(), HospitalVo.class);
@@ -496,6 +503,4 @@ public class OrderServiceImpl implements IOrderService {
     private List<OrderVo> convertAllList(List<OrderVo> list, boolean queryPatient) {
         return list.stream().map(o -> convertAllVo(o, queryPatient)).collect(Collectors.toList());
     }
-
-
 }

ruoyi-info/ruoyi-info-biz/src/main/resources/mapper/order/OrderMapper.xml

@@ -60,6 +60,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by o.worker_id
     </select>
 
+
+    <select id="selectOrderCount" resultType="java.lang.Integer">
+        select count(0) from tb_order
+        <where>
+            <if test="bo.workerId != null">
+                and worker_id = #{bo.workerId}
+            </if>
+            <if test="bo.status != null">
+                and status = #{bo.status}
+            </if>
+            <if test="bo.hospitalDepartmentId != null">
+                and hospital_department_id = #{bo.hospitalDepartmentId}
+            </if>
+            <if test="bo.startTime != null">
+                and <![CDATA[ create_time >= #{bo.startTime} ]]>
+            </if>
+            <if test="bo.endTime != null">
+                and <![CDATA[ create_time <= #{bo.endTime} ]]>
+            </if>
+            <if test="bo.departmentIds != null and bo.departmentIds.size > 0">
+                and hospital_department_id in
+                <foreach item="item" collection="bo.departmentIds" separator="," open="(" close=")" index="">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+
     <sql id="queryList">
         select o.*, u.nickname as userName, u.mobile as userMobile from tb_order o
         left join tb_user u on u.id = o.user_id

ruoyi-info/ruoyi-info-biz/src/main/resources/mapper/order/OrderRefundMapper.xml

@@ -84,4 +84,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="queryByWhere"/>
     </select>
 
+    <select id="selectOrderRefundCount" resultType="java.lang.Integer">
+        select count(0) from tb_order_refund tor left join tb_order o on tor.order_id = o.id
+        <where>
+            <if test="bo.departmentIds != null and bo.departmentIds.size > 0">
+                and o.hospital_department_id in
+                <foreach item="item" collection="bo.departmentIds" separator="," open="(" close=")" index="">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="bo.status != null">
+                and tor.refund_status = #{bo.status}
+            </if>
+        </where>
+    </select>
 </mapper>

ruoyi-user/src/main/java/com/ruoyi/user/domain/User.java

@@ -1,21 +1,13 @@
 package com.ruoyi.user.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.common.core.domain.model.UserExtendInfo;
-import com.ruoyi.common.filepathsplicing.FilePathValue;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
 import java.util.Date;
-import java.math.BigDecimal;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
 
 /**
  * 小程序用户管理对象 tb_user
@@ -97,12 +89,6 @@ public class User  {
      */
     private Date createDay;
 
-    /**
-     * 小程序用户扩展信息
-     */
-    @TableField(exist = false)
-    private UserExtendInfo userExtendInfo;
-
     /**
      * 管理老师id
      */