1.规则回调方法增加参数，是否进行地市过滤，默认过滤进行地市的筛选

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/action/RuleActionHandler.java

@@ -44,7 +44,13 @@ public class RuleActionHandler {
         this.commonserviceImpl = commonserviceImpl;
     }
 
-    public void filterInspectionOrgAction(Object bizObj, String itemCode) {
+    /**
+     *  规则回调方法
+     * @param bizObj 请求变量参数
+     * @param itemCode 核对项目编码，多个用逗号分割
+     * @param isMatchArea 是否进行属地过滤（检验检测机构的开通区域包含设备归属地市），true-过滤，false-不过滤
+     */
+    public void filterInspectionOrgAction(Object bizObj, String itemCode, Boolean isMatchArea) {
         InspectionEquipInfo inspectionEquipInfo = (InspectionEquipInfo) bizObj;
         try {
             List<TzBaseUnitLicence> unitLicenceList = getBaseUnitLicenceList(itemCode);

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * @author LiuLin
@@ -19,11 +20,11 @@ public class InspectionEquipInfo implements Serializable {
     @ApiModelProperty(value = "设备ID")
     private String record;
 
-    @ApiModelProperty(value = "检验类型")
+    @ApiModelProperty(value = "检验类型（大类与菜单对应）")
     private String bizType;
 
     @ApiModelProperty(value = "技术参数")
-    private Object techParams;
+    private Map<String, Object> techParams;
 
     @ApiModelProperty(value = "是否防爆")
     private Boolean isAntiExplosion;
@@ -37,6 +38,6 @@ public class InspectionEquipInfo implements Serializable {
     @ApiModelProperty(value = "设备种类")
     private String equList;
 
-    @ApiModelProperty(value = "检验类型")
+    @ApiModelProperty(value = "检验类型（小类）")
     private String inspectionType;
 }