From bfb79c9b6ae427f214cdf87b64179cd848e3c328 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 17 May 2024 19:44:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E7=A7=8D=E5=8A=A0=E4=B8=8A=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BAid=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../special/entity/XzBlindPlatePlugSafe.java | 25 +++++++++-------- .../xz/special/entity/XzGroundSafet.java | 17 ++++++++---- .../xz/special/entity/XzHighJobSafe.java | 17 +++++++++--- .../xz/special/entity/XzHoistSafetyWork.java | 18 ++++++++++--- .../xz/special/entity/XzLimitSpaceSafe.java | 27 ++++++++++--------- .../xz/special/entity/XzOpenCircuitSafe.java | 23 ++++++++++------ .../entity/XzSpecialOperationFireSafety.java | 15 ++++++----- .../entity/XzTemporaryElectricitySafe.java | 21 ++++++++++----- .../mapper/xml/XzBlindPlatePlugSafeMapper.xml | 2 ++ .../mapper/xml/XzGroundSafetMapper.xml | 2 ++ .../mapper/xml/XzHighJobSafeMapper.xml | 2 ++ .../mapper/xml/XzHoistSafetyWorkMapper.xml | 2 ++ .../mapper/xml/XzLimitSpaceSafeMapper.xml | 2 ++ .../mapper/xml/XzOpenCircuitSafeMapper.xml | 2 ++ .../XzSpecialOperationFireSafetyMapper.xml | 2 ++ .../xml/XzTemporaryElectricitySafeMapper.xml | 2 ++ 16 files changed, 122 insertions(+), 57 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 e59e53cfd..2503f3c9b 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 @@ -119,6 +119,13 @@ public class XzBlindPlatePlugSafe implements Serializable { private String workTicketCode; @ApiModelProperty(value = "最终验收状态1进行中2已闭合") private Integer finalAcceptanceStatus; + + /** + * 作业负责人 + */ + @Excel(name = "作业负责人", width = 15) + @ApiModelProperty(value = "作业负责人") + private java.lang.Long assignmentPersonInCharge; @ApiModelProperty(value = "设备、管道名称") private String devPipelineName; @ApiModelProperty(value = "管道参数") @@ -154,13 +161,6 @@ public class XzBlindPlatePlugSafe implements Serializable { @ApiModelProperty(value = "编制人日期") private java.util.Date organizerDate; - /** - * 作业负责人名称 - */ - @Excel(name = "作业负责人名称", width = 15) - @ApiModelProperty(value = "作业负责人名称") - private String assignmentPersonInChargeName; - /** * 作业人名称 */ @@ -209,8 +209,11 @@ public class XzBlindPlatePlugSafe implements Serializable { private Integer hiddenDangerNum; - //@TableField(exist = false) - //@ApiModelProperty(value = "星纵-气体分析列表") - //private List xzGasAnalyzeList; - + /** + * 作业负责人名称 + */ + @TableField(exist = false) + @Excel(name = "作业负责人名称", width = 15) + @ApiModelProperty(value = "作业负责人名称") + private String assignmentPersonInChargeName; } 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 ad0306a9e..c60ad74df 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 @@ -138,11 +138,11 @@ public class XzGroundSafet implements Serializable { private Integer finalAcceptanceStatus; /** - * 作业负责人名称 + * 作业负责人 */ - @Excel(name = "作业负责人名称", width = 15) - @ApiModelProperty(value = "作业负责人名称") - private String assignmentPersonInChargeName; + @Excel(name = "作业负责人", width = 15) + @ApiModelProperty(value = "作业负责人") + private java.lang.Long assignmentPersonInCharge; /** * 作业人名称 @@ -187,7 +187,6 @@ public class XzGroundSafet implements Serializable { private String operatingUnitName; - @TableField(exist = false) @ApiModelProperty(value = "安全隐患总数") private Integer hiddenDangerNum; @@ -197,4 +196,12 @@ public class XzGroundSafet implements Serializable { @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") private Integer engineeringState; + + /** + * 作业负责人名称 + */ + @TableField(exist = false) + @Excel(name = "作业负责人名称", width = 15) + @ApiModelProperty(value = "作业负责人名称") + private String assignmentPersonInChargeName; } 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 67d9a6350..11e3d9f2e 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 @@ -131,11 +131,12 @@ public class XzHighJobSafe implements Serializable { private Integer finalAcceptanceStatus; /** - * 作业负责人名称 + * 作业负责人 */ - @Excel(name = "作业负责人名称", width = 15) - @ApiModelProperty(value = "作业负责人名称") - private String assignmentPersonInChargeName; + @Excel(name = "作业负责人", width = 15) + @ApiModelProperty(value = "作业负责人") + private java.lang.Long assignmentPersonInCharge; + /** * 作业人名称 @@ -196,4 +197,12 @@ public class XzHighJobSafe implements Serializable { @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") private Integer engineeringState; + + /** + * 作业负责人名称 + */ + @TableField(exist = false) + @Excel(name = "作业负责人名称", width = 15) + @ApiModelProperty(value = "作业负责人名称") + private String assignmentPersonInChargeName; } 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 5fb8fa0ca..24228b445 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 @@ -140,12 +140,14 @@ public class XzHoistSafetyWork implements Serializable { private String workTicketCode; @ApiModelProperty(value = "最终验收状态1进行中2已闭合") private Integer finalAcceptanceStatus; + /** - * 作业负责人名称 + * 作业负责人 */ - @Excel(name = "作业负责人名称", width = 15) - @ApiModelProperty(value = "作业负责人名称") - private java.lang.String assignmentPersonInChargeName; + @Excel(name = "作业负责人", width = 15) + @ApiModelProperty(value = "作业负责人") + private java.lang.Long assignmentPersonInCharge; + /** * 吊装作业人名称 @@ -207,4 +209,12 @@ public class XzHoistSafetyWork implements Serializable { @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") private Integer engineeringState; + + /** + * 作业负责人名称 + */ + @TableField(exist = false) + @Excel(name = "作业负责人名称", width = 15) + @ApiModelProperty(value = "作业负责人名称") + private String assignmentPersonInChargeName; } 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 9f12172dd..3f9e44a0b 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 @@ -65,12 +65,6 @@ public class XzLimitSpaceSafe implements Serializable { @Excel(name = "作业单位", width = 15) @ApiModelProperty(value = "作业单位") private java.lang.Long operatingUnit; - /** - * 作业负责人 - */ - @Excel(name = "作业负责人", width = 15) - @ApiModelProperty(value = "作业负责人") - private java.lang.Long assignmentPersonInCharge; /** * 安全交底人 */ @@ -135,6 +129,13 @@ public class XzLimitSpaceSafe implements Serializable { private java.lang.String workTicketCode; @ApiModelProperty(value = "最终验收状态1进行中2已闭合") private Integer finalAcceptanceStatus; + + /** + * 作业负责人 + */ + @Excel(name = "作业负责人", width = 15) + @ApiModelProperty(value = "作业负责人") + private java.lang.Long assignmentPersonInCharge; @ApiModelProperty(value = "有毒有害气体信息") private java.lang.String toxicAndHarmfulGasInformation; @ApiModelProperty(value = "可燃气体信息") @@ -160,12 +161,6 @@ public class XzLimitSpaceSafe implements Serializable { @ApiModelProperty(value = "其他安全措施") private String otherSafeMeasure; - /** - * 作业负责人名称 - */ - @Excel(name = "作业负责人名称", width = 15) - @ApiModelProperty(value = "作业负责人名称") - private java.lang.String assignmentPersonInChargeName; /** * 作业人名称 @@ -219,4 +214,12 @@ public class XzLimitSpaceSafe implements Serializable { @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") private Integer engineeringState; + + /** + * 作业负责人名称 + */ + @TableField(exist = false) + @Excel(name = "作业负责人名称", width = 15) + @ApiModelProperty(value = "作业负责人名称") + private String assignmentPersonInChargeName; } 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 44e2c3676..e401d1012 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 @@ -142,6 +142,13 @@ public class XzOpenCircuitSafe implements Serializable { @ApiModelProperty(value = "最终验收状态1进行中2已闭合") private Integer finalAcceptanceStatus; + /** + * 作业负责人 + */ + @Excel(name = "作业负责人", width = 15) + @ApiModelProperty(value = "作业负责人") + private java.lang.Long assignmentPersonInCharge; + /** * 作业人名称 */ @@ -170,13 +177,6 @@ public class XzOpenCircuitSafe implements Serializable { private String acceptTheInformantName; - /** - * 作业负责人名称 - */ - @Excel(name = "作业负责人名称", width = 15) - @ApiModelProperty(value = "作业负责人名称") - private String assignmentPersonInChargeName; - /** * 作业申请单位名称 @@ -194,7 +194,6 @@ public class XzOpenCircuitSafe implements Serializable { private String operatingUnitName; - @TableField(exist = false) @ApiModelProperty(value = "安全隐患总数") private Integer hiddenDangerNum; @@ -204,4 +203,12 @@ public class XzOpenCircuitSafe implements Serializable { @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") private Integer engineeringState; + + /** + * 作业负责人名称 + */ + @TableField(exist = false) + @Excel(name = "作业负责人名称", width = 15) + @ApiModelProperty(value = "作业负责人名称") + private String assignmentPersonInChargeName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java index 832647a7c..72c6851e1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java @@ -147,12 +147,7 @@ public class XzSpecialOperationFireSafety implements Serializable { @Excel(name = "作业负责人", width = 15) @ApiModelProperty(value = "作业负责人") private java.lang.Long assignmentPersonInCharge; - /** - * 作业负责人名称 - */ - @Excel(name = "作业负责人名称", width = 15) - @ApiModelProperty(value = "作业负责人名称") - private java.lang.String assignmentPersonInChargeName; + /** * 安全交底人名称 */ @@ -199,4 +194,12 @@ public class XzSpecialOperationFireSafety implements Serializable { @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") private Integer engineeringState; + + /** + * 作业负责人名称 + */ + @TableField(exist = false) + @Excel(name = "作业负责人名称", width = 15) + @ApiModelProperty(value = "作业负责人名称") + private String assignmentPersonInChargeName; } 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 b93567ad7..f8c10c619 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 @@ -178,17 +178,17 @@ public class XzTemporaryElectricitySafe implements Serializable { private String workTicketCode; @ApiModelProperty(value = "最终验收状态1进行中2已闭合") private Integer finalAcceptanceStatus; + + /** + * 作业负责人 + */ + @Excel(name = "作业负责人", width = 15) + @ApiModelProperty(value = "作业负责人") + private java.lang.Long assignmentPersonInCharge; @ApiModelProperty(value = "可燃气体分析(分析时间和可燃气体检测结果）") private String combustibleGasAnalysis; - /** - * 作业负责人名称 - */ - @Excel(name = "作业负责人名称", width = 15) - @ApiModelProperty(value = "作业负责人名称") - private String assignmentPersonInChargeName; - /** * 作业人名称 */ @@ -244,4 +244,11 @@ public class XzTemporaryElectricitySafe implements Serializable { private Integer engineeringState; + /** + * 作业负责人名称 + */ + @TableField(exist = false) + @Excel(name = "作业负责人名称", width = 15) + @ApiModelProperty(value = "作业负责人名称") + private String assignmentPersonInChargeName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml index ff2a0b275..afdf77d31 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml @@ -6,6 +6,7 @@ ei1.enterprise_name as jobApplicationUnitName, ei2.enterprise_name as operatingUnitName, IFNULL(tp.hidden_danger_num, 0) hidden_danger_num, + su.real_name as assignmentPersonInChargeName, (case when t.final_acceptance_status = 2 then 4 when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and @@ -25,6 +26,7 @@ from xz_blind_plate_plug_safe t left join enterprise_info ei1 on t.job_application_unit = ei1.id left join enterprise_info ei2 on t.operating_unit = ei2.id + left join system_user su on t.assignment_person_in_charge=su.user_id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record WHERE 1 = 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml index 73ec75190..185ceb8f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml @@ -5,6 +5,7 @@ t.*, ei2.enterprise_name as operatingUnitName, IFNULL(tp.hidden_danger_num, 0) hidden_danger_num, + su.real_name as assignmentPersonInChargeName, (case when t.final_acceptance_status = 2 then 4 when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and @@ -23,6 +24,7 @@ from xz_ground_safet t left join enterprise_info ei2 on t.operating_unit = ei2.id + left join system_user su on t.assignment_person_in_charge=su.user_id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record WHERE 1 = 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml index 08c803734..d662fdc05 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml @@ -6,6 +6,7 @@ ei1.enterprise_name as jobApplicationUnitName, ei2.enterprise_name as operatingUnitName, IFNULL(tp.hidden_danger_num, 0) hidden_danger_num, + su.real_name as assignmentPersonInChargeName, (case when t.final_acceptance_status = 2 then 4 when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and @@ -25,6 +26,7 @@ from xz_high_job_safe t left join enterprise_info ei1 on t.job_application_unit = ei1.id left join enterprise_info ei2 on t.operating_unit = ei2.id + left join system_user su on t.assignment_person_in_charge=su.user_id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml index 5d4a291ac..b687218c3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml @@ -6,6 +6,7 @@ ei1.enterprise_name as jobApplicationUnitName, ei2.enterprise_name as operatingUnitName, IFNULL(tp.hidden_danger_num, 0) hidden_danger_num, + su.real_name as assignmentPersonInChargeName, (case when t.final_acceptance_status = 2 then 4 when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and @@ -25,6 +26,7 @@ from xz_hoist_safety_work t left join enterprise_info ei1 on t.job_application_unit = ei1.id left join enterprise_info ei2 on t.operating_unit = ei2.id + left join system_user su on t.assignment_person_in_charge=su.user_id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record WHERE 1 = 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzLimitSpaceSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzLimitSpaceSafeMapper.xml index 759bdffc5..a428786ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzLimitSpaceSafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzLimitSpaceSafeMapper.xml @@ -6,6 +6,7 @@ ei1.enterprise_name as jobApplicationUnitName, ei2.enterprise_name as operatingUnitName, IFNULL(tp.hidden_danger_num, 0) hidden_danger_num, + su.real_name as assignmentPersonInChargeName, (case when t.final_acceptance_status = 2 then 4 when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and @@ -25,6 +26,7 @@ from xz_limit_space_safe t left join enterprise_info ei1 on t.job_application_unit = ei1.id left join enterprise_info ei2 on t.operating_unit = ei2.id + left join system_user su on t.assignment_person_in_charge=su.user_id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record WHERE 1 = 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml index 33b3352a1..7d9514114 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml @@ -6,6 +6,7 @@ ei1.enterprise_name as jobApplicationUnitName, ei2.enterprise_name as operatingUnitName, IFNULL(tp.hidden_danger_num, 0) hidden_danger_num, + su.real_name as assignmentPersonInChargeName, (case when t.final_acceptance_status = 2 then 4 when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and @@ -25,6 +26,7 @@ from xz_open_circuit_safe t left join enterprise_info ei1 on t.job_application_unit = ei1.id left join enterprise_info ei2 on t.operating_unit = ei2.id + left join system_user su on t.assignment_person_in_charge=su.user_id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record WHERE 1 = 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml index 67598266c..1110f6066 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml @@ -6,6 +6,7 @@ ei1.enterprise_name as jobApplicationUnitName, ei2.enterprise_name as operatingUnitName, IFNULL(tp.hidden_danger_num, 0) hidden_danger_num, + su.real_name as assignmentPersonInChargeName, (case when t.final_acceptance_status = 2 then 4 when t.hot_work_execution_begin_time is not null and t.hot_work_execution_begin_time != '' and @@ -25,6 +26,7 @@ from xz_special_operation_fire_safety t left join enterprise_info ei1 on t.job_application_unit = ei1.id left join enterprise_info ei2 on t.operating_unit = ei2.id + left join system_user su on t.assignment_person_in_charge=su.user_id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record WHERE 1 = 1 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 88ae1aa52..1d881ddcc 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 @@ -5,6 +5,7 @@ t.*, ei2.enterprise_name as operatingUnitName, IFNULL(tp.hidden_danger_num, 0) hidden_danger_num, + su.real_name as assignmentPersonInChargeName, (case when t.final_acceptance_status = 2 then 4 when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and @@ -23,6 +24,7 @@ from xz_temporary_electricity_safe t left join enterprise_info ei2 on t.operating_unit = ei2.id + left join system_user su on t.assignment_person_in_charge=su.user_id LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num from xz_security_quality_inspection_record where 1=1