危险作业监督检查bug修改

zlmy-modules/zlmy-boot/doc/国产化/上线说明.md

@@ -144,6 +144,7 @@ COMMENT ON COLUMN public.t_contractor_person.contract_period IS '合同期限';
 
 INSERT INTO "public"."t_sys_dict_data" ("dict_data_id", "dict_id", "dict_key", "dict_value", "tree_sort", "status", "create_by", "create_date", "update_by", "update_date", "remarks", "parent_id", "parent_ids") VALUES ('72610276671d42089eb558880528269f', '42a87414a06a4f57b9d3ffb1907284b4', '20', '筒仓清仓作业', '7', '0', '1510a285c7134b39a3d7615835301f21', '2025-11-03 09:25:11', '1510a285c7134b39a3d7615835301f21', '2025-11-03 09:25:58', '', 'b5309e01475d4e93bb0ffb6ec7060265', '0,1a78e1f109904448bda810f2b66a653a,b5309e01475d4e93bb0ffb6ec7060265,');
 INSERT INTO "public"."t_sys_resource" ("resource_id", "parent_id", "parent_ids", "resource_name", "resource_sort", "resource_level", "resource_type", "is_show", "resource_url", "photo_url", "permission", "status", "create_by", "create_date", "update_by", "update_date", "remarks", "router_mapping", "resource_auth_type") VALUES ('b7637e7a899e436e8aad2bfaa47d94f1', '98dda60d04bb453192d908afcb07ba61', '0,98dda60d04bb453192d908afcb07ba61,', '危险作业合规率', '5', '2', '2', '0', '/dangerous-work/statistics/complianceRate', 'el-icon-finished', NULL, '0', '1242684364872761344', '2025-11-04 10:39:33', '1242684364872761344', '2025-11-04 10:41:52', NULL, NULL, '2');
+ALTER TABLE public.t_contractor_access_log_approval ALTER COLUMN approval_time TYPE timestamp USING approval_time::timestamp;
 
 
 

zlmy-modules/zlmy-boot/src/main/java/com/testor/common/util/DangerousOperationValidator.java

@@ -149,7 +149,7 @@ public class DangerousOperationValidator {
         // 检查实际时长是否超过限制
         int actualHoursInt = (int) Math.ceil(actualHours);
         if (actualHoursInt > timeLimit) {
-            return String.format("%s-%s作业超过规定时间%d小时，规定最大时长为%d小时。",
+            return String.format("%s-%s作业超过规定时长%d小时，规定最大时长为%d小时。",
                     type.getName(), level.getLevel(),
                     actualHoursInt - timeLimit, timeLimit);
         }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/domain/TContractorAccessLogApproval.java

@@ -3,6 +3,7 @@ package com.testor.module.hazard.model.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tongtech.tfw.backend.common.models.supers.SuperModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +13,9 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.experimental.SuperBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 承包商准入管理访问日志审批表对象 t_contractor_access_log_approval
@@ -77,7 +81,9 @@ public class TContractorAccessLogApproval extends SuperModel {
      */
     @ApiModelProperty(value = "审批时间")
     @TableField("approval_time")
-    private String approvalTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date approvalTime;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "修改日志")

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorBasicInfo.xml

@@ -57,11 +57,12 @@
         tci.reg_date,
         tci.valid_period,
         tcbi.process_status,
-        tcl.type type
+        tsdd.dict_value type
         FROM
         t_contractor_basic_info AS tcbi
         LEFT JOIN t_contractor_ledger_project AS tclp ON tcbi.id = tclp.biz_id
         LEFT JOIN t_contractor_ledger AS tcl ON tcl.id = tclp.contractor_id
+        LEFT JOIN t_sys_dict_data AS tsdd ON tsdd.dict_data_id = tcl.type_id
         LEFT JOIN t_contractor_info AS tci ON tci.id = tcl.info_id
         LEFT JOIN t_contractor_project AS tcp ON tcp.id = tclp.project_id
         <!--WHERE
@@ -95,7 +96,8 @@
         tci.addr,
         tci.reg_date,
         tci.valid_period,
-        tcbi.process_status
+        tcbi.process_status,
+        tsdd.dict_value
         order by tcbi.update_date desc
     </select>
 </mapper>
\ No newline at end of file