From 975ea1611a8431f06cf3817c9d45a74b8145b074 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Wed, 15 Apr 2026 17:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=BA=E5=88=92=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E7=94=A8=E4=BA=8E=E6=98=BE=E7=A4=BA=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/cms/domain/ESJobDocument.java   | 3 +++
 ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java | 4 ++++
 ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml | 6 ++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java
index 69d394f..101160e 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java
@@ -178,4 +178,7 @@ public class ESJobDocument
     @ApiModelProperty("下架时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String downTime;
+
+    @ApiModelProperty("区划名称")
+    private String regionName;
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
index 50e6738..6b77ce0 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
@@ -211,4 +211,8 @@ public class Job extends BaseEntity
     @ApiModelProperty("下架时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String downTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty("区划名称")
+    private String regionName;
 }
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
index 25a17b9..403b760 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
@@ -92,6 +92,7 @@
         <result property="passReason"    column="pass_reason"    />
         <result property="jobStatus"    column="job_status"    />
         <result property="downTime"    column="down_time"    />
+        <result property="regionName"    column="region_name"    />
 
         <association property="companyVo" resultMap="CompanyResult"/>
     </resultMap>
@@ -292,10 +293,11 @@
             )
     </select>
     <select id="selectAllJob" resultMap="JobEsResult">
-        SELECT j.*,c.industry,c.scale,c.nature as company_nature,c.code,c.description as company_description,c.name,c.company_id,t.contact_person,t.contact_person_phone FROM job as j
+        SELECT j.*,c.industry,c.scale,c.nature as company_nature,c.code,c.description as company_description,c.name,c.company_id,t.contact_person,t.contact_person_phone,COALESCE(sa.name, '未知区域') as region_name FROM job as j
         left join company as c on c.company_id = j.company_id and j.del_flag='0' and c.del_flag='0'
         LEFT JOIN (SELECT  t1.*, ROW_NUMBER() OVER (PARTITION BY t1.company_id ORDER BY t1.id) AS rn  FROM company_contact AS t1  WHERE t1.del_flag = '0' ) AS t
-        ON t.company_id = j.company_id AND t.rn = 1 WHERE j.del_flag = '0' limit #{offset},#{batchSize}
+        ON t.company_id = j.company_id AND t.rn = 1
+        LEFT JOIN sys_area sa ON j.region_code=sa.code WHERE j.del_flag = '0' limit #{offset},#{batchSize}
     </select>
     <select id="selectAllInsertRowWork" resultType="com.ruoyi.cms.domain.RowWork">
         select  Id, TaskId, TaskName, Std_class, SF, ZCMC, Aca112, Acb22a, Aac011, Acb240,