费用分页返回附件

device-api-service/src/main/java/com/xy/service/DeviceSimChargeServiceImpl.java

@@ -3,7 +3,9 @@ package com.xy.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.collections.list.JArrayList;
 import com.xy.dto.DeviceSimChargeDto;
+import com.xy.dto.OrderMercManageDto;
 import com.xy.entity.DeviceSimCharge;
 import com.xy.mapper.DeviceSimChargeMapper;
 import com.xy.utils.Emptys;
@@ -17,6 +19,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
+import static com.xy.utils.Beans.copy;
 import static com.xy.utils.PlusBeans.toIPage;
 import static com.xy.utils.PlusBeans.toPageBean;
 
@@ -34,6 +39,8 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "设备流量卡充值表")
 public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMapper, DeviceSimCharge> implements DeviceSimChargeService {
 
+    private OrderMercManageService orderMercManageService;
+
     @PostMapping("page")
     @ApiOperation("分页查询")
     public R<PageBean<DeviceSimChargeDto.Vo>> page(@RequestBody DeviceSimChargeDto.Page page) {
@@ -42,7 +49,15 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
                 .build()
                 .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceSimCharge::getCreateTime);
         IPage<DeviceSimCharge> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
-        return R.ok(toPageBean(DeviceSimChargeDto.Vo.class, iPage));
+        PageBean<DeviceSimChargeDto.Vo> voPageBean = toPageBean(DeviceSimChargeDto.Vo.class, iPage);
+        List<DeviceSimChargeDto.Vo> records = voPageBean.getRecords();
+        if (Emptys.check(records)) {
+            copy(records).target(
+                    () -> orderMercManageService.list(new OrderMercManageDto.SelectList().setId(new JArrayList<>(records).getProperty(DeviceSimChargeDto.Vo::getOrderId))).getData()
+                    , DeviceSimChargeDto.Vo::getOrderId, DeviceSimChargeDto.Vo::getFiles, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getFiles
+            ).builder();
+        }
+        return R.ok(voPageBean);
     }
 
 }

device-api/src/main/java/com/xy/dto/DeviceSimChargeDto.java

@@ -65,7 +65,8 @@ public class DeviceSimChargeDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
-
+        @ApiModelProperty(value = "附件")
+        private String files;
     }
 
 }