特种作业的bug修改

This commit is contained in:
guoshengxiong 2024-05-15 21:26:24 +08:00
parent d32717d8f8
commit 6bfa57480f
8 changed files with 10 additions and 8 deletions

View File

@ -182,7 +182,7 @@ public class XzBlindPlatePlugSafe implements Serializable {
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private Long jobPersonName;
private String jobPersonName;
/**
* 监护人名称

View File

@ -186,9 +186,10 @@ public class XzGroundSafet implements Serializable {
/**
* 作业人名称
*/
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private Long jobPersonName;
private String jobPersonName;
/**
* 监护人名称

View File

@ -188,7 +188,7 @@ public class XzHighJobSafe implements Serializable {
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private Long jobPersonName;
private String jobPersonName;
/**
* 监护人名称

View File

@ -188,7 +188,7 @@ public class XzHoistSafetyWork implements Serializable {
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private Long jobPersonName;
private String jobPersonName;
/**
* 监护人名称

View File

@ -193,7 +193,7 @@ public class XzLimitSpaceSafe implements Serializable {
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private Long jobPersonName;
private String jobPersonName;
/**
* 监护人名称

View File

@ -191,9 +191,10 @@ public class XzOpenCircuitSafe implements Serializable {
/**
* 作业人名称
*/
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private Long jobPersonName;
private String jobPersonName;
/**
* 监护人名称

View File

@ -245,7 +245,7 @@ public class XzTemporaryElectricitySafe implements Serializable {
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private Long jobPersonName;
private String jobPersonName;
/**
* 监护人名称

View File

@ -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
<if test="param.projectSn != null and param.projectSn != ''">
and project_sn = #{param.projectSn}
</if>