|
@@ -9,6 +9,7 @@ import com.unis.framework.common.util.object.BeanUtils;
|
9
|
import com.unis.framework.excel.core.util.ExcelUtils;
|
9
|
import com.unis.framework.excel.core.util.ExcelUtils;
|
10
|
import com.unis.module.coding.controller.admin.delivery.vo.*;
|
10
|
import com.unis.module.coding.controller.admin.delivery.vo.*;
|
11
|
import com.unis.module.coding.service.caxx.CaxxService;
|
11
|
import com.unis.module.coding.service.caxx.CaxxService;
|
|
|
12
|
+import com.unis.module.coding.service.dwxx.DwxxService;
|
12
|
import io.swagger.v3.oas.annotations.Operation;
|
13
|
import io.swagger.v3.oas.annotations.Operation;
|
13
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
14
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
14
|
import lombok.extern.slf4j.Slf4j;
|
15
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -39,6 +40,8 @@ import static com.unis.framework.common.pojo.CommonResult.success;
|
39
|
public class DeliverySpareController {
|
40
|
public class DeliverySpareController {
|
40
|
@Resource
|
41
|
@Resource
|
41
|
private CaxxService caxxService;
|
42
|
private CaxxService caxxService;
|
|
|
43
|
+ @Resource
|
|
|
44
|
+ private DwxxService dwxxService;
|
42
|
|
45
|
|
43
|
@PostMapping("/page")
|
46
|
@PostMapping("/page")
|
44
|
@Operation(summary = "交收仓列表分页")
|
47
|
@Operation(summary = "交收仓列表分页")
|
|
@@ -83,7 +86,7 @@ public class DeliverySpareController {
|
83
|
public void exportShengAlternativeSpareExcel(@Valid SparePageReqVO pageReqVO,
|
86
|
public void exportShengAlternativeSpareExcel(@Valid SparePageReqVO pageReqVO,
|
84
|
HttpServletResponse response) throws IOException {
|
87
|
HttpServletResponse response) throws IOException {
|
85
|
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
88
|
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
86
|
- List<SpareRespVO> list = caxxService.getDeliverySparePage(pageReqVO).getList();
|
|
|
|
|
89
|
+ List<SpareRespVO> list = dwxxService.getProvinceSelectedPage(pageReqVO).getList();
|
87
|
|
90
|
|
88
|
List<ShengAlternativeSpareRespVO> shengAlternativeList = BeanUtil.copyToList(list, ShengAlternativeSpareRespVO.class);
|
91
|
List<ShengAlternativeSpareRespVO> shengAlternativeList = BeanUtil.copyToList(list, ShengAlternativeSpareRespVO.class);
|
89
|
// 导出 Excel
|
92
|
// 导出 Excel
|