fix: 估价员待办数量bug

mini-app/src/main/java/com/onsiteservice/miniapp/mapper/service/ServiceValuatorAssignBizMapper.java

@@ -2,11 +2,11 @@ package com.onsiteservice.miniapp.mapper.service;
 
 
 /**
- * @author 潘维吉
  * @date 2022-07-11 16:07
  * @description ServiceValuatorAssignBizMapper业务接口
  */
 public interface ServiceValuatorAssignBizMapper {
 
+    int getTodoNum(Long valuatorId);
 
 }

mini-app/src/main/java/com/onsiteservice/miniapp/mapper/service/ServiceValuatorBizMapper.java

@@ -6,7 +6,6 @@ import com.onsiteservice.entity.service.ServiceValuator;
 import java.util.List;
 
 /**
- * @author 潘维吉
  * @date 2022-07-11 16:07
  * @description ServiceValuatorBizMapper业务接口
  */

mini-app/src/main/java/com/onsiteservice/miniapp/mapper/service/ServiceWorkerAssignBizMapper.java

@@ -2,11 +2,9 @@ package com.onsiteservice.miniapp.mapper.service;
 
 
 /**
- * @author 潘维吉
  * @date 2022-07-11 16:07
  * @description ServiceWorkerAssignBizMapper业务接口
  */
 public interface ServiceWorkerAssignBizMapper {
 
-
 }

mini-app/src/main/java/com/onsiteservice/miniapp/service/user/UserService.java

@@ -30,6 +30,7 @@ import com.onsiteservice.miniapp.controller.user.dto.SendCodeDTO;
 import com.onsiteservice.miniapp.controller.user.vo.UserInfoVO;
 import com.onsiteservice.miniapp.controller.user.vo.UserOrderInfoVO;
 import com.onsiteservice.miniapp.mapper.order.ServiceOrderBizMapper;
+import com.onsiteservice.miniapp.mapper.service.ServiceValuatorAssignBizMapper;
 import com.onsiteservice.util.RandomUtils;
 import io.jsonwebtoken.Claims;
 import lombok.AllArgsConstructor;
@@ -59,7 +60,7 @@ public class UserService extends AbstractMapper<User> {
     private UserConvert userConvert;
     private ServiceOrderBizMapper serviceOrderBizMapper;
     private ServiceOrderMapper serviceOrderMapper;
-    private ServiceValuatorAssignMapper serviceValuatorAssignMapper;
+    private ServiceValuatorAssignBizMapper serviceValuatorAssignBizMapper;
     private CommonSmsService commonSmsService;
 
 
@@ -136,12 +137,7 @@ public class UserService extends AbstractMapper<User> {
             vo.setTodo(num);
         }
         if (Objects.equals(user.getRoleType(), ServiceUserTypeEnum.VALUATOR.getId())) {
-            Condition condition = new Condition(ServiceValuatorAssign.class);
-            condition.createCriteria().andEqualTo("valuatorId", userId)
-                    .andGreaterThan("assignTime", new Date())
-                    .andEqualTo("orderStatus", ServiceOrderStatusEnum.VALUATION.getStatus());
-            int num = serviceValuatorAssignMapper.selectCountByCondition(condition);
-            vo.setTodo(num);
+            vo.setTodo(serviceValuatorAssignBizMapper.getTodoNum(userId));
         }
         // 获取订单状况
         var numMap = serviceOrderBizMapper.getMyOrderNum(userId);

mini-app/src/main/resources/mapper/service/ServiceValuatorAssignBizMapper.xml

@@ -3,4 +3,12 @@
 <mapper namespace="com.onsiteservice.miniapp.mapper.service.ServiceValuatorAssignBizMapper">
 
 
+    <select id="getTodoNum" resultType="java.lang.Integer">
+        select count(1)
+          from service_valuator_assign t1
+          join service_order t2 on t1.order_id = t2.id
+         where t1.valuator_Id = #{valuatorId}
+           and t1.assign_time > current_timestamp
+           and t2.order_status = ${@com.onsiteservice.constant.enums.ServiceOrderStatusEnum@VALUATION.getStatus()}
+    </select>
 </mapper>