Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
40295c8a
提交
40295c8a
authored
10月 20, 2023
作者:
liuhaiquan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改货主端结算单列表查询条件
上级
31c8e3b3
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
7 行增加
和
5 行删除
+7
-5
CarrierSettlementOwnerController.java
...ntroller/pc/carrier/CarrierSettlementOwnerController.java
+1
-1
OwnerSettlementOwnerController.java
...e/controller/pc/owner/OwnerSettlementOwnerController.java
+1
-1
SettlementOwnerDaoImpl.java
...x/performance/dao/impl/settle/SettlementOwnerDaoImpl.java
+2
-1
SettlementOwnerDao.java
...va/com/clx/performance/dao/settle/SettlementOwnerDao.java
+1
-1
SettlementOwnerServiceImpl.java
...mance/service/impl/settle/SettlementOwnerServiceImpl.java
+2
-1
没有找到文件。
performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java
浏览文件 @
40295c8a
...
...
@@ -38,7 +38,7 @@ public class CarrierSettlementOwnerController {
@ApiOperation
(
value
=
"结算单列表(货主)"
,
notes
=
"<br>By:刘海泉"
)
@ApiOperation
(
value
=
"
承运端-
结算单列表(货主)"
,
notes
=
"<br>By:刘海泉"
)
@PostMapping
(
"/pageCarrierSettlementOwner"
)
@UnitCovert
(
param
=
false
)
public
Result
<
PageData
<
CarrierPageSettlementOwnerVO
>>
pageCarrierSettlementOwner
(
@RequestBody
@Validated
PageCarrierSettlementOwnerParam
param
)
{
...
...
performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerSettlementOwnerController.java
浏览文件 @
40295c8a
...
...
@@ -96,7 +96,7 @@ public class OwnerSettlementOwnerController {
return
null
;
}
@ApiOperation
(
value
=
"
结算单列表
"
)
@ApiOperation
(
value
=
"
货主端-结算单列表"
,
notes
=
"<br>By:李瑞新
"
)
@PostMapping
(
"/pageSettlementOwner"
)
public
Result
<
PageData
<
OwnerPageSettlementOwnerVO
>>
pageSettlementOwner
(
@RequestBody
@Validated
PageOwnerSettlementParam
param
){
IPage
<
OwnerPageSettlementOwnerVO
>
page
=
settlementOwnerService
.
pageSettlementOwner
(
param
);
...
...
performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java
浏览文件 @
40295c8a
...
...
@@ -82,8 +82,9 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
}
@Override
public
IPage
<
SettlementOwner
>
pageSettlementOwner
(
PageOwnerSettlementParam
param
)
{
public
IPage
<
SettlementOwner
>
pageSettlementOwner
(
Long
userNo
,
PageOwnerSettlementParam
param
)
{
LambdaQueryWrapper
<
SettlementOwner
>
query
=
new
LambdaQueryWrapper
<>();
query
.
eq
(
SettlementOwner
::
getOwnerUserNo
,
userNo
);
if
(
Objects
.
nonNull
(
param
.
getOrderNo
())){
query
.
eq
(
SettlementOwner
::
getOrderNo
,
param
.
getOrderNo
());
}
...
...
performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java
浏览文件 @
40295c8a
...
...
@@ -24,5 +24,5 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
Optional
<
SettlementOwner
>
selectBySettlementNo
(
@Param
(
"settlementNo"
)
String
settlementNo
);
IPage
<
SettlementOwner
>
pageSettlementOwner
(
PageOwnerSettlementParam
param
);
IPage
<
SettlementOwner
>
pageSettlementOwner
(
Long
userNo
,
PageOwnerSettlementParam
param
);
}
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @
40295c8a
...
...
@@ -195,7 +195,8 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
@Override
public
IPage
<
OwnerPageSettlementOwnerVO
>
pageSettlementOwner
(
PageOwnerSettlementParam
param
)
{
IPage
<
SettlementOwner
>
page
=
settlementOwnerDao
.
pageSettlementOwner
(
param
);
Long
userNo
=
TokenUtil
.
getLoginUserInfo
().
getUserNo
();
IPage
<
SettlementOwner
>
page
=
settlementOwnerDao
.
pageSettlementOwner
(
userNo
,
param
);
List
<
OwnerPageSettlementOwnerVO
>
list
=
settlementOwnerStruct
.
convertOwnerList
(
page
.
getRecords
());
IPage
<
OwnerPageSettlementOwnerVO
>
result
=
new
Page
().
setRecords
(
list
).
setTotal
(
page
.
getTotal
()).
setPages
(
page
.
getPages
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论