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
131b816c
Commit
131b816c
authored
Jul 25, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单业绩客户新老状态更新冗余业务补充完善
parent
d6876ce0
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
9 deletions
+55
-9
update_2024-07.sql
sql/update_2024-07.sql
+10
-0
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+36
-0
DeptTargetMapper.xml
...src/main/resources/mapper/deptTarget/DeptTargetMapper.xml
+9
-9
No files found.
sql/update_2024-07.sql
View file @
131b816c
...
...
@@ -53,9 +53,19 @@ CREATE TABLE `ecw_vz` (
)
ENGINE
=
InnoDB
ROW_FORMAT
=
DYNAMIC
COMMENT
=
'计量单位表'
;
alter
table
`ecw_target_log`
add
column
`loglev`
int
DEFAULT
NULL
COMMENT
'逻辑计算来源'
;
alter
table
`ecw_target_log`
add
column
`gsf`
varchar
(
800
)
COLLATE
utf8mb4_general_ci
DEFAULT
NULL
;
alter
table
`ecw_target_log`
add
column
`gstype`
int
DEFAULT
NULL
;
-- 新增订单产生业绩时归属客户状态
alter
table
`ecw_order`
add
column
`is_in_open_sea`
tinyint
DEFAULT
'0'
COMMENT
'是否公海客户'
,
-- 2024-07-25 刷新订单业绩客户新老客户状态冗余参数
update
ecw_order
o
left
join
ecw_customer
c
on
c
.
id
=
o
.
customer_id
set
o
.
yeji_type
=
IFNULL
(
c
.
is_new
,
1
);
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
131b816c
This diff is collapsed.
Click to expand it.
yudao-module-sale/yudao-module-sale-core/src/main/resources/mapper/deptTarget/DeptTargetMapper.xml
View file @
131b816c
...
...
@@ -45,7 +45,7 @@
select * from (
SELECT
IFNULL(t6.resource_type,1) as customer_type,
( CASE WHEN t
6.is_new
= 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
( CASE WHEN t
1.yeji_type
= 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
t2.number,
t1.order_no,
(CASE WHEN t9.customer_id=t.customer_id THEN t9.name ELSE tx.name END) as name,
...
...
@@ -114,7 +114,7 @@
and t7.departure_warehouse_id = #{query.startWarehouseId}
</if>
<if
test=
"query.achieveType != null"
>
and t
6.is_new
= #{query.achieveType}
and t
1.yeji_type
= #{query.achieveType}
</if>
<if
test=
"query.destWarehouseIdList != null"
>
and t8.objective_warehouse_id in
...
...
@@ -132,7 +132,7 @@
select * from (
SELECT
IFNULL(t6.resource_type,1) as customer_type,
( CASE WHEN t
6.is_new
= 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
( CASE WHEN t
1.yeji_type
= 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
t2.number,
t1.order_no,
(CASE WHEN t9.customer_id=t.customer_id THEN t9.name ELSE tx.name END) as name,
...
...
@@ -206,7 +206,7 @@
and t7.departure_warehouse_id = #{query.startWarehouseId}
</if>
<if
test=
"query.achieveType != null"
>
and t
6.is_new
= #{query.achieveType}
and t
1.yeji_type
= #{query.achieveType}
</if>
<if
test=
"query.destWarehouseIdList != null"
>
and t8.objective_warehouse_id in
...
...
@@ -224,7 +224,7 @@
select * from (
SELECT
IFNULL(t6.resource_type,1) as customer_type,
( CASE WHEN t
6.is_new
= 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
( CASE WHEN t
1.yeji_type
= 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
t2.number,
t1.order_no,
(CASE WHEN t9.customer_id=t.customer_id THEN t9.name ELSE tx.name END) as name,
...
...
@@ -294,7 +294,7 @@
and t7.departure_warehouse_id = #{query.startWarehouseId}
</if>
<if
test=
"query.achieveType != null"
>
and t
6.is_new
= #{query.achieveType}
and t
1.yeji_type
= #{query.achieveType}
</if>
<if
test=
"query.destWarehouseIdList != null"
>
and t8.objective_warehouse_id in
...
...
@@ -312,7 +312,7 @@
select * from (
SELECT
IFNULL(t6.resource_type,1) as customer_type,
( CASE WHEN t
6.is_new
= 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
( CASE WHEN t
1.yeji_type
= 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
t2.number,
t1.order_no,
(CASE WHEN t9.customer_id=t.customer_id THEN t9.name ELSE tx.name END) as name,
...
...
@@ -382,7 +382,7 @@
and t7.departure_warehouse_id = #{query.startWarehouseId}
</if>
<if
test=
"query.achieveType != null"
>
and t
6.is_new
= #{query.achieveType}
and t
1.yeji_type
= #{query.achieveType}
</if>
<if
test=
"query.destWarehouseIdList != null"
>
and t8.objective_warehouse_id in
...
...
@@ -406,7 +406,7 @@
FROM
(
SELECT
( CASE WHEN t
6.is_new
= 1 THEN '新客户' ELSE '旧客户' END ) AS cusType,
( CASE WHEN t
1.yeji_type
= 1 THEN '新客户' ELSE '旧客户' END ) AS cusType,
(
SELECT
CASE
...
...
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