Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-api-boot-master
Commits
9185e70e
Commit
9185e70e
authored
Mar 06, 2025
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量订单费用申请查询列表补充返回值
parent
27bb0b70
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
86 additions
and
10 deletions
+86
-10
BatchOrderFeeApplyMapper.java
...al/mysql/batchOrderFeeApply/BatchOrderFeeApplyMapper.java
+5
-0
BatchOrderFeeApplyService.java
...service/batchOrderFeeApply/BatchOrderFeeApplyService.java
+1
-1
BatchOrderFeeApplyServiceImpl.java
...ice/batchOrderFeeApply/BatchOrderFeeApplyServiceImpl.java
+12
-2
BatchOrderFeeApplyBackVO.java
...order/vo/batchOrderFeeApply/BatchOrderFeeApplyBackVO.java
+19
-5
BatchOrderFeeApplyQueryVO.java
...rder/vo/batchOrderFeeApply/BatchOrderFeeApplyQueryVO.java
+3
-0
BatchOrderFeeApply.xml
...esources/mapper/batchOrderFeeApply/BatchOrderFeeApply.xml
+44
-0
BatchOrderFeeApplyController.java
...dmin/batchOrderFeeApply/BatchOrderFeeApplyController.java
+2
-2
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/batchOrderFeeApply/BatchOrderFeeApplyMapper.java
View file @
9185e70e
...
...
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.order.dal.dataobject.batchOrderFeeApply.BatchOrde
import
cn.iocoder.yudao.framework.mybatis.core.vo.PageVO
;
import
org.apache.ibatis.annotations.Mapper
;
import
cn.iocoder.yudao.module.order.vo.batchOrderFeeApply.*
;
import
org.apache.ibatis.annotations.Param
;
/**
* 批量费用申请 Mapper
...
...
@@ -46,4 +47,8 @@ public interface BatchOrderFeeApplyMapper extends AbstractMapper<BatchOrderFeeAp
return
null
;
}
long
batchOrderFeeApplyCount
(
@Param
(
"query"
)
BatchOrderFeeApplyQueryVO
query
);
List
<
BatchOrderFeeApplyBackVO
>
batchOrderFeeApplyList
(
@Param
(
"start"
)
int
start
,
@Param
(
"size"
)
int
size
,
@Param
(
"query"
)
BatchOrderFeeApplyQueryVO
query
);
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyService.java
View file @
9185e70e
...
...
@@ -45,7 +45,7 @@ public interface BatchOrderFeeApplyService extends IService<BatchOrderFeeApplyDO
* @param query 查询
* @return 批量费用申请分页
*/
PageResult
<
BatchOrderFeeApply
D
O
>
getBatchOrderFeeApplyPage
(
BatchOrderFeeApplyQueryVO
query
,
PageVO
page
);
PageResult
<
BatchOrderFeeApply
BackV
O
>
getBatchOrderFeeApplyPage
(
BatchOrderFeeApplyQueryVO
query
,
PageVO
page
);
/**
* 获得批量费用申请列表, 用于 Excel 导出
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyServiceImpl.java
View file @
9185e70e
...
...
@@ -14,6 +14,8 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import
cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO
;
import
cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils
;
import
cn.iocoder.yudao.framework.http.util.StrUtils
;
import
cn.iocoder.yudao.framework.i18n.core.I18nMessage
;
import
cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils
;
import
cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils
;
import
cn.iocoder.yudao.module.bpm.api.BpmCreateServiceFactory
;
import
cn.iocoder.yudao.module.bpm.enums.WorkFlowEmus
;
...
...
@@ -26,9 +28,11 @@ import cn.iocoder.yudao.module.order.service.order.OrderFeeApplicationService;
import
cn.iocoder.yudao.module.order.service.order.OrderQueryService
;
import
cn.iocoder.yudao.module.order.service.order.OrderService
;
import
cn.iocoder.yudao.module.order.vo.order.ApplyInfoVO
;
import
cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO
;
import
cn.iocoder.yudao.module.order.vo.orderFeeApplication.OrderFeeApplicationCreateReqVO
;
import
cn.iocoder.yudao.module.system.enums.DictTypeConstants
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.stereotype.Service
;
...
...
@@ -171,8 +175,14 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
}
@Override
public
PageResult
<
BatchOrderFeeApplyDO
>
getBatchOrderFeeApplyPage
(
BatchOrderFeeApplyQueryVO
query
,
PageVO
page
)
{
return
batchOrderFeeApplyMapper
.
selectPage
(
page
,
query
);
public
PageResult
<
BatchOrderFeeApplyBackVO
>
getBatchOrderFeeApplyPage
(
BatchOrderFeeApplyQueryVO
query
,
PageVO
page
)
{
IPage
<
BatchOrderFeeApplyBackVO
>
mpPage
=
MyBatisUtils
.
buildPage
(
page
);
long
total
=
batchOrderFeeApplyMapper
.
batchOrderFeeApplyCount
(
query
);
int
start
=
(
page
.
getPage
()
-
1
)
*
page
.
getRows
();
int
size
=
page
.
getRows
();
List
<
BatchOrderFeeApplyBackVO
>
list
=
batchOrderFeeApplyMapper
.
batchOrderFeeApplyList
(
start
,
size
,
query
);
return
new
PageResult
<>(
list
,
total
,
mpPage
.
getSize
(),
page
.
getPage
(),
(
total
+
mpPage
.
getSize
()
-
1
)
/
mpPage
.
getSize
());
}
@Override
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/batchOrderFeeApply/BatchOrderFeeApplyBackVO.java
View file @
9185e70e
package
cn
.
iocoder
.
yudao
.
module
.
order
.
vo
.
batchOrderFeeApply
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.*
;
import
java.util.*
;
import
io.swagger.annotations.*
;
...
...
@@ -17,15 +18,15 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
public
class
BatchOrderFeeApplyBackVO
{
@ExcelProperty
(
"主键"
)
@ApiModelProperty
(
value
=
"主键"
,
required
=
true
)
@ApiModelProperty
(
value
=
"主键"
)
private
Long
id
;
@ExcelProperty
(
"编号"
)
@ApiModelProperty
(
value
=
"编号"
,
required
=
true
)
@ApiModelProperty
(
value
=
"编号"
)
private
String
no
;
@ExcelProperty
(
"申请详情"
)
@ApiModelProperty
(
value
=
"申请详情"
,
required
=
true
)
@ApiModelProperty
(
value
=
"申请详情"
)
private
String
details
;
@ExcelProperty
(
"原因"
)
...
...
@@ -41,9 +42,22 @@ public class BatchOrderFeeApplyBackVO {
private
String
formId
;
@ExcelProperty
(
"创建时间"
)
@
DateTime
Format
(
pattern
=
FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND
)
@ApiModelProperty
(
value
=
"创建时间"
,
required
=
true
)
@
Json
Format
(
pattern
=
FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND
)
@ApiModelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
@ApiModelProperty
(
value
=
"申请人id"
)
private
String
creator
;
@ApiModelProperty
(
value
=
"申请人名称"
)
private
String
creatorName
;
@ApiModelProperty
(
value
=
"审批人id"
)
private
String
audit
;
@ApiModelProperty
(
value
=
"审批人名称"
)
private
String
auditName
;
@ApiModelProperty
(
"批量申请详情信息"
)
private
BatchApplyDetailsInfoVO
batchApplyDetailsInfoVO
;
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/batchOrderFeeApply/BatchOrderFeeApplyQueryVO.java
View file @
9185e70e
...
...
@@ -28,4 +28,7 @@ public class BatchOrderFeeApplyQueryVO {
@ApiModelProperty
(
value
=
"结束创建时间"
)
private
Date
endCreateTime
;
@ApiModelProperty
(
value
=
"创建人"
)
private
String
creator
;
}
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/batchOrderFeeApply/BatchOrderFeeApply.xml
0 → 100644
View file @
9185e70e
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.iocoder.yudao.module.order.dal.mysql.batchOrderFeeApply.BatchOrderFeeApplyMapper"
>
<select
id=
"batchOrderFeeApplyCount"
resultType=
"java.lang.Long"
>
select
count(1)
from ecw_batch_order_fee_apply a
where a.`deleted` = 0
<include
refid=
"query"
/>
</select>
<select
id=
"batchOrderFeeApplyList"
resultType=
"cn.iocoder.yudao.module.order.vo.batchOrderFeeApply.BatchOrderFeeApplyBackVO"
>
select
a.id,
a.no,
a.reason,
a.state,
a.form_id,
a.creator,
u.creator_name,
a.audit,
u2.audit_name
from ecw_batch_order_fee_apply a
left join system_user u
on a.creator = u.id
left join system_user u2
on a.audit = u2.id
where a.`deleted` = 0
<include
refid=
"query"
/>
order by a.id desc
</select>
<sql
id=
"query"
>
<if
test=
"query.no != null and query.no != '' "
>
AND a.`no` like concat('%',concat(#{query.no},'%'))
</if>
<if
test=
"query.beginCreateTime != null and query.endCreateTime != null "
>
AND a.`create_time` between #{query.beginCreateTime} and #{query.endCreateTime}
</if>
<if
test=
"query.creator != null and query.creator != '' "
>
AND a.`creator` = #{query.creator}
</if>
</sql>
</mapper>
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/batchOrderFeeApply/BatchOrderFeeApplyController.java
View file @
9185e70e
...
...
@@ -71,8 +71,8 @@ public class BatchOrderFeeApplyController {
@ApiOperation
(
"获得批量订单费用申请分页"
)
@PreAuthorize
(
"@ss.hasPermission('ecw:batch-order-fee-apply:query')"
)
public
CommonResult
<
PageResult
<
BatchOrderFeeApplyBackVO
>>
getBatchOrderFeeApplyPage
(
@Valid
BatchOrderFeeApplyQueryVO
query
,
PageVO
page
)
{
PageResult
<
BatchOrderFeeApply
D
O
>
pageResult
=
batchOrderFeeApplyService
.
getBatchOrderFeeApplyPage
(
query
,
page
);
return
success
(
BatchOrderFeeApplyConvert
.
INSTANCE
.
convertPage
(
pageResult
)
);
PageResult
<
BatchOrderFeeApply
BackV
O
>
pageResult
=
batchOrderFeeApplyService
.
getBatchOrderFeeApplyPage
(
query
,
page
);
return
success
(
pageResult
);
}
}
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