From 810447f8c3178315f70955ed101aa71f377c95e1 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 18 Apr 2025 09:51:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=9A=90=E6=82=A3?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=A1=A3=E6=A1=88=E6=9C=89=E4=BA=9B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=BC=BA=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doubleprevent/YhzldaJobHandler.java       |  2 +-
 src/main/resources/mapper/FxfxdxMapper.xml    | 95 ++++++++++---------
 2 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java
index a3ce930..4643c8e 100644
--- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java
+++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java
@@ -115,7 +115,7 @@ public class YhzldaJobHandler {
                                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                                 String formattedDate = LocalDateTime.now().format(formatter);
                                 System.out.println(" 当前时间: " + formattedDate);  // 示例输出：2025-03-12 08:29:25
-                                System.out.println("失败"+(x+1)+",隐患排查任务");
+                                System.out.println("失败"+(x+1)+",隐患治理档案");
                                 if(!postIsNull){
                                     System.out.println("post:" + post.toString());
                                     XxlJobHelper.log("执行日志:" + company + post.toString());
diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml
index fae24b3..420ad04 100644
--- a/src/main/resources/mapper/FxfxdxMapper.xml
+++ b/src/main/resources/mapper/FxfxdxMapper.xml
@@ -411,16 +411,16 @@
 	<select id="getOneYhzldasPage" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Yhzlda">
 		SELECT
 			(case
-				when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'
-				else '恒信中碳氢能源科技（山东）有限公司'
+			when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'
+			else '恒信中碳氢能源科技（山东）有限公司'
 			end) AS qiyemingcheng,
 			(case
-				when b.ORGANID = '309_ORG' then '91370921328482832M'
-				else '91370921MA94AF5H3N'
+			when b.ORGANID = '309_ORG' then '91370921328482832M'
+			else '91370921MA94AF5H3N'
 			end) AS qiyebianma,
 			(case
-				when b.ORGANID = '309_ORG' then '370910170'
-				else '370980326'
+			when b.ORGANID = '309_ORG' then '370910170'
+			else '370980326'
 			end) AS weixianhuaxuepindeng,
 			a.ID AS yinhuanbianhao,
 			b.NAME AS yinhuanshejiduixiang,
@@ -436,8 +436,8 @@
 			a.FNAME AS yinhuanmingcheng,
 			-- 根据隐患等级代码判断隐患级别
 			(CASE
-				WHEN a.FLEVEL = '1' THEN '重大隐患'
-				ELSE '一般隐患'
+			WHEN a.FLEVEL = '1' THEN '重大隐患'
+			ELSE '一般隐患'
 			END) AS yinhuanjibie,
 			h.EMPNAME AS paicharenyuan,
 			--a.FREGISTTIME AS tijiaoriq1,
@@ -446,44 +446,44 @@
 			a.FSRC AS jianchaleixing,
 			-- 根据管理类型代码判断治理类型
 			(CASE
-				WHEN a.FMANAGETYPE = '1' THEN '限期整改'
-				ELSE '即查即改'
+			WHEN a.FMANAGETYPE = '1' THEN '限期整改'
+			ELSE '即查即改'
 			END) AS zhilileixing,
 			-- 根据危险类型代码判断隐患类型
 			(CASE
-				WHEN a.fdangertype = '1' THEN '安全'
-				WHEN a.fdangertype = '2' THEN '工艺'
-				WHEN a.fdangertype = '3' THEN '电气'
-				WHEN a.fdangertype = '4' THEN '仪表'
-				WHEN a.fdangertype = '5' THEN '消防'
-				WHEN a.fdangertype = '6' THEN '总图'
-				WHEN a.fdangertype = '7' THEN '设备'
-				ELSE '其他'
+			WHEN a.fdangertype = '1' THEN '安全'
+			WHEN a.fdangertype = '2' THEN '工艺'
+			WHEN a.fdangertype = '3' THEN '电气'
+			WHEN a.fdangertype = '4' THEN '仪表'
+			WHEN a.fdangertype = '5' THEN '消防'
+			WHEN a.fdangertype = '6' THEN '总图'
+			WHEN a.fdangertype = '7' THEN '设备'
+			ELSE '其他'
 			END) AS yinhuanleixing,
 			-- 根据任务类型代码判断隐患类别
 			(CASE
-				WHEN a.ftasktype = '1' THEN '主要责任人登记隐患'
-				WHEN a.FTASKTYPE = '2' THEN '技术负责人登记隐患'
-				WHEN a.FTASKTYPE = '3' THEN '操作负责人登记隐患'
-				ELSE '其他隐患'
+			WHEN a.ftasktype = '1' THEN '主要责任人登记隐患'
+			WHEN a.FTASKTYPE = '2' THEN '技术负责人登记隐患'
+			WHEN a.FTASKTYPE = '3' THEN '操作负责人登记隐患'
+			ELSE '其他隐患'
 			END) AS yinhuanleibie,
 			a.FDANGERDESC AS yinhuanmiaoshu,
 			a.fdangerreason AS yuanyinfenxi,
 			a.fremark AS kongzhicuoshi,
 			-- 资金万元计算（当前代码被注释，如需启用请确保逻辑正确）
 			/*(CASE
-				WHEN a.fcost IS NULL OR a.fcost = '' THEN NULL
-				WHEN a.fcost = '0' THEN '0'
-				ELSE
-					-- 将字符串转换为数值，除以10000 ，再转换回字符串并保留两位小数
-					CAST(ROUND(TRY_CONVERT(DECIMAL(18, 2), a.fcost) / 10000, 2) AS VARCHAR(20))
+			WHEN a.fcost IS NULL OR a.fcost = '' THEN NULL
+			WHEN a.fcost = '0' THEN '0'
+			ELSE
+			-- 将字符串转换为数值，除以10000 ，再转换回字符串并保留两位小数
+			CAST(ROUND(TRY_CONVERT(DECIMAL(18, 2), a.fcost) / 10000, 2) AS VARCHAR(20))
 			END) AS zijinwanyuan,*/
 			a.fcost AS zijinwanyuan,
 			-- 根据状态代码判断隐患状态
 			(CASE
-				WHEN a.fstate = '1' THEN '待验收'
-				WHEN a.fstate = '9' THEN '已验收'
-				ELSE '整改中'
+			WHEN a.fstate = '1' THEN '待验收'
+			WHEN a.fstate = '9' THEN '已验收'
+			ELSE '整改中'
 			END) AS yinhuanzhuangtai,
 			i.EMPNAME AS zhenggairen,
 			FORMAT(a.fmangerdeadline,
@@ -496,38 +496,47 @@
 			k.ACCOUNTDESC AS chuangjianren,
 			FORMAT(a.CREASTAMP,
 			'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian
-		FROM
+			FROM
 			ISM_CHECKINFO A
 			-- 左连接隐患信息表
-		LEFT JOIN ISM_HAZARD b ON
+			LEFT JOIN ISM_HAZARD b ON
 			a.FCODE = b.ID
 			-- 左连接隐患单元表
-		LEFT JOIN ISM_HAZARDUNIT c ON
+			LEFT JOIN ISM_HAZARDUNIT c ON
 			a.FUINTID = c.ID
 			-- 左连接风险控制措施表
-		LEFT JOIN ISM_RISKMEASURE d ON
+			LEFT JOIN ISM_RISKMEASURE d ON
 			a.FMEASURE = d.ID
 			-- 左连接风险事件表
-		LEFT JOIN ISM_RISKEVENT e ON
+			LEFT JOIN ISM_RISKEVENT e ON
 			e.RISKUNITID = c.ID
 			-- 左连接检查记录表
-		LEFT JOIN ISM_CHECKRECORD f ON
+			LEFT JOIN ISM_CHECKRECORD f ON
 			a.FTASKID = f.ID
-			-- 左连接故障排除表
-		LEFT JOIN ISM_TROUBLESHOOT g ON
-			f.FTROUBLESHOOTID = g.ID
+			-- 	-- 左连接排查任务表
+			-- LEFT JOIN ISM_TROUBLESHOOT g ON
+			-- 	f.FTROUBLESHOOTID = g.ID
 			-- 左连接员工表，关联登记人
-		LEFT JOIN PF_EMPLOYEE h ON
+			left JOIN ISM_TROUBLESHOOT g ON
+			d.id = g.FRISKMEASUREID
+			LEFT JOIN PF_EMPLOYEE h ON
 			a.FREGISTRANT = h.ID
 			-- 左连接员工表，关联整改人
-		LEFT JOIN PF_EMPLOYEE i ON
+			LEFT JOIN PF_EMPLOYEE i ON
 			a.fliableper = i.ID
 			-- 左连接员工表，关联复查人
-		LEFT JOIN PF_EMPLOYEE j ON
+			LEFT JOIN PF_EMPLOYEE j ON
 			a.fcheckper = j.ID
 			-- 左连接账户表，关联创建人
-		LEFT JOIN PF_ACCOUNT k ON
+			LEFT JOIN PF_ACCOUNT k ON
 			a.CREATOR = k.ID
+			/*WHERE
+			a.ISDELETE = 'N'
+			AND e.ISDELETE = 'N'
+			and a.CREASTAMP >= '2025-01-01 00:00:00.000'
+			--and a.fmeasure='e8211360c0204428bc247c5c7d5cfd8e'
+			order by
+			chuangjianshijian desc*/
 		WHERE
 			a.ISDELETE = 'N'
 			AND e.ISDELETE = 'N'