修复审批表，确认表内容

yangys

2025-09-23 3baca21e0e6563f8379359ef2ba78c224eb4bc80

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java

@@ -29,7 +29,6 @@
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.statreport.utils.WordReplaceUtil;
import org.springblade.system.feign.IDictBizClient;
import org.springframework.stereotype.Service;
@@ -54,7 +53,6 @@
   private final FlowProgramFileService flowProgramFileService;
   private ApproveInfoQueryService approveInfoQueryService;
   private final MachineService machineService;
   private final NcNodeService nodeService;
   private final NcNodeHisService nodeHisService;
   private final ParamService paramService;
   private final TaskDispatchService taskDispatchService;
@@ -63,7 +61,6 @@
   private static final String DATE_PATTERN = "yyyy-M-d";
   /**
    * 导出word岸本
    * @param dispatch 任务分派
    * @param props 流程属性
    */
   public ByteArrayOutputStream exportConfirmTableDoc(FlowProgramProperties props) throws IOException {
@@ -94,7 +91,8 @@
         //防止老数据报错
         dispatch = new TaskDispatch();
      }
      dataMap.put("bh",props.getProgramNo());//编号，就是数控程序编号
      String bianhao = props.getDrawingNo()+"-"+props.getProcessNo()+"-"+props.getProcessEdition();
      dataMap.put("bh",bianhao);//编号，就是数控程序编号

      dataMap.put("drawingNo", props.getDrawingNo());
      dataMap.put("processNo", props.getProcessNo());
@@ -128,7 +126,7 @@
      }else{
         dataMap.put("czz", "");
      }
      dataMap.put("programNo",props.getProgramNo());
      dataMap.put("programNo",bianhao);
      if(StringUtils.isNotBlank(dispatch.getInspector())) {
         dataMap.put("jyy",dispatch.getInspector()+"/"+formatTimeForTable(dispatch.getCheckTime()));//实际检验员和检验时间

@@ -150,8 +148,8 @@

      dataMap.put("bianzhi",approveInfo.getProgrammerName()+"/"+formatTimeForTable(approveInfo.getProgrammingDate()));//编程人员
      //approveInfo.getDispatchDate()
      dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/"+formatTimeForTable(approveInfo.getCheckDate()));//校对：专业组长
      dataMap.put("shenhe",approveInfo.getSeniorName()+"/"+formatTimeForTable(approveInfo.getApproveDate()));
      dataMap.put("jiaodui",(approveInfo.getTeamLeaderName()!=null?approveInfo.getTeamLeaderName():"")+"/"+formatTimeForTable(approveInfo.getCheckDate()));//校对：专业组长
      dataMap.put("shenhe",(approveInfo.getSeniorName()!=null?approveInfo.getSeniorName():"")+"/"+formatTimeForTable(approveInfo.getApproveDate()));

      dataMap.put("sendPath",machine.getProgSendDir()!=null?machine.getProgSendDir():"");