From 6bfa57480f3d2be84971da9d2ad49e869cc024b8 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 15 May 2024 21:26:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E7=A7=8D=E4=BD=9C=E4=B8=9A=E7=9A=84bu?= =?UTF-8?q?g=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java | 2 +- .../com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java | 3 ++- .../com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java | 2 +- .../zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java | 2 +- .../zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java | 2 +- .../zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java | 3 ++- .../modules/xz/special/entity/XzTemporaryElectricitySafe.java | 2 +- .../xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java index 145bec036..6a0cbae60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java @@ -182,7 +182,7 @@ public class XzBlindPlatePlugSafe implements Serializable { @TableField(exist = false) @Excel(name = "作业人名称", width = 15) @ApiModelProperty(value = "作业人名称") - private Long jobPersonName; + private String jobPersonName; /** * 监护人名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java index 366410587..d0e78903f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java @@ -186,9 +186,10 @@ public class XzGroundSafet implements Serializable { /** * 作业人名称 */ + @TableField(exist = false) @Excel(name = "作业人名称", width = 15) @ApiModelProperty(value = "作业人名称") - private Long jobPersonName; + private String jobPersonName; /** * 监护人名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java index dbfe9d7fb..515f99e5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java @@ -188,7 +188,7 @@ public class XzHighJobSafe implements Serializable { @TableField(exist = false) @Excel(name = "作业人名称", width = 15) @ApiModelProperty(value = "作业人名称") - private Long jobPersonName; + private String jobPersonName; /** * 监护人名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java index 02fabcc03..f237457f1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java @@ -188,7 +188,7 @@ public class XzHoistSafetyWork implements Serializable { @TableField(exist = false) @Excel(name = "作业人名称", width = 15) @ApiModelProperty(value = "作业人名称") - private Long jobPersonName; + private String jobPersonName; /** * 监护人名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java index fd5fecfc7..3d37a9d96 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java @@ -193,7 +193,7 @@ public class XzLimitSpaceSafe implements Serializable { @TableField(exist = false) @Excel(name = "作业人名称", width = 15) @ApiModelProperty(value = "作业人名称") - private Long jobPersonName; + private String jobPersonName; /** * 监护人名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java index d71ec8be7..671b7d882 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java @@ -191,9 +191,10 @@ public class XzOpenCircuitSafe implements Serializable { /** * 作业人名称 */ + @TableField(exist = false) @Excel(name = "作业人名称", width = 15) @ApiModelProperty(value = "作业人名称") - private Long jobPersonName; + private String jobPersonName; /** * 监护人名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java index b5c083301..a5d364126 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java @@ -245,7 +245,7 @@ public class XzTemporaryElectricitySafe implements Serializable { @TableField(exist = false) @Excel(name = "作业人名称", width = 15) @ApiModelProperty(value = "作业人名称") - private Long jobPersonName; + private String jobPersonName; /** * 监护人名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml index c2a1a7153..b400dac20 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml @@ -23,7 +23,7 @@ left join worker_info wi4 on t.guardian = wi4.id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record - WHERE 1 = 1 + where 1=1 and project_sn = #{param.projectSn}