Commit f3d4a4fb authored by lining's avatar lining

fix: 代码小bug(sql漏写and,参数少写)

parent 2fc1b4b1
......@@ -54,7 +54,6 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
private UserMapper userMapper;
@Resource
private ServiceValuatorAssignMapper serviceValuatorAssignMapper;
;
public List<ServiceValuatorVO> selectByName(String name) {
......@@ -64,7 +63,7 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
userList = userMapper.selectByNameLike(name);
} else {
Condition c = new Condition(User.class);
c.createCriteria().andEqualTo(BizConstants.UserConstants.ROLE_TYPE);
c.createCriteria().andEqualTo(BizConstants.UserConstants.ROLE_TYPE, ServiceUserTypeEnum.VALUATOR.getId());
userList = userMapper.selectByCondition(c);
}
return handle(userList);
......
......@@ -29,8 +29,8 @@ public enum BizCodeEnum {
SERVICE_ORDER_CANNOT_CANCEL("订单不能取消"),
SERVICE_ORDER_CANNOT_REFUND("订单不能申请退款"),
SERVICE_ORDER_CANNOT_DISPATCH("订单未支付,不能派维修工"),
SERVICE_ORDER_TIMEOUT_CANNOT_DISPATCH("已过上门维修时间,不能派维修工"),
SERVICE_ORDER_CANNOT_REDISPATCH("订单未指派维修工,不能修改"),
SERVICE_ORDER_TIMEOUT_CANNOT_DISPATCH("已过上门维修时间,不能派维修工"),
SERVICE_ORDER_CANNOT_FINISH("订单未派单,不能完成本次服务"),
/**
......
......@@ -10,18 +10,16 @@
<if test="orderStatus != 0">
and order_status = #{orderStatus,jdbcType=INTEGER}
</if>
<choose>
<when test="roleType == 0"> <!-- 普通用户 -->
account_no = #{userId}
and account_no = #{userId}
</when>
<when test="roleType == 1"> <!-- 客服 -->
</when>
<otherwise> <!-- 估价员 -->
valuator_id = #{userId}
and valuator_id = #{userId}
</otherwise>
</choose>
<if test="month != null and month != ''">
and date_format(create_time,'%Y%m') = #{month}
</if>
......
......@@ -2,6 +2,7 @@ package com.onsiteservice.miniapp.service.worker;
import com.google.common.collect.Lists;
import com.onsiteservice.constant.constant.BizConstants;
import com.onsiteservice.constant.enums.ServiceUserTypeEnum;
import com.onsiteservice.dao.common.AbstractMapper;
import com.onsiteservice.dao.mapper.service.ServiceValuatorAssignMapper;
import com.onsiteservice.dao.mapper.user.UserMapper;
......@@ -41,7 +42,7 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
public List<ServiceValuatorVO> all() {
Condition c = new Condition(User.class);
c.createCriteria().andEqualTo(BizConstants.UserConstants.ROLE_TYPE);
c.createCriteria().andEqualTo(BizConstants.UserConstants.ROLE_TYPE, ServiceUserTypeEnum.VALUATOR.getId());
List<User> userList = userMapper.selectByCondition(c);
return handle(userList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment