1.安装告知打印时，资质有安改维资质调整为安改维资质+制造单位资质

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -184,9 +184,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     EventPublisher eventPublisher;
 
     /**
-     * 安装改造维修单位吱资质类型：1234
+     * 安装改造维修单位吱资质类型：1234-安改维、1236-制造单位
      */
-    @Value("${company.type.notice:1234}")
+    @Value("${company.type.notice:1234,1236}")
     private String companyType;
 
     /**
@@ -620,7 +620,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         String useCode = String.valueOf(informObj.get("installUnitCreditCode"));
         LambdaQueryWrapper<TzBaseUnitLicence> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TzBaseUnitLicence::getUnitCode, useCode);
-        wrapper.eq(TzBaseUnitLicence::getCertTypeCode, companyType);
+        // 资质支持多个显示and (certTypeCode = 'xx1' or certTypeCode = 'xx2')
+        wrapper.and(w-> {
+            String[] certTypeCodes = companyType.split(",");
+            for(String certTypeCode: certTypeCodes){
+                w.or().eq(TzBaseUnitLicence::getCertTypeCode, certTypeCode);
+            }
+        });
         wrapper.orderByDesc(TzBaseUnitLicence::getExpiryDate);
         wrapper.orderByDesc(TzBaseUnitLicence::getRecDate);
         // 去重显示3个