调整审批表打印

yangys

2025-08-26 a0e37c52980249847ac896d320ef097fda49ad3a

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

@@ -5,26 +5,22 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.mail.MessagingException;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.task.Comment;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
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.vo.MachineExcelVO;
import org.springblade.mdm.commons.vo.IdsVO;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.ApproveTableService;
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.core.tool.utils.UrlUtil;
import org.springblade.mdm.flow.service.*;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.flow.vo.OvertimeTaskExcelVO;
import org.springblade.mdm.flow.vo.TaskTraceVO;
@@ -41,7 +37,6 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

@Slf4j
@@ -53,17 +48,18 @@
   private TaskService taskService;
   @Autowired
   private FlowBusinessService businessService;

   @Autowired
   private FlowCommonService flowCommonService;
   @Autowired
   private HistoryService historyService;
   @Autowired
   private RuntimeService runtimeService;
   @Autowired
   private ApproveTableService approveTableService;
   @Autowired
   private ApproveRecordService approveRecordService;
   @Autowired
   private IUserClient userClient;
   @Autowired
   private WIthdrawService withdrawService;


   @GetMapping("overtime-list")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "超时查询", description = "查询所有超时任务")
@@ -137,16 +133,24 @@
   @GetMapping("search-list")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "流程查询", description = "查询进行中的所有流程")
   public R<IPage<FlowVO>> searchList(@Parameter(description = "流程类型")String processDefinitionKey, @Parameter(description = "流程时间开始") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")LocalDate createTimeBegin, @Parameter(description = "流程创建时间截止")@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")LocalDate createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
      IPage<FlowVO> pages = businessService.selectSearchPage(Condition.getPage(query), createTimeBegin,createTimeEnd,processDefinitionKey,keyword);
   public R<IPage<FlowVO>> searchList(@Parameter(description = "流程名称")String myProcessName, @Parameter(description = "流程时间开始") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")LocalDate createTimeBegin, @Parameter(description = "流程创建时间截止")@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")LocalDate createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
      IPage<FlowVO> pages = businessService.selectSearchPage(Condition.getPage(query),myProcessName,keyword, createTimeBegin,createTimeEnd);
      return R.data(pages);
   }

   @GetMapping("finished-list")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "历史流程查询", description = "查询已完结的所有流程")
   public R<IPage<FlowVO>> finishedList(@Parameter(description = "流程类型")String processDefinitionKey, @Parameter(description = "任务到达时间开始") LocalDateTime createTimeBegin, @Parameter(description = "任务到达时间截止") LocalDateTime createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
      IPage<FlowVO> pages = businessService.selectFinishedPage(Condition.getPage(query), processDefinitionKey,createTimeBegin,createTimeEnd,keyword);
   public R<IPage<FlowVO>> finishedList(@Parameter(description = "流程名称")String myProcessName, @Parameter(description = "流程创建时间开始") LocalDateTime createTimeBegin, @Parameter(description = "流程创建时间截止") LocalDateTime createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
      IPage<FlowVO> pages = businessService.selectFinishedPage(Condition.getPage(query), myProcessName,keyword,createTimeBegin,createTimeEnd);
      return R.data(pages);
   }

   @GetMapping("exception-list")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "异常流程查询", description = "查询已完结的，异常流程")
   public R<IPage<FlowVO>> exceptionList(@Parameter(description = "流程名称")String myProcessName, @Parameter(description = "流程创建时间开始") LocalDateTime createTimeBegin, @Parameter(description = "流程创建时间截止") LocalDateTime createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
      IPage<FlowVO> pages = businessService.selectExceptionPage(Condition.getPage(query), myProcessName,keyword,createTimeBegin,createTimeEnd);
      return R.data(pages);
   }

@@ -168,9 +172,10 @@
   public void exportApproveTable(String processInstanceId, HttpServletResponse response) {

      try {

         String filename = URLEncoder.encode("数控程序编制审批单", StandardCharsets.UTF_8)+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".pdf";

         FlowProgramProperties props = flowCommonService.getProgramPropertiesFromHis(processInstanceId);
         String progName = props.getDrawingNo()+"-"+props.getProcessNo()+"-"+props.getProcessEdition();
         //String filename = URLEncoder.encode("数控程序编制审批单", StandardCharsets.UTF_8)+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".pdf";
         String filename = UrlUtil.encode("数控程序编制审批单"+progName)+".pdf";
         response.setHeader("Content-Disposition", "attachment; filename="+filename);
         response.setContentType("application/octet-stream");
         approveTableService.exportApproveTable(processInstanceId,response.getOutputStream());
@@ -180,4 +185,16 @@
      }

   }

   @GetMapping("/withdraw")
   @Operation(summary = "撤回任务", description = "从其他任务节点直接撤回编程员节点")
   public R<Void> withdraw(String processInstanceId)  {
      try {
         withdrawService.withdraw(processInstanceId);
         return R.success();
      }catch(Exception e) {
         log.error("<UNK>", e);
         return R.fail(e.getMessage());
      }
   }
}