From 7e622820bca4011788ed676e9a2af74a7b0d0e7d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 04 六月 2025 17:36:20 +0800
Subject: [PATCH] 查报告增加时间范围以及配置

---
 ltkj-admin/src/main/resources/sql/职业病.sql |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git "a/ltkj-admin/src/main/resources/sql/\350\201\214\344\270\232\347\227\205.sql" "b/ltkj-admin/src/main/resources/sql/\350\201\214\344\270\232\347\227\205.sql"
index b32a17c..27da69e 100644
--- "a/ltkj-admin/src/main/resources/sql/\350\201\214\344\270\232\347\227\205.sql"
+++ "b/ltkj-admin/src/main/resources/sql/\350\201\214\344\270\232\347\227\205.sql"
@@ -17,4 +17,32 @@
 ALTER TABLE tj_order ADD COLUMN zhiye_ksjhrq DATETIME NULL COMMENT '寮�濮嬫帴瀹虫棩鏈�';
 ALTER TABLE tj_order ADD COLUMN zhiye_gh VARCHAR(255) NULL COMMENT '宸ュ彿';
 ALTER TABLE tj_order ADD COLUMN zhiye_cj VARCHAR(255) NULL COMMENT '杞﹂棿';
+ALTER TABLE tj_order ADD COLUMN zhiye_jl VARCHAR(255) NULL COMMENT '鑱屼笟缁撹';
+ALTER TABLE tj_order ADD COLUMN zhiye_jg VARCHAR(255) NULL COMMENT '鑱屼笟缁撴灉';
+
+ALTER TABLE `tj_order`
+    ADD COLUMN `zhiye_gz` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟宸ョ' AFTER `zhiye_jg`,
+    ADD COLUMN `zhiye_zgln` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鎬诲伐榫勫勾' AFTER `zhiye_gz`,
+    ADD COLUMN `zhiye_zgly` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鎬诲伐榫勬湀' AFTER `zhiye_zgln`,
+    ADD COLUMN `zhiye_jhys` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鎺ュ鍥犵礌' AFTER `zhiye_zgly`,
+    ADD COLUMN `zhiye_rzsj` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鍏ヨ亴鏃堕棿' AFTER `zhiye_jhys`,
+    ADD COLUMN `zhiye_scdw` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鎵�澶勫崟浣�' AFTER `zhiye_rzsj`,
+    ADD COLUMN `zhiye_zysksrq` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鍙插紑濮嬫棩鏈�' AFTER `zhiye_scdw`,
+    ADD COLUMN `zhiye_zysjsrq` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鍙茬粨鏉熸棩鏈�' AFTER `zhiye_zysksrq`,
+    ADD COLUMN `zhiye_zysszdw` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鍙叉墍鍦ㄥ崟浣�' AFTER `zhiye_zysjsrq`;
+
+# 瀛樺偍杩囩▼淇敼
+# tj_check_list
+# 澧炲姞鍙傛暟浠ュ強鏈�缁堢粨鏋滈泦杩斿洖澧炲姞鏉′欢
+# 鍦∣UT鍙傛暟鍓嶅鍔狅細
+IN p_tjCategory VARCHAR(100)
+# 鏈�缁堣繑鍥炴潯浠舵煡璇�
+-- 璁$畻鎬昏鏁�
+select count(tjNumber) into total from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory);
+-- 鎵ц鍒嗛〉鏌ヨ骞惰繑鍥炵粨鏋滈泦
+if checkStatus =0 THEN
+select * from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory) ORDER BY finishTime DESC LIMIT  page,pageSize;
+ELSE
+select * from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory) ORDER BY shsj DESC LIMIT  page,pageSize;
+END if;
 

--
Gitblit v1.8.0