From 0f7bff99226d54076ae6b75bb0a4e8bdbf79a558 Mon Sep 17 00:00:00 2001
From: CYQ <123@163.com>
Date: Tue, 21 Oct 2025 16:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E8=A1=8C=E5=90=8D=E7=A7=B0=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=85=B3=E8=81=94sys=5Fdept=E8=A1=A8=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../total/MarketingValidInvalidProcessor.java | 134 +++++++++---------
 1 file changed, 68 insertions(+), 66 deletions(-)

diff --git a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/total/MarketingValidInvalidProcessor.java b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/total/MarketingValidInvalidProcessor.java
index 21a26d3..488fc92 100644
--- a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/total/MarketingValidInvalidProcessor.java
+++ b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/total/MarketingValidInvalidProcessor.java
@@ -36,72 +36,74 @@ public class MarketingValidInvalidProcessor extends AbstractBusinessProcessor {
 
         // 插入营销人员信息（与经办人员不重复的）
         String insertSql =
-                "INSERT INTO marketing_valid_invalid ( " +
-                        "  branch_name       " +
-                        " ,employee_name     " +
-                        " ,marketing_code    " +
-                        " ,customer_name     " +
-                        " ,customer_id       " +
-                        " ,invalid_business  " +
-                        " ,valid_business    " +
-                        " ,check_flag        " +
-                        " ,tenant_id " +
-                        " ,create_dept " +
-                        " ,create_by " +
-                        " ,create_time " +
-                        " ,record_month " +
-                        ")( " +
-                        "select  " +
-                        "  dept_name " +
-                        " ,jb_name " +
-                        " ,jb_id " +
-                        " ,cust_name " +
-                        " ,cust_id " +
-                        " ,CASE  " +
-                        "  WHEN check_flag='9'  " +
-                        "   then subcategory_name  " +
-                        "  ELSE '' " +
-                        " END " +
-                        " ,CASE  " +
-                        "  WHEN check_flag='1'  " +
-                        "   then subcategory_name  " +
-                        "  ELSE '' " +
-                        " END " +
-                        " ,check_flag " +
-                        " ,b.tenant_id " +
-                        " ,b.dept_id " +
-                        " ,b.user_id " +
-                        " ,?  " +
-                        " ,?  " +
-                        "from mps_market a " +
-                        "INNER JOIN sys_user b ON a.jb_id = b.mkt_no AND b.del_flag = '0' " +
-                        "where SUBSTR(a.entry_date,1,7)=? and a.del_flag='0' and a.check_flag<>'0' " +
-                        "union  " +
-                        "select  " +
-                        "  dept_name " +
-                        " ,yx_name " +
-                        " ,yx_id " +
-                        " ,cust_name " +
-                        " ,cust_id " +
-                        " ,CASE  " +
-                        "  WHEN check_flag='9'  " +
-                        "   then subcategory_name  " +
-                        "  ELSE '' " +
-                        " END " +
-                        " ,CASE  " +
-                        "  WHEN check_flag='1'  " +
-                        "   then subcategory_name  " +
-                        "  ELSE '' " +
-                        " END " +
-                        " ,check_flag " +
-                        " ,b.tenant_id " +
-                        " ,b.dept_id " +
-                        " ,b.user_id " +
-                        " ,?  " +
-                        " ,?  " +
-                        "from mps_market a " +
-                        "INNER JOIN sys_user b ON a.yx_id = b.mkt_no AND b.del_flag = '0' " +
-                        "where SUBSTR(a.entry_date,1,7)=? and a.del_flag='0'  and a.check_flag<>'0'" +
+                "INSERT INTO marketing_valid_invalid (  " +
+                        "  branch_name        " +
+                        " ,employee_name      " +
+                        " ,marketing_code     " +
+                        " ,customer_name      " +
+                        " ,customer_id        " +
+                        " ,invalid_business   " +
+                        " ,valid_business     " +
+                        " ,check_flag         " +
+                        " ,tenant_id  " +
+                        " ,create_dept  " +
+                        " ,create_by  " +
+                        " ,create_time  " +
+                        " ,record_month  " +
+                        ")(  " +
+                        "select   " +
+                        "  e.dept_name  " +
+                        " ,a.jb_name  " +
+                        " ,a.jb_id  " +
+                        " ,a.cust_name  " +
+                        " ,a.cust_id  " +
+                        " ,CASE   " +
+                        "  WHEN check_flag='9'   " +
+                        "   then subcategory_name   " +
+                        "  ELSE ''  " +
+                        " END  " +
+                        " ,CASE   " +
+                        "  WHEN check_flag='1'   " +
+                        "   then subcategory_name   " +
+                        "  ELSE ''  " +
+                        " END  " +
+                        " ,check_flag  " +
+                        " ,b.tenant_id  " +
+                        " ,b.dept_id  " +
+                        " ,b.user_id  " +
+                        " ,?   " +
+                        " ,?   " +
+                        "from mps_market a  " +
+                        "INNER JOIN sys_user b ON a.jb_id = b.mkt_no AND b.del_flag = '0'  " +
+                        "left join sys_dept e ON b.dept_id = e.dept_id " +
+                        "where SUBSTR(a.entry_date,1,7)=? and a.del_flag='0' and a.check_flag<>'0'  " +
+                        "union   " +
+                        "select   " +
+                        "  e.dept_name  " +
+                        " ,a.yx_name  " +
+                        " ,a.yx_id  " +
+                        " ,a.cust_name  " +
+                        " ,a.cust_id  " +
+                        " ,CASE   " +
+                        "  WHEN check_flag='9'   " +
+                        "   then subcategory_name   " +
+                        "  ELSE ''  " +
+                        " END  " +
+                        " ,CASE   " +
+                        "  WHEN check_flag='1'   " +
+                        "   then subcategory_name   " +
+                        "  ELSE ''  " +
+                        " END  " +
+                        " ,check_flag  " +
+                        " ,b.tenant_id  " +
+                        " ,b.dept_id  " +
+                        " ,b.user_id  " +
+                        " ,?   " +
+                        " ,?   " +
+                        "from mps_market a  " +
+                        "INNER JOIN sys_user b ON a.yx_id = b.mkt_no AND b.del_flag = '0'  " +
+                        "left join sys_dept e ON b.dept_id = e.dept_id " +
+                        "where SUBSTR(a.entry_date,1,7)=? and a.del_flag='0'  and a.check_flag<>'0' " +
                         ")";
 
         Timestamp now = Timestamp.valueOf(LocalDateTime.now());