Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
ed5e86f8
提交
ed5e86f8
authored
10月 25, 2023
作者:
liruixin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
车主违约结算单列表导出
上级
58ac1525
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
155 行增加
和
107 行删除
+155
-107
PageCarrierBreakContractSettlementDriverParam.java
...arrier/PageCarrierBreakContractSettlementDriverParam.java
+32
-0
CarrierOrderChildDetailVO.java
...o/pc/breakcontract/carrier/CarrierOrderChildDetailVO.java
+0
-107
PageCarrierBreakContractSettlementDriverVO.java
...t/carrier/PageCarrierBreakContractSettlementDriverVO.java
+65
-0
CarrierBreakContractSettlementDriverController.java
...rrier/CarrierBreakContractSettlementDriverController.java
+55
-0
BreakContractSettlementDriverDetailDaoImpl.java
...kcontract/BreakContractSettlementDriverDetailDaoImpl.java
+2
-0
BreakContractSettlementOwnerDetailDaoImpl.java
...akcontract/BreakContractSettlementOwnerDetailDaoImpl.java
+1
-0
没有找到文件。
performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverParam.java
0 → 100644
浏览文件 @
ed5e86f8
package
com
.
clx
.
performance
.
param
.
pc
.
breakcontract
.
carrier
;
import
com.msl.common.base.PageParam
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
@Setter
@Getter
@ToString
@NoArgsConstructor
public
class
PageCarrierBreakContractSettlementDriverParam
extends
PageParam
{
@ApiModelProperty
(
value
=
"运单编号"
,
example
=
"201457878"
)
private
String
childNo
;
@ApiModelProperty
(
value
=
"车主编号"
,
example
=
"201457878"
)
private
Long
truckOwnUserNo
;
@ApiModelProperty
(
value
=
"违约方类型:1平台 2货主 3车主"
,
example
=
"1"
)
private
Integer
breachContractPartyType
;
@ApiModelProperty
(
value
=
"开始时间"
,
example
=
"2012-01-01 00:00:00"
)
private
String
beginTime
;
@ApiModelProperty
(
value
=
"结束时间"
,
example
=
"2012-01-01 00:00:00"
)
private
String
endTime
;
}
performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/CarrierOrderChildDetailVO.java
deleted
100644 → 0
浏览文件 @
58ac1525
package
com
.
clx
.
performance
.
vo
.
pc
.
breakcontract
.
carrier
;
import
com.clx.performance.vo.pc.OrderChildLogVO
;
import
com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO
;
import
com.msl.common.convertor.type.MoneyOutConvert
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
import
java.math.BigDecimal
;
import
java.util.List
;
@ApiModel
(
description
=
"运单表"
)
@Getter
@Setter
@ToString
@NoArgsConstructor
public
class
CarrierOrderChildDetailVO
{
@ApiModelProperty
(
value
=
"运单编号"
,
example
=
"100000000"
)
private
String
childNo
;
@ApiModelProperty
(
value
=
"货单编号"
,
example
=
"100000000"
)
private
String
orderGoodsNo
;
@ApiModelProperty
(
value
=
"货物名称"
,
example
=
"煤"
)
private
String
goodsName
;
@ApiModelProperty
(
value
=
"运费单价(元)"
,
example
=
"1.23"
)
@MoneyOutConvert
private
BigDecimal
freightPrice
;
@ApiModelProperty
(
value
=
"应付运费(元)"
,
example
=
"1.23"
)
@MoneyOutConvert
private
BigDecimal
payableFreight
;
@ApiModelProperty
(
value
=
"亏吨扣款(元)"
,
example
=
"1.23"
)
@MoneyOutConvert
private
BigDecimal
lossDeduction
;
@ApiModelProperty
(
value
=
"实付运费(元)"
,
example
=
"1.23"
)
@MoneyOutConvert
private
BigDecimal
realFreight
;
@ApiModelProperty
(
value
=
"损耗单价(元)"
,
example
=
"1.23"
)
@MoneyOutConvert
private
BigDecimal
lossPrice
;
@ApiModelProperty
(
value
=
"订单运费单价(元)"
,
example
=
"1.23"
)
@MoneyOutConvert
private
BigDecimal
orderFreightPrice
;
@ApiModelProperty
(
"货物重量"
)
private
BigDecimal
extractWeight
;
@ApiModelProperty
(
value
=
"发货地址"
,
example
=
"朝阳"
)
private
String
sendAddress
;
@ApiModelProperty
(
value
=
"收货地址"
,
example
=
"西城"
)
private
String
receiveAddress
;
@ApiModelProperty
(
value
=
"车牌号"
,
example
=
"京A12345"
)
private
String
truckNo
;
@ApiModelProperty
(
value
=
"司机姓名"
,
example
=
"张三"
)
private
String
driverName
;
@ApiModelProperty
(
value
=
"司机手机号"
,
example
=
"130000000"
)
private
String
driverMobile
;
@ApiModelProperty
(
value
=
"装货净重(单位吨)"
,
example
=
"1.23"
)
private
BigDecimal
loadNet
;
@ApiModelProperty
(
value
=
"卸货净重(单位吨)"
,
example
=
"1.23"
)
private
BigDecimal
unloadNet
;
@ApiModelProperty
(
value
=
"取消原因"
,
example
=
"抢错了"
)
private
String
cancelRemark
;
@ApiModelProperty
(
value
=
"状态"
,
example
=
"0"
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"装车磅单图片列表"
)
private
List
<
String
>
loadImageList
;
@ApiModelProperty
(
value
=
"卸车磅单图片列表"
)
private
List
<
String
>
unloadImageList
;
@ApiModelProperty
(
value
=
"流程节点"
)
private
List
<
OrderChildLogVO
>
childLogs
;
@ApiModelProperty
(
value
=
"磅单审核列表"
)
private
List
<
OrderChildPoundAuditDetailVO
>
poundAudits
;
@ApiModelProperty
(
value
=
"完成时间"
,
example
=
"2020-01-01 10:10:10"
)
private
String
finishTime
;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverVO.java
0 → 100644
浏览文件 @
ed5e86f8
package
com
.
clx
.
performance
.
vo
.
pc
.
breakcontract
.
carrier
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
import
java.math.BigDecimal
;
@Getter
@Setter
@ToString
@NoArgsConstructor
public
class
PageCarrierBreakContractSettlementDriverVO
{
@ApiModelProperty
(
"违约方类型:1平台 2货主 3车主"
)
private
Integer
breachContractPartyType
;
@ApiModelProperty
(
"违约方类型Msg:1平台 2货主 3车主"
)
private
String
breachContractPartyTypeMsg
;
@ApiModelProperty
(
"结算单编号"
)
private
String
settlementNo
;
@ApiModelProperty
(
"车主用户编号"
)
private
Long
truckOwnUserNo
;
@ApiModelProperty
(
"司机名称"
)
private
String
driverName
;
@ApiModelProperty
(
"运单编号"
)
private
String
childNo
;
@ApiModelProperty
(
"违约金(分)"
)
private
BigDecimal
figure
;
@ApiModelProperty
(
"违约说明"
)
private
String
breakContractRemark
;
@ApiModelProperty
(
"结算状态 0待结算;1已结算"
)
private
String
settleStatusMsg
;
@ApiModelProperty
(
"结算状态 0待结算;1已结算"
)
private
Integer
settleStatusCode
;
@ApiModelProperty
(
"结算平台 0马上来"
)
private
String
settlePlatformMsg
;
@ApiModelProperty
(
"结算平台 0马上来"
)
private
Integer
settlePlatformCode
;
@ApiModelProperty
(
"结算时间"
)
private
String
settleTime
;
@ApiModelProperty
(
"操作人名称"
)
private
String
createName
;
@ApiModelProperty
(
"创建时间"
)
private
String
createTime
;
}
\ No newline at end of file
performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractSettlementDriverController.java
0 → 100644
浏览文件 @
ed5e86f8
package
com
.
clx
.
performance
.
controller
.
pc
.
breakcontract
.
carrier
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverDetailParam
;
import
com.clx.performance.service.breakcontract.BreakContractSettlementDriverDetailService
;
import
com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverDetailVO
;
import
com.msl.common.base.PageData
;
import
com.msl.common.convertor.aspect.UnitCovert
;
import
com.msl.common.result.Result
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.poi.xssf.streaming.SXSSFWorkbook
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.MediaType
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.servlet.http.HttpServletResponse
;
@Slf4j
@RestController
@RequestMapping
(
value
=
"/pc/carrier/breakContract"
)
@Validated
@Api
(
tags
=
"承运端-违约结算单(车主)"
)
@AllArgsConstructor
public
class
CarrierBreakContractSettlementDriverController
{
private
final
BreakContractSettlementDriverDetailService
breakContractSettlementDriverDetailService
;
@ApiOperation
(
value
=
"列表"
,
notes
=
"<br>By:李瑞新"
)
@PostMapping
(
"/pageCarrierBreakContractSettlementDriverDetailList"
)
@UnitCovert
(
param
=
false
)
public
Result
<
PageData
<
PageCarrierBreakContractSettlementDriverDetailVO
>>
pageCarrierBreakContractSettlementDriverDetailList
(
@RequestBody
PageCarrierBreakContractSettlementDriverDetailParam
param
)
{
IPage
<
PageCarrierBreakContractSettlementDriverDetailVO
>
page
=
breakContractSettlementDriverDetailService
.
pageCarrierBreakContractSettlementDriverDetailList
(
param
);
return
Result
.
page
(
page
.
getRecords
(),
page
.
getTotal
(),
page
.
getPages
());
}
@ApiOperation
(
value
=
"导出"
)
@PostMapping
(
"/exportCarrierBreakContractSettlementDriverDetailList"
)
public
Result
exportCarrierBreakContractSettlementDriverDetailList
(
@RequestBody
PageCarrierBreakContractSettlementDriverDetailParam
param
,
HttpServletResponse
response
)
throws
Exception
{
SXSSFWorkbook
workbook
=
breakContractSettlementDriverDetailService
.
exportCarrierBreakContractSettlementDriverDetailList
(
param
);
response
.
setHeader
(
HttpHeaders
.
CONTENT_TYPE
,
MediaType
.
APPLICATION_OCTET_STREAM_VALUE
);
workbook
.
write
(
response
.
getOutputStream
());
return
null
;
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementDriverDetailDaoImpl.java
浏览文件 @
ed5e86f8
...
...
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDetailDao
;
import
com.clx.performance.mapper.breakcontract.BreakContractSettlementDriverDetailMapper
;
import
com.clx.performance.model.breakcontract.BreakContractSettlementDriverDetail
;
import
com.clx.performance.model.breakcontract.BreakContractSettlementOwnerDetail
;
import
com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverDetailParam
;
import
com.msl.common.dao.impl.BaseDaoImpl
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -28,6 +29,7 @@ public class BreakContractSettlementDriverDetailDaoImpl extends BaseDaoImpl<Brea
query
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getChildNo
()),
BreakContractSettlementDriverDetail
::
getChildNo
,
param
.
getChildNo
());
query
.
eq
(
Objects
.
nonNull
(
param
.
getTruckOwnUserNo
()),
BreakContractSettlementDriverDetail
::
getTruckOwnUserNo
,
param
.
getTruckOwnUserNo
());
query
.
eq
(
Objects
.
nonNull
(
param
.
getBreachContractPartyType
()),
BreakContractSettlementDriverDetail
::
getBreachContractPartyType
,
param
.
getBreachContractPartyType
());
query
.
orderByDesc
(
BreakContractSettlementDriverDetail:
:
getId
);
return
baseMapper
.
selectPage
(
Page
.
of
(
param
.
getPage
(),
param
.
getPageSize
()),
query
);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDetailDaoImpl.java
浏览文件 @
ed5e86f8
...
...
@@ -27,6 +27,7 @@ public class BreakContractSettlementOwnerDetailDaoImpl extends BaseDaoImpl<Break
query
.
eq
(
StringUtils
.
isNotBlank
(
param
.
getOrderNo
()),
BreakContractSettlementOwnerDetail
::
getOrderNo
,
param
.
getOrderNo
());
query
.
eq
(
Objects
.
nonNull
(
param
.
getOwnerUserNo
()),
BreakContractSettlementOwnerDetail
::
getOwnerUserNo
,
param
.
getOwnerUserNo
());
query
.
eq
(
Objects
.
nonNull
(
param
.
getBreachContractPartyType
()),
BreakContractSettlementOwnerDetail
::
getBreachContractPartyType
,
param
.
getBreachContractPartyType
());
query
.
orderByDesc
(
BreakContractSettlementOwnerDetail:
:
getId
);
return
baseMapper
.
selectPage
(
Page
.
of
(
param
.
getPage
(),
param
.
getPageSize
()),
query
);
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论