1.自测bug修改

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

@@ -44,7 +44,7 @@ public enum DocumentEnum {
     AQBHZZ("aqbhzz", "安全保护装置的型式试验证书"),
     ZJHG("zjhg", "自检合格证明"),
     AZJY("azjy", "安装监检报告"),
-    ZJCY("azjy", "整机船运证明");
+    ZJCY("zjcy", "整机船运证明");
 
     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/controller/CommonController.java

@@ -116,8 +116,8 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getInspectionUnitList")
     @ApiOperation(httpMethod = "GET", value = "查询检验检测机构列表（基本信息及联系人）", notes = "查询检验检测机构列表（基本信息及联系人）")
-    public ResponseModel<List<TzBaseEnterpriseInfoDto>> getInspectionUnitList() {
-        return ResponseHelper.buildResponse(commonserviceImpl.getInspectionUnitList());
+    public ResponseModel<List<TzBaseEnterpriseInfoDto>> getInspectionUnitList(@RequestParam String openBizType) {
+        return ResponseHelper.buildResponse(commonserviceImpl.getInspectionUnitList(openBizType));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -100,8 +100,8 @@ public class CommonserviceImpl {
     }
 
 
-    public List<TzBaseEnterpriseInfoDto> getInspectionUnitList() {
-        return enterpriseInfoMapper.getInspectionUnitList();
+    public List<TzBaseEnterpriseInfoDto> getInspectionUnitList(String openBizType) {
+        return enterpriseInfoMapper.getInspectionUnitList(openBizType);
     }
 
     public TzBaseEnterpriseInfo getInspectionUnitBySequenceNbr(Long sequenceNbr) {

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

@@ -632,7 +632,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     }
 
     public List<TzBaseEnterpriseInfoDto> getInspectionUnitList() {
-        List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfos = enterpriseInfoMapper.getInspectionUnitList();
+        List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfos = enterpriseInfoMapper.getInspectionUnitList(null);
         if (ValidationUtil.isEmpty(tzBaseEnterpriseInfos)) {
             return Collections.EMPTY_LIST;
         }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -51,7 +51,7 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
     /**
      * 查找企业关联设备详情列表
      */
-    List<TzBaseEnterpriseInfoDto> getInspectionUnitList();
+    List<TzBaseEnterpriseInfoDto> getInspectionUnitList(String openBizType);
 
     List<TzBaseEnterpriseInfoDto> getInspectionUnitListByCode(@Param("list") List<String> codes, @Param("city") String city, @Param("openBizType") String openBizType);
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -166,6 +166,9 @@
 			tz_base_enterprise_info info
 				inner JOIN tz_jyjc_opening_application tjoa ON info.use_code = tjoa.unit_code
 				AND tjoa.status = '6616'
+				<if test="openBizType != null and openBizType !=''">
+					and tjoa.open_biz_type = #{openBizType}
+				</if>
 		group by info.use_code
 	</select>