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
2b4067d2
Commit
2b4067d2
authored
Feb 26, 2025
by
honghy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求95 报价单页面和列表调整
parent
3c63197f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
OfferController.java
...o/module/sale/controller/admin/offer/OfferController.java
+5
-1
No files found.
yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/offer/OfferController.java
View file @
2b4067d2
...
...
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import
cn.iocoder.yudao.module.customer.convert.customerFollowup.CustomerFollowupConvert
;
import
cn.iocoder.yudao.module.customer.dal.dataobject.customerFollowup.CustomerFollowupDO
;
import
cn.iocoder.yudao.module.customer.service.customerFollowup.CustomerFollowupService
;
import
cn.iocoder.yudao.module.customer.vo.customerFollowup.CustomerFollowupBackVO
;
import
cn.iocoder.yudao.module.sale.dal.dataobject.offer.OfferDO
;
import
cn.iocoder.yudao.module.sale.dal.dataobject.offer.OfferProdDO
;
import
cn.iocoder.yudao.module.sale.service.offer.OfferProdService
;
...
...
@@ -205,7 +206,10 @@ public class OfferController {
.
eq
(
OfferProdDO:
:
getOfferId
,
respVO
.
getOfferId
())
.
orderByDesc
(
OfferProdDO:
:
getOfferProdId
));
if
(
Objects
.
nonNull
(
customerFollowupDO
))
{
respVO
.
setFollowupBackVO
(
CustomerFollowupConvert
.
INSTANCE
.
convert
(
customerFollowupDO
));
CustomerFollowupBackVO
convert
=
CustomerFollowupConvert
.
INSTANCE
.
convert
(
customerFollowupDO
);
convert
.
setCreatorName
(
customerFollowupDO
.
getCreator
());
convert
.
setUpdaterName
(
customerFollowupDO
.
getUpdater
());
respVO
.
setFollowupBackVO
(
convert
);
}
if
(
offerProdDOList
!=
null
)
{
BigDecimal
volume
=
new
BigDecimal
(
0
);
...
...
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