Merge remote-tracking branch 'origin/dev_2.6.0' into dev_2.6.0

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/domain/THazardWorkPlanCheck.java

@@ -125,6 +125,13 @@ public class THazardWorkPlanCheck extends SuperModel
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date checkSignatureTime;
 
+  /**
+   * 签字人姓名
+   */
+  @ApiModelProperty(value = "签字人姓名")
+  @TableField("check_name")
+  private String checkName;
+
   /**
    * 作业编号
    */

zlmy-modules/zlmy-boot/src/main/resources/mapper/hazard/THazardWorkPlanCheck.xml

@@ -19,12 +19,13 @@
         <id column="workLevel" property="workLevel"/>
         <id column="stakeholderWork" property="stakeholderWork"/>
         <id column="check_signature_time" property="checkSignatureTime"/>
+        <id column="check_name" property="checkName"/>
     </resultMap>
 
     <select id="selectTHazardWorkPlanCheckList" resultMap="BaseResultMap">
         select hwpc.*,hwp.code code,hwp.work_type workType,hwp.work_level workLevel,hwp.stakeholder_work stakeholderWork
         from t_hazard_work_plan_check hwpc
-                 left join t_hazard_work_plan hwp on hwpc.plan_id = hwp.id
+        left join t_hazard_work_plan hwp on hwpc.plan_id = hwp.id
         where hwpc.status = '0' and hwpc.plan_id = #{param.planId}
         order by hwpc.create_date desc
     </select>
@@ -32,9 +33,9 @@
     <select id="selectAppTHazardWorkPlanCheckList" resultMap="BaseResultMap">
         select hwpc.*,hwp.code code,hwp.work_type workType,hwp.work_level workLevel,hwp.stakeholder_work stakeholderWork
         from t_hazard_work_plan_check hwpc
-                 left join t_hazard_work_plan hwp on hwpc.plan_id = hwp.id
+        left join t_hazard_work_plan hwp on hwpc.plan_id = hwp.id
         where hwpc.status = '0' and hwpc.plan_id = #{param.planId} and hwpc.create_by=#{param.createBy}
-        order by hwpc.create_date desc
+        order by hwpc.check_time desc
     </select>
 
     <select id="detail" resultMap="BaseResultMap">