Merge branch 'dev_2.6.0' of http://120.46.174.3:8099/zlmy/zlmy-cloud into dev_2.6.0

zlmy-modules/zlmy-boot/doc/v2.6.0/修改sql.md

 
 # 许可证修改备注字段为 text类型
 ALTER TABLE t_hazard_license
-ALTER COLUMN remarks TYPE TEXT;
\ No newline at end of file
+ALTER COLUMN remarks TYPE TEXT;
+
+# 添加许可证表字段
+ALTER TABLE t_hazard_license ADD COLUMN power_unit_signature TEXT;
\ No newline at end of file

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

@@ -123,6 +123,10 @@ public class THazardLicense extends SuperModel
   @TableField("guardian_signature")
   private String guardianSignature;
 
+  @ApiModelProperty(value = "供电单位签字")
+  @TableField("power_unit_signature")
+  private String powerUnitSignature;
+
   public static final String ID ="id";
   public static final String PLAN_ID ="plan_id";
   public static final String WORK_TYPE ="work_type";

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -362,7 +362,9 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         if (orgTypeByOrgId == 0) {
             if (WorkTypeEnum.CONFINED_SPACE_WORK.getValue().equals(workTypeValue)) {
                 processDefinitionKey = "hazardousTaskConfinedSpace";
-            } else {
+            } else if (WorkTypeEnum.CIRCULATING_FUMIGATION.getValue().equals(workTypeValue)) {
+                processDefinitionKey = "hazardousTaskStifling";
+            }else {
                 processDefinitionKey = "hazardousTaskCommon";
             }
         } else if (orgTypeByOrgId == 1) {