修复审批表，确认表内容

yangys

2025-09-23 3baca21e0e6563f8379359ef2ba78c224eb4bc80

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

@@ -5,28 +5,23 @@
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.service.ApproveInfoQueryService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.vo.ApproveTableInfo;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.statreport.utils.WordReplaceUtil;
import org.springblade.system.feign.IUserClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -93,8 +88,8 @@

      dataMap.put("startTime",dispatchDateStr);//工段负责人/单元负责人派出时间
      dataMap.put("fuzeren",approveInfo.getProgrammerName());//负责人
      int isProgram = 0;
      if(StringUtils.equals(props.getHasCuredProgram(),FlowContants.Y)){

      if(StringUtils.equals(props.getHasCuredProgram(), FlowConstant.Y)){
         //校对任务
         dataMap.put("jd", WordReplaceUtil.CHECKED);
         dataMap.put("bz", WordReplaceUtil.UNCHECKED);
@@ -105,35 +100,28 @@
         dataMap.put("bz", WordReplaceUtil.CHECKED);
      }

      dataMap.put("programNo",dispatch.getProgramNo());
      dataMap.put("programNo",props.getDrawingNo()+"-"+props.getProcessNo()+"-"+props.getProcessEdition());

      dataMap.put("fzy",WordReplaceUtil.CHECKED); //仿真 是
      dataMap.put("fzn",WordReplaceUtil.UNCHECKED);//仿真 否
      Date programDate = approveInfo.getCheckDate();
      Date checkDate = approveInfo.getCheckDate();



      String checkDateStr = " ";
      if (checkDate != null) {
         checkDateStr = DateUtil.format(programDate, DATE_PATTERN);
      }

      String approveDateStr = " ";
      if (approveInfo.getApproveDate() != null) {
         approveDateStr = DateUtil.format(approveInfo.getApproveDate(), DATE_PATTERN);
      }
      String bianzhi = userCommonService.getUserNameById(dispatch.getCreateUser());
      String bianzhiDateStr =  DateUtil.format(dispatch.getCreateTime(), DATE_PATTERN);
      dataMap.put("bianzhi",bianzhi+"/"+bianzhiDateStr);//编制：计划员/发起时间
      dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/时间不确定");
      dataMap.put("shenpi",approveInfo.getSeniorName()+"/时间不确定");
      dataMap.put("bianzhi",bianzhi+"/"+formatTimeForTable(dispatch.getCreateTime()));//编制：计划员/发起时间
      dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/"+formatTimeForTable(approveInfo.getDispatchDate())); //
      dataMap.put("shenpi",approveInfo.getSeniorName()+"/"+formatTimeForTable(approveInfo.getApproveDate()));//就是高师审批时间

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

      return dataMap;
   }
   String formatTimeForTable(Date date){
      String DATE_PATTERN = "yyyy-M-d";
      if(date==null){
         return "";
      }

      return DateUtil.format(date, DATE_PATTERN);
   }
   /*
   public void exportApproveTableOld(String processInstanceId, OutputStream os) throws DocumentException, IOException {