上传园区断路作业票补充优化企业编码,作业人,作业负责人

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;

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

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