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
e11e9bea
Commit
e11e9bea
authored
Feb 24, 2025
by
honghy
Committed by
wux
Feb 27, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求95 报价单页面和列表调整
parent
45b82e7e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
4 deletions
+49
-4
OfferDO.java
...coder/yudao/module/sale/dal/dataobject/offer/OfferDO.java
+7
-3
OfferMapper.java
...ocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
+36
-0
OfferServiceImpl.java
...udao/module/sale/service/offer/impl/OfferServiceImpl.java
+0
-1
OfferPageReqVO.java
...cn/iocoder/yudao/module/sale/vo/offer/OfferPageReqVO.java
+6
-0
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 @
e11e9bea
package
cn
.
iocoder
.
yudao
.
module
.
sale
.
dal
.
dataobject
.
offer
;
import
cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO
;
import
com.baomidou.mybatisplus.annotation.FieldStrategy
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
...
...
@@ -176,18 +177,21 @@ public class OfferDO extends BaseDO {
private
Integer
saleStage
;
/**
*
销售阶段
字典ecw_offer_customer_status
*
客户状态
字典ecw_offer_customer_status
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Integer
customerStatus
;
/**
*
销售阶段
字典ecw_offer_cargo_status
*
货物状态
字典ecw_offer_cargo_status
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Integer
cargoStatus
;
/**
*
销售阶段
字典ecw_offer_inquiry_source
*
询盘来源
字典ecw_offer_inquiry_source
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Integer
inquirySource
;
/**
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
View file @
e11e9bea
...
...
@@ -105,6 +105,18 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"JOIN ecw_offer_prod op on op.offer_id = o.offer_id "
,
"where o.deleted = 0 and op.deleted = 0"
,
//transportList
"<when test = 'pageVO.transportList != null and pageVO.transportList.size() > 0'>"
,
"AND o.transport_id IN"
,
"<foreach item='item' collection='pageVO.transportList' open='(' close=')' separator=','> #{item} </foreach>"
,
"</when>"
,
//reasonDictList
"<when test = 'pageVO.reasonDictList != null and pageVO.reasonDictList.size() > 0'>"
,
"AND o.reason_dict IN"
,
"<foreach item='item' collection='pageVO.reasonDictList' open='(' close=')' separator=','> #{item} </foreach>"
,
"</when>"
,
//customerStatus
"<when test = 'pageVO.customerStatusList != null and pageVO.customerStatusList.size() > 0'>"
,
"AND o.customer_status IN"
,
...
...
@@ -299,6 +311,18 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"left join ecw_channel l on o.channel_id = l.channel_id "
,
"where o.deleted = 0"
,
//transportList
"<when test = 'pageVO.transportList != null and pageVO.transportList.size() > 0'>"
,
"AND o.transport_id IN"
,
"<foreach item='item' collection='pageVO.transportList' open='(' close=')' separator=','> #{item} </foreach>"
,
"</when>"
,
//reasonDictList
"<when test = 'pageVO.reasonDictList != null and pageVO.reasonDictList.size() > 0'>"
,
"AND o.reason_dict IN"
,
"<foreach item='item' collection='pageVO.reasonDictList' open='(' close=')' separator=','> #{item} </foreach>"
,
"</when>"
,
//customerStatus
"<when test = 'pageVO.customerStatusList != null and pageVO.customerStatusList.size() > 0'>"
,
"AND o.customer_status IN"
,
...
...
@@ -475,6 +499,18 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"left join ecw_channel l on o.channel_id = l.channel_id "
,
"where o.deleted = 0"
,
//transportList
"<when test = 'pageVO.transportList != null and pageVO.transportList.size() > 0'>"
,
"AND o.transport_id IN"
,
"<foreach item='item' collection='pageVO.transportList' open='(' close=')' separator=','> #{item} </foreach>"
,
"</when>"
,
//reasonDictList
"<when test = 'pageVO.reasonDictList != null and pageVO.reasonDictList.size() > 0'>"
,
"AND o.reason_dict IN"
,
"<foreach item='item' collection='pageVO.reasonDictList' open='(' close=')' separator=','> #{item} </foreach>"
,
"</when>"
,
//customerStatus
"<when test = 'pageVO.customerStatusList != null and pageVO.customerStatusList.size() > 0'>"
,
"AND o.customer_status IN"
,
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/offer/impl/OfferServiceImpl.java
View file @
e11e9bea
...
...
@@ -1100,7 +1100,6 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
log
.
warn
(
I18nMessage
.
getLang
().
toString
());
List
<
OfferRespVO
>
list
=
offerMapper
.
offerPage
(
pageReqVO
,
I18nMessage
.
getLang
());
return
new
PageResult
<>(
list
,
total
,
mpPage
.
getSize
(),
mpPage
.
getCurrent
(),
(
total
+
mpPage
.
getSize
()
-
1
)
/
mpPage
.
getSize
());
}
@Override
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/offer/OfferPageReqVO.java
View file @
e11e9bea
...
...
@@ -221,6 +221,12 @@ public class OfferPageReqVO extends PageParam {
@ApiModelProperty
(
value
=
"货物状态"
)
private
List
<
Long
>
cargoStatusList
;
@ApiModelProperty
(
value
=
"输单原因"
)
private
List
<
Long
>
reasonDictList
;
@ApiModelProperty
(
value
=
"运输方式"
)
private
List
<
Integer
>
transportList
;
@ApiModelProperty
(
value
=
"联系人手机号"
)
private
String
relationPhone
;
...
...
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