Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
O
on-site-service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
external
on-site-service
Commits
f3d4a4fb
Commit
f3d4a4fb
authored
Jul 18, 2022
by
lining
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 代码小bug(sql漏写and,参数少写)
parent
2fc1b4b1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
8 deletions
+6
-8
ServiceValuatorService.java
...service/admin/service/service/ServiceValuatorService.java
+1
-2
BizCodeEnum.java
...in/java/com/onsiteservice/constant/enums/BizCodeEnum.java
+1
-1
ServiceOrderMapper.xml
dao/src/main/resources/mapper/service/ServiceOrderMapper.xml
+2
-4
ServiceValuatorService.java
...ervice/miniapp/service/worker/ServiceValuatorService.java
+2
-1
No files found.
admin/src/main/java/com/onsiteservice/admin/service/service/ServiceValuatorService.java
View file @
f3d4a4fb
...
@@ -54,7 +54,6 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
...
@@ -54,7 +54,6 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
private
UserMapper
userMapper
;
private
UserMapper
userMapper
;
@Resource
@Resource
private
ServiceValuatorAssignMapper
serviceValuatorAssignMapper
;
private
ServiceValuatorAssignMapper
serviceValuatorAssignMapper
;
;
public
List
<
ServiceValuatorVO
>
selectByName
(
String
name
)
{
public
List
<
ServiceValuatorVO
>
selectByName
(
String
name
)
{
...
@@ -64,7 +63,7 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
...
@@ -64,7 +63,7 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
userList
=
userMapper
.
selectByNameLike
(
name
);
userList
=
userMapper
.
selectByNameLike
(
name
);
}
else
{
}
else
{
Condition
c
=
new
Condition
(
User
.
class
);
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
);
userList
=
userMapper
.
selectByCondition
(
c
);
}
}
return
handle
(
userList
);
return
handle
(
userList
);
...
...
constant/src/main/java/com/onsiteservice/constant/enums/BizCodeEnum.java
View file @
f3d4a4fb
...
@@ -29,8 +29,8 @@ public enum BizCodeEnum {
...
@@ -29,8 +29,8 @@ public enum BizCodeEnum {
SERVICE_ORDER_CANNOT_CANCEL
(
"订单不能取消"
),
SERVICE_ORDER_CANNOT_CANCEL
(
"订单不能取消"
),
SERVICE_ORDER_CANNOT_REFUND
(
"订单不能申请退款"
),
SERVICE_ORDER_CANNOT_REFUND
(
"订单不能申请退款"
),
SERVICE_ORDER_CANNOT_DISPATCH
(
"订单未支付,不能派维修工"
),
SERVICE_ORDER_CANNOT_DISPATCH
(
"订单未支付,不能派维修工"
),
SERVICE_ORDER_TIMEOUT_CANNOT_DISPATCH
(
"已过上门维修时间,不能派维修工"
),
SERVICE_ORDER_CANNOT_REDISPATCH
(
"订单未指派维修工,不能修改"
),
SERVICE_ORDER_CANNOT_REDISPATCH
(
"订单未指派维修工,不能修改"
),
SERVICE_ORDER_TIMEOUT_CANNOT_DISPATCH
(
"已过上门维修时间,不能派维修工"
),
SERVICE_ORDER_CANNOT_FINISH
(
"订单未派单,不能完成本次服务"
),
SERVICE_ORDER_CANNOT_FINISH
(
"订单未派单,不能完成本次服务"
),
/**
/**
...
...
dao/src/main/resources/mapper/service/ServiceOrderMapper.xml
View file @
f3d4a4fb
...
@@ -10,18 +10,16 @@
...
@@ -10,18 +10,16 @@
<if
test=
"orderStatus != 0"
>
<if
test=
"orderStatus != 0"
>
and order_status = #{orderStatus,jdbcType=INTEGER}
and order_status = #{orderStatus,jdbcType=INTEGER}
</if>
</if>
<choose>
<choose>
<when
test=
"roleType == 0"
>
<!-- 普通用户 -->
<when
test=
"roleType == 0"
>
<!-- 普通用户 -->
account_no = #{userId}
a
nd a
ccount_no = #{userId}
</when>
</when>
<when
test=
"roleType == 1"
>
<!-- 客服 -->
<when
test=
"roleType == 1"
>
<!-- 客服 -->
</when>
</when>
<otherwise>
<!-- 估价员 -->
<otherwise>
<!-- 估价员 -->
valuator_id = #{userId}
and
valuator_id = #{userId}
</otherwise>
</otherwise>
</choose>
</choose>
<if
test=
"month != null and month != ''"
>
<if
test=
"month != null and month != ''"
>
and date_format(create_time,'%Y%m') = #{month}
and date_format(create_time,'%Y%m') = #{month}
</if>
</if>
...
...
mini-app/src/main/java/com/onsiteservice/miniapp/service/worker/ServiceValuatorService.java
View file @
f3d4a4fb
...
@@ -2,6 +2,7 @@ package com.onsiteservice.miniapp.service.worker;
...
@@ -2,6 +2,7 @@ package com.onsiteservice.miniapp.service.worker;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.onsiteservice.constant.constant.BizConstants
;
import
com.onsiteservice.constant.constant.BizConstants
;
import
com.onsiteservice.constant.enums.ServiceUserTypeEnum
;
import
com.onsiteservice.dao.common.AbstractMapper
;
import
com.onsiteservice.dao.common.AbstractMapper
;
import
com.onsiteservice.dao.mapper.service.ServiceValuatorAssignMapper
;
import
com.onsiteservice.dao.mapper.service.ServiceValuatorAssignMapper
;
import
com.onsiteservice.dao.mapper.user.UserMapper
;
import
com.onsiteservice.dao.mapper.user.UserMapper
;
...
@@ -41,7 +42,7 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
...
@@ -41,7 +42,7 @@ public class ServiceValuatorService extends AbstractMapper<ServiceValuator> {
public
List
<
ServiceValuatorVO
>
all
()
{
public
List
<
ServiceValuatorVO
>
all
()
{
Condition
c
=
new
Condition
(
User
.
class
);
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
);
List
<
User
>
userList
=
userMapper
.
selectByCondition
(
c
);
return
handle
(
userList
);
return
handle
(
userList
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment