特种作业人员bug修改

src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java

@@ -156,6 +156,22 @@ public class XzBlindPlatePlugSafe implements Serializable {
     private String pipelineParameter;
     @ApiModelProperty(value = "盲板参数")
     private String blindPlateParameter;
+    /**
+     * 作业实施时间开始
+     */
+    @Excel(name = "作业实施时间开始", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "作业实施时间开始")
+    private java.util.Date workExecutionBeginTime;
+    /**
+     * 作业实施时间结束
+     */
+    @Excel(name = "作业实施时间结束", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "作业实施时间结束")
+    private java.util.Date workExecutionEndTime;
     /**
      * 作业申请单位名称
      */

src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java

@@ -169,6 +169,8 @@ public class XzHoistSafetyWork implements Serializable {
     @Excel(name = "作业负责人", width = 15)
     @ApiModelProperty(value = "作业负责人")
     private java.lang.Long assignmentPersonInCharge;
+    @ApiModelProperty(value = "吊装作业人")
+    private Long hoistJobPerson;
     /**
      * 作业负责人名称
      */
@@ -192,12 +194,12 @@ public class XzHoistSafetyWork implements Serializable {
     private String operatingUnitName;
 
     /**
-     * 作业人名称
+     * 吊装作业人名称
      */
     @TableField(exist = false)
-    @Excel(name = "作业人名称", width = 15)
+    @Excel(name = "吊装作业人名称", width = 15)
-    @ApiModelProperty(value = "作业人名称")
+    @ApiModelProperty(value = "吊装作业人名称")
-    private String jobPersonName;
+    private String hoistJobPersonName;
 
     /**
      * 监护人名称
@@ -240,4 +242,6 @@ public class XzHoistSafetyWork implements Serializable {
     @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
     private Integer engineeringState;
 
+    @ApiModelProperty(value = "指挥人员名称")
+    private String commanderName;
 }

src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java

@@ -143,7 +143,7 @@ public class XzTemporaryElectricitySafe implements Serializable {
      */
     @Excel(name = "用电人", width = 15)
     @ApiModelProperty(value = "用电人")
-    private String electricityCustomer;
+    private Long electricityCustomer;
 
     /**
      * 电工证号1
@@ -270,6 +270,8 @@ public class XzTemporaryElectricitySafe implements Serializable {
     @ApiModelProperty(value = "接受交底人名称")
     private String acceptTheInformantName;
 
+    @ApiModelProperty(value = "用电人名称")
+    private String electricityCustomerName;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "安全隐患总数")

src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml

@@ -10,7 +10,19 @@
         wi2.worker_name     as          safetyInformantName,
         wi3.worker_name     as          acceptTheInformantName,
         wi4.worker_name     as          guardianName,
-        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
+        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
+        (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
+                  t.work_execution_begin_time > DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 1
+             when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and
+                  t.work_execution_end_time is not null and
+                  t.work_execution_end_time != ''
+                 and t.work_execution_end_time >= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S') and
+                  t.work_execution_begin_time <= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 2
+             else 3 END)    as          engineering_state
     </sql>
     <sql id="selectTable">
         select
@@ -33,7 +45,7 @@
             and enterprise_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
-        AND type = 1
+        AND type = 4
         GROUP BY engineering_id) tp ON t.id = tp.engineering_id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzBlindPlatePlugSafe">

src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml

@@ -8,7 +8,19 @@
         wi2.worker_name     as          safetyInformantName,
         wi3.worker_name     as          acceptTheInformantName,
         wi4.worker_name     as          guardianName,
-        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
+        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
+        (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
+                  t.work_execution_begin_time > DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 1
+             when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and
+                  t.work_execution_end_time is not null and
+                  t.work_execution_end_time != ''
+                 and t.work_execution_end_time >= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S') and
+                  t.work_execution_begin_time <= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 2
+             else 3 END)    as          engineering_state
     </sql>
     <sql id="selectTable">
         select
@@ -29,7 +41,7 @@
             and enterprise_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
-        AND type = 1
+        AND type = 8
         GROUP BY engineering_id) tp ON t.id = tp.engineering_id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzGroundSafet">

src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml

@@ -10,7 +10,19 @@
         wi2.worker_name     as          safetyInformantName,
         wi3.worker_name     as          acceptTheInformantName,
         wi4.worker_name     as          guardianName,
-        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
+        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
+        (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
+                  t.work_execution_begin_time > DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 1
+             when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and
+                  t.work_execution_end_time is not null and
+                  t.work_execution_end_time != ''
+                 and t.work_execution_end_time >= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S') and
+                  t.work_execution_begin_time <= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 2
+             else 3 END)    as          engineering_state
     </sql>
     <sql id="selectTable">
         select
@@ -33,8 +45,7 @@
             and enterprise_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
-        AND type = 1
+        AND type = 5 BY engineering_id) tp ON t.id = tp.engineering_id
-        GROUP BY engineering_id) tp ON t.id = tp.engineering_id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzHighJobSafe">
         <include refid="selectTable">

src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml

@@ -8,7 +8,22 @@
         su.real_name        as          assignmentPersonInChargeName,
         wi2.worker_name     as          safetyInformantName,
         wi3.worker_name     as          acceptTheInformantName,
-        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
+        wi5.worker_name     as          siSuoPersonName,
+        wi6.worker_name     as          hoistJobPersonName,
+        wi7.worker_name     as          commanderName,
+        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
+        (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
+                  t.work_execution_begin_time > DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 1
+             when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and
+                  t.work_execution_end_time is not null and
+                  t.work_execution_end_time != ''
+                 and t.work_execution_end_time >= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S') and
+                  t.work_execution_begin_time <= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 2
+             else 3 END)    as          engineering_state
     </sql>
     <sql id="selectTable">
         select
@@ -20,6 +35,9 @@
         left join worker_info wi2 on t.safety_informant = wi2.id
         left join worker_info wi3 on t.accept_the_informant = wi3.id
         left join worker_info wi4 on t.guardian = wi4.id
+        left join worker_info wi5 on t.si_suo_person = wi5.id
+        left join worker_info wi6 on t.hoist_job_person = wi6.id
+        left join worker_info wi7 on t.commander = wi7.id
         LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
         from xz_security_quality_inspection_record
         WHERE 1 = 1
@@ -30,7 +48,7 @@
             and enterprise_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
-        AND type = 1
+        AND type = 6
         GROUP BY engineering_id) tp ON t.id = tp.engineering_id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzHoistSafetyWork">

src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzLimitSpaceSafeMapper.xml

@@ -10,7 +10,19 @@
         wi2.worker_name     as          safetyInformantName,
         wi3.worker_name     as          acceptTheInformantName,
         wi4.worker_name     as          guardianName,
-        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
+        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
+        (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
+                  t.work_execution_begin_time > DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 1
+             when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and
+                  t.work_execution_end_time is not null and
+                  t.work_execution_end_time != ''
+                 and t.work_execution_end_time >= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S') and
+                  t.work_execution_begin_time <= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 2
+             else 3 END)    as          engineering_state
     </sql>
     <sql id="selectTable">
         select
@@ -33,7 +45,7 @@
             and enterprise_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
-        AND type = 1
+        AND type = 6
         GROUP BY engineering_id) tp ON t.id = tp.engineering_id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzLimitSpaceSafe">

src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml

@@ -9,7 +9,19 @@
         wi2.worker_name     as          safetyInformantName,
         wi3.worker_name     as          acceptTheInformantName,
         wi4.worker_name     as          guardianName,
-        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
+        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
+        (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
+                  t.work_execution_begin_time > DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 1
+             when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and
+                  t.work_execution_end_time is not null and
+                  t.work_execution_end_time != ''
+                 and t.work_execution_end_time >= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S') and
+                  t.work_execution_begin_time <= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 2
+             else 3 END)    as          engineering_state
     </sql>
     <sql id="selectTable">
         select
@@ -31,7 +43,7 @@
             and enterprise_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
-        AND type = 1
+        AND type = 9
         GROUP BY engineering_id) tp ON t.id = tp.engineering_id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzOpenCircuitSafe">

src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml

@@ -10,7 +10,19 @@
         wi2.worker_name     as          safetyInformantName,
         wi3.worker_name     as          acceptTheInformantName,
         wi4.worker_name     as          guardianName,
-        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
+        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
+        (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
+                  t.hot_work_execution_begin_time > DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 1
+             when t.hot_work_execution_begin_time is not null and t.hot_work_execution_begin_time != '' and
+                  t.hot_work_execution_end_time is not null and
+                  t.hot_work_execution_end_time != ''
+                 and t.hot_work_execution_end_time >= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S') and
+                  t.hot_work_execution_begin_time <= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 2
+             else 3 END)    as          engineering_state
     </sql>
     <sql id="selectTable">
         select

src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml

@@ -9,7 +9,20 @@
         wi2.worker_name     as          safetyInformantName,
         wi3.worker_name     as          acceptTheInformantName,
         wi4.worker_name     as          guardianName,
-        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
+        wi5.worker_name     as          electricityCustomerName,
+        IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
+        (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
+                  t.work_execution_begin_time > DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 1
+             when t.work_execution_begin_time is not null and t.work_execution_begin_time != '' and
+                  t.work_execution_end_time is not null and
+                  t.work_execution_end_time != ''
+                 and t.work_execution_end_time >= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S') and
+                  t.work_execution_begin_time <= DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%S')
+                 then 2
+             else 3 END)    as          engineering_state
     </sql>
     <sql id="selectTable">
         select
@@ -21,6 +34,7 @@
         left join worker_info wi2 on t.safety_informant = wi2.id
         left join worker_info wi3 on t.accept_the_informant = wi3.id
         left join worker_info wi4 on t.guardian = wi4.id
+        left join worker_info wi5 on t.electricity_customer = wi5.id
         LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
         from xz_security_quality_inspection_record
         where 1=1
@@ -31,7 +45,7 @@
             and enterprise_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
-        AND type = 1
+        AND type = 7
         GROUP BY engineering_id) tp ON t.id = tp.engineering_id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzTemporaryElectricitySafe">