Merge branch 'master-fix' into dev

sql/update_2024-07.sql

@@ -65,3 +65,7 @@ alter table `ecw_target_log`
 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-sale/yudao-module-sale-core/src/main/resources/mapper/deptTarget/DeptTargetMapper.xml

@@ -45,7 +45,7 @@
         select * from (
         SELECT
         IFNULL(t6.resource_type,1) as customer_type,
-        ( CASE WHEN t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
+        ( CASE WHEN t1.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 t6.is_new = #{query.achieveType}
+            and t1.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 t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
+        ( CASE WHEN t1.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 t6.is_new = #{query.achieveType}
+            and t1.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 t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
+        ( CASE WHEN t1.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 t6.is_new = #{query.achieveType}
+            and t1.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 t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
+        ( CASE WHEN t1.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 t6.is_new = #{query.achieveType}
+            and t1.yeji_type = #{query.achieveType}
         </if>
         <if test="query.destWarehouseIdList != null">
             and t8.objective_warehouse_id in
@@ -406,7 +406,7 @@
 FROM
 	(
 	SELECT
-		( CASE WHEN t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS cusType,
+		( CASE WHEN t1.yeji_type = 1 THEN '新客户' ELSE '旧客户' END ) AS cusType,
 		(
 		SELECT
 		CASE