fix(jg):登记证查询添加车牌号字段

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java

@@ -82,6 +82,9 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "数据类型：监管/行政审批局，企业")
     private String dataType;
 
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+
     @ApiModelProperty(value = "设备使用地址")
     private String equUseAddress;
 

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/JgUseRegistrationManageServiceImpl.java

@@ -34,6 +34,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -200,7 +201,30 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                                                                                 JgUseRegistrationManageDto dto,
                                                                                 String sort) {
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
-        return jgUseRegistrationManageMapper.queryForPage(page, dto, sortMap);
+        Page<JgUseRegistrationManageDto> manageDtoPage = jgUseRegistrationManageMapper.queryForPage(page, dto, sortMap);
+
+        // 为车用气瓶登记添加车牌号
+        List<String> useRegistrationCodes = manageDtoPage.getRecords().stream()
+                .filter(x -> BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(x.getRegType()))
+                .map(JgUseRegistrationManageDto::getUseRegistrationCode)
+                .collect(Collectors.toList());
+
+        if (!useRegistrationCodes.isEmpty()) {
+            Map<String, JgVehicleInformation> vehicleInfoMap = jgVehicleInformationMapper.selectList(
+                    new LambdaQueryWrapper<JgVehicleInformation>().in(JgVehicleInformation::getUseRegistrationCode, useRegistrationCodes)
+            ).stream().collect(Collectors.toMap(JgVehicleInformation::getUseRegistrationCode, Function.identity()));
+
+            manageDtoPage.getRecords().forEach(x -> {
+                if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(x.getRegType())) {
+                    JgVehicleInformation vehicleInformation = vehicleInfoMap.get(x.getUseRegistrationCode());
+                    if (vehicleInformation != null) {
+                        x.setCarNumber(vehicleInformation.getCarNumber());
+                    }
+                }
+            });
+        }
+        return manageDtoPage;
+
     }
 
     /**