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
78ee9054
Commit
78ee9054
authored
Feb 25, 2025
by
honghy
Committed by
wux
Feb 27, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求95 报价单页面和列表调整
parent
30118af6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
OfferDO.java
...coder/yudao/module/sale/dal/dataobject/offer/OfferDO.java
+2
-0
OfferMapper.java
...ocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
+6
-0
OfferServiceImpl.java
...udao/module/sale/service/offer/impl/OfferServiceImpl.java
+4
-4
No files found.
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/dataobject/offer/OfferDO.java
View file @
78ee9054
...
...
@@ -104,10 +104,12 @@ public class OfferDO extends BaseDO {
/**
* 价格有效期开始
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Date
startTime
;
/**
* 价格有效期结束
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Date
endTime
;
/**
* 交货方式:FOB(离岸价),CIF(到岸价),CNF(成本加运费),EXW(出厂价)
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
View file @
78ee9054
...
...
@@ -382,6 +382,12 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"AND o.relation_id = #{pageVO.customerId} "
,
"</when>"
,
//startWarehouseIds
"<when test = 'pageVO.startWarehouseIds != null and pageVO.startWarehouseIds.size() > 0'>"
,
"AND st.id IN"
,
"<foreach item='startWarehouseId' collection='pageVO.startWarehouseIds' open='(' close=')' separator=','> #{startWarehouseId} </foreach>"
,
"</when>"
,
"<when test = 'pageVO.beginEstimatedShippingTime != null and pageVO.endEstimatedShippingTime != null '>"
,
"AND o.`estimated_shipping_time` between #{pageVO.beginEstimatedShippingTime} and #{pageVO.endEstimatedShippingTime}"
,
"</when>"
,
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/offer/impl/OfferServiceImpl.java
View file @
78ee9054
...
...
@@ -500,9 +500,9 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
throw
exception
(
MARKS_LENGTH_MAX
,
20
);
}
}
if
(
null
==
updateReqVO
.
getStartTime
()
||
null
==
updateReqVO
.
getEndTime
())
{
throw
exception
(
OFFER_START_END_TIME_NOT_NULL
);
}
//
if (null == updateReqVO.getStartTime() || null == updateReqVO.getEndTime()) {
//
throw exception(OFFER_START_END_TIME_NOT_NULL);
//
}
if
(
updateReqVO
.
getRelation
()
==
1
&&
(
Objects
.
isNull
(
updateReqVO
.
getConsignorId
())
||
updateReqVO
.
getConsignorId
()
==
0
))
{
throw
exception
(
OFFER_ASCRIPTION_CONSIGNOR_NOT_NULL
);
}
...
...
@@ -585,7 +585,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
if
(
Objects
.
nonNull
(
customerContactsDO
.
getCustomerId
()))
{
CustomerDO
customerDO
=
customerService
.
getById
(
customerContactsDO
.
getCustomerId
());
if
(
Objects
.
nonNull
(
customerDO
)
&&
Objects
.
nonNull
(
customerDO
.
getCustomerService
()))
{
updateObj
.
setFollowUpSalesmanId
(
String
.
valueOf
(
customerDO
.
getCustomerService
()));
//
updateObj.setFollowUpSalesmanId(String.valueOf(customerDO.getCustomerService()));
updateObj
.
setSalesmanId
(
customerDO
.
getCustomerService
());
AdminUserRespDTO
adminUserRespDTO
=
adminUserApi
.
getUser
(
customerDO
.
getCustomerService
());
if
(
Objects
.
nonNull
(
adminUserRespDTO
))
{
...
...
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