Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
d1b469e5
You need to sign in or sign up before continuing.
Commit
d1b469e5
authored
Aug 31, 2022
by
李灿灿
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单列表加指派人权限
parent
163c6c25
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
7 deletions
+13
-7
TOrderMapper.java
...om/yifu/cloud/plus/v1/yifu/order/mapper/TOrderMapper.java
+4
-2
TOrderServiceImpl.java
...ud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
+4
-2
TOrderMapper.xml
...yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
+5
-3
No files found.
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/mapper/TOrderMapper.java
View file @
d1b469e5
...
@@ -28,9 +28,10 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
...
@@ -28,9 +28,10 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
* @author licancan
* @author licancan
* @param page
* @param page
* @param param
* @param param
* @param userName
* @return {@link IPage<OrderListVO>}
* @return {@link IPage<OrderListVO>}
*/
*/
IPage
<
OrderListVO
>
getOrderPageList
(
Page
<
OrderListParam
>
page
,
@Param
(
"param"
)
OrderListParam
param
);
IPage
<
OrderListVO
>
getOrderPageList
(
Page
<
OrderListParam
>
page
,
@Param
(
"param"
)
OrderListParam
param
,
@Param
(
"userName"
)
String
userName
);
/**
/**
* 导出勾选查询结果
* 导出勾选查询结果
...
@@ -46,9 +47,10 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
...
@@ -46,9 +47,10 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
*
*
* @author licancan
* @author licancan
* @param param
* @param param
* @param userName
* @return {@link List< OrderListVO>}
* @return {@link List< OrderListVO>}
*/
*/
List
<
OrderListVO
>
getOrderList
(
@Param
(
"param"
)
OrderListParam
param
);
List
<
OrderListVO
>
getOrderList
(
@Param
(
"param"
)
OrderListParam
param
,
@Param
(
"userName"
)
String
userName
);
/**
/**
* 通过id查询详情
* 通过id查询详情
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @
d1b469e5
...
@@ -67,7 +67,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
...
@@ -67,7 +67,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
*/
*/
@Override
@Override
public
IPage
<
OrderListVO
>
getOrderPageList
(
Page
<
OrderListParam
>
page
,
OrderListParam
param
)
{
public
IPage
<
OrderListVO
>
getOrderPageList
(
Page
<
OrderListParam
>
page
,
OrderListParam
param
)
{
IPage
<
OrderListVO
>
orderList
=
baseMapper
.
getOrderPageList
(
page
,
param
);
YifuUser
user
=
SecurityUtils
.
getUser
();
IPage
<
OrderListVO
>
orderList
=
baseMapper
.
getOrderPageList
(
page
,
param
,
user
.
getUsername
());
return
orderList
;
return
orderList
;
}
}
...
@@ -80,11 +81,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
...
@@ -80,11 +81,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
*/
*/
@Override
@Override
public
List
<
OrderListVO
>
getOrderList
(
OrderListParam
param
)
{
public
List
<
OrderListVO
>
getOrderList
(
OrderListParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
List
<
OrderListVO
>
list
;
List
<
OrderListVO
>
list
;
if
(
CollectionUtils
.
isNotEmpty
(
param
.
getIdList
())){
if
(
CollectionUtils
.
isNotEmpty
(
param
.
getIdList
())){
list
=
baseMapper
.
getOrderListBySelect
(
param
.
getIdList
());
list
=
baseMapper
.
getOrderListBySelect
(
param
.
getIdList
());
}
else
{
}
else
{
list
=
baseMapper
.
getOrderList
(
param
);
list
=
baseMapper
.
getOrderList
(
param
,
user
.
getUsername
()
);
}
}
return
list
;
return
list
;
}
}
...
...
yifu-order/yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
View file @
d1b469e5
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
t.ORDER_STATUS as orderStatus
t.ORDER_STATUS as orderStatus
from t_order t
from t_order t
where t.DELETE_FLAG = 0
where t.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = t.ORDER_NO)
<if
test=
"param.orderNo != null and param.orderNo.trim() != ''"
>
<if
test=
"param.orderNo != null and param.orderNo.trim() != ''"
>
and t.ORDER_NO = #{param.orderNo}
and t.ORDER_NO = #{param.orderNo}
</if>
</if>
...
@@ -60,7 +61,7 @@
...
@@ -60,7 +61,7 @@
<if
test=
"param.orderStatus != null"
>
<if
test=
"param.orderStatus != null"
>
and t.ORDER_STATUS = #{param.orderStatus}
and t.ORDER_STATUS = #{param.orderStatus}
</if>
</if>
ORDER BY t.
ORDER_STATUS,t.
CREATE_TIME DESC
ORDER BY t.CREATE_TIME DESC
</select>
</select>
<select
id=
"getOrderListBySelect"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO"
>
<select
id=
"getOrderListBySelect"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO"
>
...
@@ -77,7 +78,7 @@
...
@@ -77,7 +78,7 @@
<foreach
collection=
"idList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
<foreach
collection=
"idList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
#{item}
</foreach>
</foreach>
ORDER BY t.
ORDER_STATUS,t.
CREATE_TIME DESC
ORDER BY t.CREATE_TIME DESC
</select>
</select>
<select
id=
"getOrderList"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO"
>
<select
id=
"getOrderList"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO"
>
...
@@ -91,6 +92,7 @@
...
@@ -91,6 +92,7 @@
t.ORDER_STATUS as orderStatus
t.ORDER_STATUS as orderStatus
from t_order t
from t_order t
where t.DELETE_FLAG = 0
where t.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = t.ORDER_NO)
<if
test=
"param.orderNo != null and param.orderNo.trim() != ''"
>
<if
test=
"param.orderNo != null and param.orderNo.trim() != ''"
>
and t.ORDER_NO = #{param.orderNo}
and t.ORDER_NO = #{param.orderNo}
</if>
</if>
...
@@ -112,7 +114,7 @@
...
@@ -112,7 +114,7 @@
<if
test=
"param.orderStatus != null"
>
<if
test=
"param.orderStatus != null"
>
and t.ORDER_STATUS = #{param.orderStatus}
and t.ORDER_STATUS = #{param.orderStatus}
</if>
</if>
ORDER BY t.
ORDER_STATUS,t.
CREATE_TIME DESC
ORDER BY t.CREATE_TIME DESC
</select>
</select>
<select
id=
"getOrderDetailById"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderDetailVO"
>
<select
id=
"getOrderDetailById"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderDetailVO"
>
...
...
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