1.报检规则修改0704

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/InspectionCompanyType.java

@@ -14,7 +14,8 @@ public enum InspectionCompanyType {
      * 检验单位分类
      */
     LEGAL("legal","法定"),
-    THIRD("third","第3方");
+    THIRD("third","第3方"),
+    ALL("all","全部机构");
 
     private String code;
     private String name;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/EnableRuleDataPreparationListener.java

@@ -137,6 +137,7 @@ public class EnableRuleDataPreparationListener implements ApplicationListener<In
         inspectionEquipInfo.setLastNoAcceptInspectionCode(this.buildLastNoAcceptInspectionCode(jyjcInspectionApplicationNoAcceptLog));
         // 是否球罐 0 1 转 boolean
         inspectionEquipInfo.setIsBallValve(!"0".equals(registrationInfo.getWhetherSphericalTank()));
+        inspectionEquipInfo.setAppSeq(equipInfoModel.getAppSeq());
         // 触发规则
         publisher.publish(new TouchRuleEvent(this, inspectionEquipInfo));
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/rule/InspectionEquipInfo.java

@@ -60,4 +60,7 @@ public class InspectionEquipInfo implements Serializable {
     @ApiModelProperty(value = "是否是球阀,压力容器定向规则使用")
     private Boolean isBallValve = false;
 
+    @ApiModelProperty(value = "申请表主键")
+    private String appSeq;
+
 }