feat: 估价员的todo数查询

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

@@ -12,8 +12,11 @@ import com.onsiteservice.core.result.Result;
 import com.onsiteservice.core.result.ResultGenerator;
 import com.onsiteservice.dao.common.AbstractMapper;
 import com.onsiteservice.dao.mapper.service.ServiceOrderMapper;
+import com.onsiteservice.dao.mapper.service.ServiceValuatorAssignMapper;
+import com.onsiteservice.dao.mapper.service.ServiceWorkerAssignMapper;
 import com.onsiteservice.dao.mapper.user.UserMapper;
 import com.onsiteservice.entity.order.ServiceOrder;
+import com.onsiteservice.entity.service.ServiceValuatorAssign;
 import com.onsiteservice.entity.user.User;
 import com.onsiteservice.miniapp.controller.user.convert.UserConvert;
 import com.onsiteservice.miniapp.controller.user.dto.BindPhoneDTO;
@@ -22,6 +25,7 @@ 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.util.RandomUtils;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Condition;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -38,20 +43,15 @@ import java.util.concurrent.TimeUnit;
 @Service
 @Slf4j
 @Transactional(rollbackFor = Exception.class)
+@AllArgsConstructor(onConstructor_ = {@Autowired})
 public class UserService extends AbstractMapper<User> {
 
-
-    @Autowired
     private StringRedisTemplate redisTemplate;
-
-    @Resource
     private UserMapper userMapper;
-    @Resource
     private UserConvert userConvert;
-    @Resource
     private ServiceOrderBizMapper serviceOrderBizMapper;
-    @Resource
     private ServiceOrderMapper serviceOrderMapper;
+    private ServiceValuatorAssignMapper serviceValuatorAssignMapper;
 
 
     public Result<String> sendCode(SendCodeDTO dto) {
@@ -126,6 +126,13 @@ public class UserService extends AbstractMapper<User> {
             int num = serviceOrderMapper.selectCountByCondition(condition);
             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());
+            int num = serviceValuatorAssignMapper.selectCountByCondition(condition);
+            vo.setTodo(num);
+        }
         // 获取订单状况
         var numMap = serviceOrderBizMapper.getMyOrderNum(userId);
         vo.setOrderInfo(List.of(