解决偏离单再次回传验证问题

yangys

2025-08-23 88f640713525e88dac333ea3bf7e23e22891ab0f

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java

@@ -8,11 +8,7 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.vo.MachineBackFileExcelVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
@@ -32,14 +28,15 @@

   @Autowired
   private MachineBackFileService service;

   @Autowired
   private MachineFileService machineFileService;

   /**
    * 接收
    */
   @Operation(summary = "接收", description = "接收文件")
   @PostMapping("/accept")
   public R<Void> accept(String ids) {
   public R<Void> accept(@RequestParam String ids) {
      service.accept(ids);
      return R.success();
   }
@@ -65,10 +62,9 @@
   @Operation(summary = "分页查询", description = "名称或编码")
   @GetMapping("/page")
   public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {
      IPage<MachineBackFileVO> pages = service.pageQuery(query);
      IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
      return R.data(pages);
   }

   /**
    * 分页
    */
@@ -78,7 +74,8 @@
      query.setCurrent(1);
      query.setSize(Integer.MAX_VALUE);

      IPage<MachineBackFileVO> pages = service.pageQuery(query);
      //IPage<MachineBackFileVO> pages = service.pageQuery(query);
      IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
      List<MachineBackFileExcelVO> list = new ArrayList<>();
      pages.getRecords().forEach(m ->{
         MachineBackFileExcelVO excelVO = new MachineBackFileExcelVO();