1.检验检测联调修改

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

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.jyjc.api.enums;
 
 import lombok.Getter;
 
+import java.util.Arrays;
+import java.util.Optional;
+
 /**
  * @author Administrator
  */
@@ -22,4 +25,9 @@ public enum OpenBizTypeEnum {
         this.code = code;
         this.name = name;
     }
+
+    public static OpenBizTypeEnum getOneByCode(String code){
+        Optional<OpenBizTypeEnum> op = Arrays.stream(OpenBizTypeEnum.values()).filter(e->e.getCode().equals(code)).findFirst();
+        return op.orElse(null);
+    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcOpeningApplicationMapper.java

@@ -18,7 +18,8 @@ import java.util.List;
 public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningApplication> {
 
     Page<JyjcOpeningApplicationModel> selectJyjcOpeningApplicationList(@Param("page")Page<JyjcOpeningApplication> page,
-                                                                       @Param("jyjcOpeningApplicationRequstDto") JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto, @Param("applyStartTime") String applyStartTime,
+                                                                       @Param("jyjcOpeningApplicationRequstDto") JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto,
+                                                                       @Param("applyStartTime") String applyStartTime,
                                                                        @Param("currentUserId") String currentUserId,
                                                                        @Param("applyendTime") String applyendTime);
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -135,4 +135,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty("开通的业务类型")
     private String openBizType;
+
+    @ApiModelProperty("开通的业务类型名称")
+    private String openBizTypeName;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationRequstDto.java

@@ -46,4 +46,7 @@ public class JyjcOpeningApplicationRequstDto {
 
     @ApiModelProperty (value = "supervision: 监管; enterprise: 企业")
     private String type;
+
+    @ApiModelProperty("开通业务类型")
+    private String openBizType;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -32,7 +32,12 @@
             <if test="jyjcOpeningApplicationRequstDto.unitCode != '' and jyjcOpeningApplicationRequstDto.unitCode != null">
                 and (a.unit_code = #{jyjcOpeningApplicationRequstDto.unitCode} OR a.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) )
             </if>
-
+            <if test="jyjcOpeningApplicationRequstDto.openBizType != '' and jyjcOpeningApplicationRequstDto.openBizType != null">
+                and a.open_biz_type = #{jyjcOpeningApplicationRequstDto.openBizType}
+            </if>
+            <if test="jyjcOpeningApplicationRequstDto.unitCodeName != '' and jyjcOpeningApplicationRequstDto.unitCodeName != null">
+                and a.unit_code_name like concat('%',#{jyjcOpeningApplicationRequstDto.unitCodeName},'%')
+            </if>
         </where>
         order by sequence_nbr desc
 

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

@@ -85,13 +85,13 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Value("${process-definition-key.jyjc.openapplication:}")
     private String processDefinitionKey;
 
-    @Value("${jy.user-post:6615}")
+    @Value("${jy.user-post:66151}")
     private String jyUserPost;
 
     @Value("${jy.cert.type.code:1233-1}")
     private String jyCertTypeCode;
 
-    @Value("${jc.user-post:6615}")
+    @Value("${jc.user-post:66152}")
     private String jcUserPost;
 
     @Value("${jc.cert.type.code:1233-2}")
@@ -299,11 +299,20 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         Page<JyjcOpeningApplicationModel> result = jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, dto, applyStartTime, currentUserId, applyEndTime);
         for (JyjcOpeningApplicationModel record : result.getRecords()) {
             record.setIdentityType(dto.getType());
+            record.setOpenBizTypeName(this.getOpenBizTypeName(record.getOpenBizType()));
         }
         return result;
     }
 
 
+    private String getOpenBizTypeName(String openBizType) {
+        return Optional.ofNullable(OpenBizTypeEnum.getOneByCode(openBizType))
+                .map(OpenBizTypeEnum::getName)
+                .orElse("");
+    }
+
+
+
     /**
      * 获取详情跳转
      *