特种加上负责人id字段

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<XzGasAnalyze> xzGasAnalyzeList;
+     */
-
+    @TableField(exist = false)
+    @Excel(name = "作业负责人名称", width = 15)
+    @ApiModelProperty(value = "作业负责人名称")
+    private String assignmentPersonInChargeName;
 }

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)
+    @Excel(name = "作业负责人", width = 15)
-    @ApiModelProperty(value = "作业负责人名称")
+    @ApiModelProperty(value = "作业负责人")
-    private String assignmentPersonInChargeName;
+    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;
 }

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)
+    @Excel(name = "作业负责人", width = 15)
-    @ApiModelProperty(value = "作业负责人名称")
+    @ApiModelProperty(value = "作业负责人")
-    private String assignmentPersonInChargeName;
+    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;
 }

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)
+    @Excel(name = "作业负责人", width = 15)
-    @ApiModelProperty(value = "作业负责人名称")
+    @ApiModelProperty(value = "作业负责人")
-    private java.lang.String assignmentPersonInChargeName;
+    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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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

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 @@
         <include refid="column"/>
         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

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

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

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

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

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

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 @@
         <include refid="column"/>
         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