diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index 4cdc71c..1765927 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -1,6 +1,8 @@ sdk: server: - app-key: bbab676d39e443cfacc037ee15fdad37 +# app-key: bbab676d39e443cfacc037ee15fdad37 + #港务局线上appKey + app-key: c7fbb137c1a0484c8b0cca8ac9937c55 client: gateway: url: ${common.gateway.network.http.external} diff --git a/start/src/main/resources/templates/primeport.html b/start/src/main/resources/templates/primeport.html index 23fcd02..804c4de 100644 --- a/start/src/main/resources/templates/primeport.html +++ b/start/src/main/resources/templates/primeport.html @@ -1,4 +1,4 @@ ---
\ No newline at end of file + })();
\ No newline at end of file diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java index 3526033..3112426 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java @@ -33,6 +33,6 @@ public interface VehicleApplyMapper extends BaseMapper { VehicleApplyDO getInfoById(Long id); - List getAppCount(@Param("params") Map parmas); + List getAppCount(@Param("params") Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java index 09f6b7c..28f89de 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java @@ -22,6 +22,7 @@ import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -88,7 +89,20 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl getAppCount(Map parmas) { - return vehicleApplyMapper.getAppCount(parmas); + List appCount = vehicleApplyMapper.getAppCount(parmas); + if (appCount.isEmpty()) { + return new ArrayList<>(); + } + List appCountDTOList = new ArrayList<>(); + appCount.forEach(item ->{ + AppCountDTO appCountDTO = new AppCountDTO(); + appCountDTO.setType(item.getType()); + appCountDTO.setBelongType(item.getBelongType()); + appCountDTO.setAuditUserId(item.getAuditUserId()); + appCountDTO.setWaitAuditCount(item.getWaitAuditCount()); + appCountDTOList.add(appCountDTO); + }); + return appCountDTOList; } } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 0d5aa79..87c3c75 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -146,7 +146,7 @@ LEFT JOIN mkmj m on va.mkmj_id = m.id WHERE va.id = #{id} - SELECT tmp.type, tmp.belong_type,