From 7a1b8e7785cbd394b71cbb68d2e3894fc68fef7b Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 17 Jun 2025 09:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=AD=E5=8C=BA=E6=96=AD?=
 =?UTF-8?q?=E8=B7=AF=E4=BD=9C=E4=B8=9A=E7=A5=A8=E8=A1=A5=E5=85=85=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BC=81=E4=B8=9A=E7=BC=96=E7=A0=81,=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=BA=BA,=E4=BD=9C=E4=B8=9A=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxjt/dataupload/model/entity/tszy/upload/Dlzy.java   | 8 ++++++++
 src/main/resources/mapper/FxfxdxMapper.xml               | 9 ++++-----
 src/main/resources/mapper/ZypSingleQueryMapper.xml       | 9 ++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dlzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dlzy.java
index af942e3..f2308a3 100644
--- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dlzy.java
+++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dlzy.java
@@ -38,7 +38,15 @@ public class Dlzy {
     private String querenren1;
     private String querenren2;
     private String querenren3;
+    private String qiyebianma;
 
+    public String getQiyebianma() {
+        return qiyebianma;
+    }
+
+    public void setQiyebianma(String qiyebianma) {
+        this.qiyebianma = qiyebianma;
+    }
 
     public String getBianhao() {
         return bianhao;
diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml
index ea5bdc7..9c0f603 100644
--- a/src/main/resources/mapper/FxfxdxMapper.xml
+++ b/src/main/resources/mapper/FxfxdxMapper.xml
@@ -1374,6 +1374,8 @@
 	<select id="getOneDlzysPage" resultType="com.hxjt.dataupload.model.entity.tszy.upload.Dlzy">
 		SELECT
 			a.ID as bianhao,
+			--qiyebianma
+			(CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma,
 			--zuoyeshenqingdanwei
 			(CASE
 				WHEN C.FNAME like '%中碳%' THEN '恒信中碳氢能源科技（山东）有限公司'
@@ -1397,7 +1399,7 @@
 			--监护人
 			A.GUARDNAME AS jianhuren,
 			--作业人
-			a.FIREWRITENAME AS zuoyeren,
+			d.firepersonname3 AS zuoyeren,
 			--作业单位
 			A.SDUNITNAME AS zuoyedanwei,
 			-- 需要改进通过机构路径改进
@@ -1406,10 +1408,7 @@
 				else '否'
 			end) as shifouchengbaoshangz,
 			--作业负责人
-			 (CASE
-				WHEN D.FIREPERSONNAME1 is null then '郝得润'
-				ELSE D.FIREPERSONNAME1
-			END) AS zuoyefuzeren,
+			D.personname10 AS zuoyefuzeren,
 			--没有默认的联系方式？？
 		 (CASE
 				WHEN (F.MOBILE IS NULL
diff --git a/src/main/resources/mapper/ZypSingleQueryMapper.xml b/src/main/resources/mapper/ZypSingleQueryMapper.xml
index 19eef6c..db4b27d 100644
--- a/src/main/resources/mapper/ZypSingleQueryMapper.xml
+++ b/src/main/resources/mapper/ZypSingleQueryMapper.xml
@@ -763,6 +763,8 @@
 	<select id="getOneDlzysPage" resultType="com.hxjt.dataupload.model.entity.tszy.upload.Dlzy">
 		SELECT
 			a.ID as bianhao,
+			--qiyebianma
+			(CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma,
 			--zuoyeshenqingdanwei
 			(CASE
 				WHEN C.FNAME like '%中碳%' THEN '恒信中碳氢能源科技（山东）有限公司'
@@ -786,7 +788,7 @@
 			--监护人
 			A.GUARDNAME AS jianhuren,
 			--作业人
-			a.FIREWRITENAME AS zuoyeren,
+			d.firepersonname3 AS zuoyeren,
 			--作业单位
 			A.SDUNITNAME AS zuoyedanwei,
 			-- 需要改进通过机构路径改进
@@ -795,10 +797,7 @@
 				else '否'
 			end) as shifouchengbaoshangz,
 			--作业负责人
-			 (CASE
-				WHEN D.FIREPERSONNAME1 is null then '郝得润'
-				ELSE D.FIREPERSONNAME1
-			END) AS zuoyefuzeren,
+			D.personname10 AS zuoyefuzeren,
 			--没有默认的联系方式？？
 		 (CASE
 				WHEN (F.MOBILE IS NULL