优化现场编制导出

yangys

2025-09-22 0bdfd76339bb58be09927b8c2fe268175c3a7cc8

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ProgramOnMachineExportController.java

@@ -7,13 +7,14 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.HistoryService;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
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.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.ProgramOnMachineExportService;
import org.springblade.mdm.flow.service.TaskDispatchService;
@@ -37,18 +38,16 @@
@Tag(name = "现场编制导出", description = "现场编制导出")
public class ProgramOnMachineExportController {

   private FlowCommonService flowCommonService;
   private ProgramOnMachineExportService programOnMachineService;
   private final TaskDispatchService taskDispatchService;
   private final HistoryService historyService;

   @GetMapping("/finished-page")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "已审批列表", description = "已审批列表")
   @Operation(summary = "现场编制待导出列表", description = "现场编制待导出列表")
   public R<IPage<FlowVO>> finishedPage(ProgramOnMachineQueryVO queryVO) {
      IPage<FlowVO> pages = programOnMachineService.finishedPage(Condition.getPage(queryVO), queryVO);
      return R.data(pages);
   }


   @PostMapping("/export")
   @Operation(summary = "导出现场编制记录", description = "导出现场编制记录")
@@ -62,14 +61,18 @@
      page.getRecords().forEach(record -> {
         ProgramOnMachineExcel excel = new ProgramOnMachineExcel();
         Map<String,Object> vars = record.getVariables();
         excel.setDrawingNo(Func.toStr(vars.get(FlowVariableContants.DRAWING_NO)));
         excel.setProcessNo(Func.toStr(vars.get(FlowVariableContants.PROCESS_NO)));
         excel.setProcessEdition(Func.toStr(vars.get(FlowVariableContants.PROCESS_EDITION)));
         excel.setMachineCode(Func.toStr(vars.get(FlowVariableContants.MACHINE_CODE)));
         excel.setDrawingNo(Func.toStr(vars.get(FlowVariableConstant.DRAWING_NO)));
         excel.setProcessNo(Func.toStr(vars.get(FlowVariableConstant.PROCESS_NO)));
         excel.setProcessEdition(Func.toStr(vars.get(FlowVariableConstant.PROCESS_EDITION)));
         excel.setMachineCode(Func.toStr(vars.get(FlowVariableConstant.MACHINE_CODE)));
         excel.setProcessInstanceId(record.getProcessInstanceId());
         excel.setDeviation(Func.toStr(record.getVariables().get(FlowVariableConstant.DEVIATION)));
         if(StringUtils.isNotBlank(excel.getDeviation())) {
            excel.setDeviationSerial(taskDispatchService.getDeviationSerial(Func.toStr(vars.get(FlowVariableConstant.PROGRAM_NO))) + "");//更改单序号
         }
         list.add(excel);
      });
      ExcelUtil.export(response, "现场编制记录" + DateUtil.time(), "机床数据表", list, ProgramOnMachineExcel.class);
      ExcelUtil.export(response, "现场编制记录" + DateUtil.time(), "现场编制记录", list, ProgramOnMachineExcel.class);

   }
}