wenjinbiao преди 4 месеца
родител
ревизия
f2b50c3c8d

+ 5 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/passenger/passengerinfo/param/PassengerInfoIdParam.java

@@ -32,4 +32,9 @@ public class PassengerInfoIdParam {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "id不能为空")
     private String id;
+
+
+    @NotBlank(message = "查询类型不能为空")
+    private String queryType;
+
 }

+ 11 - 2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/passenger/passengerinfo/service/impl/PassengerInfoServiceImpl.java

@@ -153,15 +153,24 @@ public class PassengerInfoServiceImpl extends ServiceImpl<PassengerInfoMapper, P
 
     @Override
     public PassengerInfoDetailVo detail(PassengerInfoIdParam passengerInfoIdParam) {
-        PassengerInfo passengerInfo = this.queryEntity(passengerInfoIdParam.getId());
         PassengerInfoDetailVo detailVo = new PassengerInfoDetailVo();
+        if("1".equals(passengerInfoIdParam.getQueryType())){
+            PassengerInfo passengerInfo = this.queryEntity(passengerInfoIdParam.getId());
+            BeanUtil.copyProperties(passengerInfo,detailVo);
+        }else if("2".equals(passengerInfoIdParam.getQueryType())){
+            PassengerCheck passengerCheck = passengerCheckService.getById(passengerInfoIdParam.getId());
+            BeanUtil.copyProperties(passengerCheck,detailVo);
+        }else if("3".equals(passengerInfoIdParam.getQueryType())){
+            PassengerPass passengerPass = passengerPassService.getById(passengerInfoIdParam.getId());
+            BeanUtil.copyProperties(passengerPass,detailVo);
+        }
 
         QueryWrapper<PassengerGood> goodWrapper = new QueryWrapper<PassengerGood>().checkSqlInjection();
         List<PassengerGood> goods = passengerGoodService.list(goodWrapper.lambda().eq(PassengerGood::getPassengerId, passengerInfoIdParam.getId()));
 
         QueryWrapper<PassengerCheckRecord> checkWrapper = new QueryWrapper<PassengerCheckRecord>().checkSqlInjection();
         List<PassengerCheckRecord> checks = passengerCheckRecordService.list(checkWrapper.lambda().eq(PassengerCheckRecord::getPassengerId, passengerInfoIdParam.getId()));
-        BeanUtil.copyProperties(passengerInfo,detailVo);
+
         detailVo.setGoods(goods);
         detailVo.setChecks(checks);
         return detailVo;